3 files changed, 36 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f06ca5bfaf9..6dfcbdbcdc7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.el (file-size-human-readable): New function.
+
+        * ls-lisp.el (ls-lisp-format-file-size): Use it, instead of
+        computing the representation inline.  Don't require `cl'.
+
 2011-04-08  Glenn Morris  <rgm@gnu.org>
 
         * man.el (Man-page-header-regexp): Solaris < 2.6 no longer supported.
diff --git a/lisp/files.el b/lisp/files.el
index 7d8f3ee4503..fd241041b74 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1140,6 +1140,34 @@ it means chase no more than that many links and then stop."
         (setq count (1+ count))))
     newname))
 
+;; A handy function to display file sizes in human-readable form.
+;; See http://en.wikipedia.org/wiki/Kibibyte for the reference.
+(defun file-size-human-readable (file-size &optional flavor)
+  "Produce a string showing FILE-SIZE in human-readable form.
+
+Optional second argument FLAVOR controls the units and the display format:
+
+ If FLAVOR is nil or omitted, each kilobyte is 1024 bytes and the produced
+    suffixes are \"k\", \"M\", \"G\", \"T\", etc.
+ If FLAVOR is `si', each kilobyte is 1000 bytes and the produced suffixes
+    are \"k\", \"M\", \"G\", \"T\", etc.
+ If FLAVOR is `iec', each kilobyte is 1024 bytes and the produced suffixes
+    are \"KiB\", \"MiB\", \"GiB\", \"TiB\", etc."
+  (let ((power (if (or (null flavor) (eq flavor 'iec))
+                   1024.0
+                 1000.0))
+        (post-fixes
+         ;; none, kilo, mega, giga, tera, peta, exa, zetta, yotta
+         (list "" "k" "M" "G" "T" "P" "E" "Z" "Y")))
+    (while (and (>= file-size power) (cdr post-fixes))
+      (setq file-size (/ file-size power)
+            post-fixes (cdr post-fixes)))
+    (format "%.0f%s%s" file-size
+            (if (and (eq flavor 'iec) (string= (car post-fixes) "k"))
+                "K"
+              (car post-fixes))
+            (if (eq flavor 'iec) "iB" ""))))
+
 (defun make-temp-file (prefix &optional dir-flag suffix)
   "Create a temporary file.
 The returned file name (created by appending some random characters at the end
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 55ec835831a..44e8bce5b8d 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -62,8 +62,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
-
 (defgroup ls-lisp nil
   "Emulate the ls program completely in Emacs Lisp."
   :version "21.1"
@@ -726,13 +724,7 @@ All ls time options, namely c, t and u, are handled."
                   ls-lisp-filesize-f-fmt
                 ls-lisp-filesize-d-fmt)
               file-size)
-    (if (< file-size 1024)
-        (format " %4d" file-size)
-      (do ((file-size (/ file-size 1024.0) (/ file-size 1024.0))
-           ;; kilo, mega, giga, tera, peta, exa
-           (post-fixes (list "k" "M" "G" "T" "P" "E") (cdr post-fixes)))
-          ((< file-size 1024)
-           (format " %3.0f%s"  file-size (car post-fixes)))))))
+    (format " %4s" (file-size-human-readable file-size))))
 
 (provide 'ls-lisp)