*** empty log message ***

[bpt/emacs.git] / lisp / ls-lisp.el

diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index cdcc2f2..fa7b462 100644 (file)
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -106,7 +106,8 @@ file names.
 
 Not all `ls' switches are supported.  The switches that work
 are: A a c i r S s t u"
-  (let ((handler (find-file-name-handler file 'insert-directory)))
+  (let ((handler (find-file-name-handler file 'insert-directory))
+       fattr)
     (if handler
        (funcall handler 'insert-directory file switches
                 wildcard full-directory-p)
@@ -134,29 +135,18 @@ are: A a c i r S s t u"
                 (sum 0)
                 elt
                 short
-                (file-list (directory-files dir nil wildcard))
-                file-alist 
+                (file-alist (directory-files-and-attributes dir nil wildcard))
                 (now (current-time))
                 ;; do all bindings here for speed
                 file-size
                 fil attr)
            (cond ((memq ?A switches)
-                  (setq file-list
-                        (ls-lisp-delete-matching "^\\.\\.?$" file-list)))
+                  (setq file-alist
+                        (ls-lisp-delete-matching "^\\.\\.?$" file-alist)))
                  ((not (memq ?a switches))
                   ;; if neither -A  nor -a, flush . files
-                  (setq file-list
-                        (ls-lisp-delete-matching "^\\." file-list))))
-           (setq file-alist
-                 (mapcar
-                  (function
-                   (lambda (x)
-                     ;; file-attributes("~bogus") bombs
-                     (cons x (file-attributes (expand-file-name x)))))
-                  ;; inserting the call to directory-files right here
-                  ;; seems to stimulate an Emacs bug
-                  ;; ILLEGAL DATATYPE (#o37777777727) or #o67
-                  file-list))
+                  (setq file-alist
+                        (ls-lisp-delete-matching "^\\." file-alist))))
            ;; ``Total'' line (filled in afterwards).
            (insert (if (car-safe file-alist)
                        "total \007\n"
@@ -191,17 +181,22 @@ are: A a c i r S s t u"
        ;; if not full-directory-p, FILE *must not* end in /, as
        ;; file-attributes will not recognize a symlink to a directory
        ;; must make it a relative filename as ls does:
-       (setq file (file-name-nondirectory file))
-       (insert (ls-lisp-format file (file-attributes file)
-                               (nth 7 (file-attributes file)) switches
-                               (current-time)))))))
+       (if (eq (aref file (1- (length file))) ?/)
+           (setq file (substring file 0 (1- (length file)))))
+       (setq fattr (file-attributes file))
+       (if fattr
+           (insert (ls-lisp-format file fattr (nth 7 fattr)
+                                   switches (current-time)))
+         (message "%s: doesn't exist or is inaccessible" file)
+         (ding)
+         (sit-for 2))))))
 
 (defun ls-lisp-delete-matching (regexp list)
   ;; Delete all elements matching REGEXP from LIST, return new list.
   ;; Should perhaps use setcdr for efficiency.
   (let (result)
     (while list
-      (or (string-match regexp (car list))
+      (or (string-match regexp (car (car list)))
          (setq result (cons (car list) result)))
       (setq list (cdr list)))
     result))
@@ -257,7 +252,7 @@ are: A a c i r S s t u"
                (format "%6d " (nth 10 file-attr)))
            ;; nil is treated like "" in concat
            (if (memq ?s switches)      ; size in K
-               (format "%4d " (fceiling (/ file-size 1024.0))))
+               (format "%4.0f " (fceiling (/ file-size 1024.0))))
            (nth 8 file-attr)           ; permission bits
            ;; numeric uid/gid are more confusing than helpful
            ;; Emacs should be able to make strings of them.
@@ -302,15 +297,17 @@ are: A a c i r S s t u"
         (diff (+ (ash diff16 16) (- (car (cdr time)) (car (cdr now)))))
         (past-cutoff (- (* 6 30 24 60 60)))    ; 6 30-day months
         (future-cutoff (* 60 60)))             ; 1 hour
-    (format-time-string
-     (if (and
-         (<= past-cutoff diff) (<= diff future-cutoff)
-         ;; Sanity check in case `diff' computation overflowed.
-         (<= (1- (ash past-cutoff -16)) diff16)
-         (<= diff16 (1+ (ash future-cutoff -16))))
-        "%b %e %H:%M"
-       "%b %e  %Y")
-     time)))
+    (condition-case nil
+       (format-time-string
+        (if (and
+             (<= past-cutoff diff) (<= diff future-cutoff)
+             ;; Sanity check in case `diff' computation overflowed.
+             (<= (1- (ash past-cutoff -16)) diff16)
+             (<= diff16 (1+ (ash future-cutoff -16))))
+            "%b %e %H:%M"
+          "%b %e  %Y")
+        time)
+      (error "Unk  0  0000"))))
 
 (provide 'ls-lisp)