From fbca1e8c33a9124a16dc11cdaaeefd5959faee66 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 1 Jun 2006 09:02:36 +0000 Subject: [PATCH] * riece-ndcc.el: Don't use calc. --- lisp/ChangeLog | 2 ++ lisp/riece-ndcc.el | 34 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2288d31..6805712 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2006-06-01 Daiki Ueno + * riece-ndcc.el: Don't use calc. + * riece-300.el (riece-handle-353-message): Append " " to every 353 line before inserting it to riece-353-message-alist. diff --git a/lisp/riece-ndcc.el b/lisp/riece-ndcc.el index 58a417e..8213089 100644 --- a/lisp/riece-ndcc.el +++ b/lisp/riece-ndcc.el @@ -30,8 +30,6 @@ (require 'riece-globals) (require 'riece-options) -(require 'calc) - (defgroup riece-ndcc nil "DCC written in elisp." :prefix "riece-" @@ -56,23 +54,25 @@ Only used for sending files." "^\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)$" address) (error "% is not an IP address" address)) - (let ((calc-number-radix 10)) - (calc-eval (format "%s * (2 ** 24) + %s * (2 **16) + %s * (2 ** 8) + %s" - (match-string 1 address) - (match-string 2 address) - (match-string 3 address) - (match-string 4 address))))) + (let ((string (number-to-string + (+ (* (float (string-to-number (match-string 1 address))) + 16777216) + (* (float (string-to-number (match-string 2 address))) + 65536) + (* (float (string-to-number (match-string 3 address))) + 256) + (float (string-to-number (match-string 4 address))))))) + (if (string-match "\\." string) + (substring string 0 (match-beginning 0)) + string))) (defun riece-ndcc-decode-address (address) - (format "%d.%d.%d.%d" - (floor (string-to-number - (calc-eval (format "(%s / (2 ** 24)) %% 256" address)))) - (floor (string-to-number - (calc-eval (format "(%s / (2 ** 16)) %% 256" address)))) - (floor (string-to-number - (calc-eval (format "(%s / (2 ** 8)) %% 256" address)))) - (floor (string-to-number - (calc-eval (format "%s %% 256" address)))))) + (let ((float-address (string-to-number (concat address ".0")))) + (format "%d.%d.%d.%d" + (floor (mod (/ float-address 16777216) 256)) + (floor (mod (/ float-address 65536) 256)) + (floor (mod (/ float-address 256) 256)) + (floor (mod float-address 256))))) (defun riece-ndcc-server-sentinel (process status) (when (string-match "^open from " status) -- 2.25.1