Mercurial > emacs
changeset 94341:5eb3109ca278
(ls-lisp-format): Fix last change.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 25 Apr 2008 09:00:31 +0000 |
| parents | 00e54fde074a |
| children | 7dc4ce2a7fd1 |
| files | lisp/ls-lisp.el |
| diffstat | 1 files changed, 19 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ls-lisp.el Thu Apr 24 22:38:12 2008 +0000 +++ b/lisp/ls-lisp.el Fri Apr 25 09:00:31 2008 +0000 @@ -532,14 +532,27 @@ (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))))