;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
(defvar original-insert-directory nil
"This holds the original function definition of `insert-directory'.")
+(defvar ls-lisp-uid-d-fmt "-%d"
+ "Format to display integer UIDs.")
+(defvar ls-lisp-uid-s-fmt "-%s"
+ "Format to display user names.")
+(defvar ls-lisp-gid-d-fmt "-%d"
+ "Format to display integer GIDs.")
+(defvar ls-lisp-gid-s-fmt "-%s"
+ "Format to display user group names.")
+(defvar ls-lisp-filesize-d-fmt "%d"
+ "Format to display integer file sizes.")
+(defvar ls-lisp-filesize-f-fmt "%.0f"
+ "Format to display float file sizes.")
+
;; Remember the original insert-directory function
(or (featurep 'ls-lisp) ; FJW: unless this file is being reloaded!
(setq original-insert-directory (symbol-function 'insert-directory)))
'string)))
(now (current-time))
(sum 0)
+ (max-uid-len 0)
+ (max-gid-len 0)
+ (max-file-size 0)
;; do all bindings here for speed
- total-line files elt short file-size fil attr)
+ total-line files elt short file-size fil attr
+ fuid fgid uid-len gid-len)
(cond ((memq ?A switches)
(setq file-alist
(ls-lisp-delete-matching "^\\.\\.?$" file-alist)))
(if (memq ?C switches) ; column (-C) format
(ls-lisp-column-format file-alist)
(setq total-line (cons (point) (car-safe file-alist)))
+ ;; Find the appropriate format for displaying uid, gid, and
+ ;; file size, by finding the longest strings among all the
+ ;; files we are about to display.
+ (dolist (elt file-alist)
+ (setq attr (cdr elt)
+ fuid (nth 2 attr)
+ uid-len (if (stringp fuid) (string-width fuid)
+ (length (format "%d" fuid)))
+ fgid (nth 3 attr)
+ gid-len (if (stringp fgid) (string-width fgid)
+ (length (format "%d" fgid)))
+ file-size (nth 7 attr))
+ (if (> uid-len max-uid-len)
+ (setq max-uid-len uid-len))
+ (if (> gid-len max-gid-len)
+ (setq max-gid-len gid-len))
+ (if (> file-size max-file-size)
+ (setq max-file-size file-size)))
+ (setq ls-lisp-uid-d-fmt (format " %%-%dd" max-uid-len))
+ (setq ls-lisp-uid-s-fmt (format " %%-%ds" max-uid-len))
+ (setq ls-lisp-gid-d-fmt (format " %%-%dd" max-gid-len))
+ (setq ls-lisp-gid-s-fmt (format " %%-%ds" max-gid-len))
+ (setq ls-lisp-filesize-d-fmt
+ (format " %%%dd"
+ (if (memq ?s switches)
+ (length (format "%.0f"
+ (fceiling (/ max-file-size 1024.0))))
+ (length (format "%.0f" max-file-size)))))
+ (setq ls-lisp-filesize-f-fmt
+ (format " %%%d.0f"
+ (if (memq ?s switches)
+ (length (format "%.0f"
+ (fceiling (/ max-file-size 1024.0))))
+ (length (format "%.0f" max-file-size)))))
(setq files file-alist)
(while files ; long (-l) format
(setq elt (car files)
(let ((inode (nth 10 file-attr)))
(if (consp inode)
(if (consp (cdr inode))
- (format " %17.0f "
- (+ (* (car inode) 1099511627776.0)
- (* (cadr inode) 65536.0)
- (cddr inode)))
- (format " %17.0f "
+ ;; 2^(24+16) = 1099511627776.0, but
+ ;; multiplying by it and then adding the
+ ;; other members of the cons cell in one go
+ ;; loses precision, since a double does not
+ ;; have enough significant digits to hold a
+ ;; full 64-bit value. So below we split
+ ;; 1099511627776 into high 13 and low 5
+ ;; digits and compute in two parts.
+ (let ((p1 (* (car inode) 10995116.0))
+ (p2 (+ (* (car inode) 27776.0)
+ (* (cadr inode) 65536.0)
+ (cddr inode))))
+ (format " %13.0f%05.0f "
+ ;; Use floor to emulate integer
+ ;; division.
+ (+ p1 (floor p2 100000.0))
+ (mod p2 100000.0)))
+ (format " %18.0f "
(+ (* (car inode) 65536.0)
(cdr inode))))
- (format " %17d " inode))))
+ (format " %18d " inode))))
;; nil is treated like "" in concat
(if (memq ?s switches) ; size in K
- (format " %4.0f" (fceiling (/ file-size 1024.0))))
+ (format ls-lisp-filesize-f-fmt
+ (fceiling (/ file-size 1024.0))))
drwxrwxrwx ; attribute string
(if (memq 'links ls-lisp-verbosity)
- (format " %3d" (nth 1 file-attr))) ; link count
+ (format "%3d" (nth 1 file-attr))) ; link count
;; Numeric uid/gid are more confusing than helpful;
;; Emacs should be able to make strings of them.
;; They tend to be bogus on non-UNIX platforms anyway so
(if (memq 'uid ls-lisp-verbosity)
;; uid can be a sting or an integer
(let ((uid (nth 2 file-attr)))
- (format (if (stringp uid) " %-8s" " %-8d") uid)))
+ (format (if (stringp uid)
+ ls-lisp-uid-s-fmt
+ ls-lisp-uid-d-fmt)
+ uid)))
(if (not (memq ?G switches)) ; GNU ls -- shows group by default
(if (or (memq ?g switches) ; UNIX ls -- no group by default
(memq 'gid ls-lisp-verbosity))
(let ((gid (nth 3 file-attr)))
- (format (if (stringp gid) " %-8s" " %-8d") gid))))
+ (format (if (stringp gid)
+ ls-lisp-gid-s-fmt
+ ls-lisp-gid-d-fmt)
+ gid))))
(ls-lisp-format-file-size file-size (memq ?h switches))
" "
(ls-lisp-format-time file-attr time-index now)
(error "Unk 0 0000"))))
(defun ls-lisp-format-file-size (file-size human-readable)
- (if (or (not human-readable)
- (< file-size 1024))
- (format (if (floatp file-size) " %9.0f" " %9d") 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 " %8.0f%s" file-size (car post-fixes))))))
+ (if (not human-readable)
+ (format (if (floatp file-size)
+ 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)))))))
(provide 'ls-lisp)