(ange-ftp-process-handle-line, ange-ftp-set-xfer-size): If the file's

size is a float, divide by 1024 instead of using ash.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa84ac967f694dceaa03a48a3510e0f562bffb1f..d2afe69dc176f4bc39b2e46a425dfdd7ab814fa2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-08  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * net/ange-ftp.el (ange-ftp-process-handle-line) 
+       (ange-ftp-set-xfer-size): If the file's size is a float, divide
+       by 1024 instead of using ash.
+
 2002-02-07  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mail/rmail.el (rmail-enable-mime-composing): New. A lightweight

diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 06a34f58ea8b5177569d02a63dcbfa3785b87217..774db5d7630103291829f27bc86e11299a8ddfbf 100644 (file)
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1528,10 +1528,10 @@ Try to categorize it into one of four categories:
 good, skip, fatal, or unknown."
   (cond ((string-match ange-ftp-xfer-size-msgs line)
         (setq ange-ftp-xfer-size
-              (ash (string-to-int (substring line
-                                             (match-beginning 1)
-                                             (match-end 1)))
-                   -10)))
+              (/ (string-to-number (substring line
+                                              (match-beginning 1)
+                                              (match-end 1)))
+                 1024)))
        ((string-match ange-ftp-skip-msgs line)
         t)
        ((string-match ange-ftp-good-msgs line)
@@ -1563,7 +1563,11 @@ good, skip, fatal, or unknown."
          (if buf
              (save-excursion
                (set-buffer buf)
-               (setq ange-ftp-xfer-size (ash bytes -10))))))))
+               (setq ange-ftp-xfer-size
+                     ;; For very large files, BYTES can be a float.
+                     (if (integerp bytes)
+                         (ash bytes -10)
+                       (/ bytes 1024)))))))))
 
 (defun ange-ftp-process-handle-hash (str)
   "Remove hash marks from STRING and display count so far."