4 files changed, 56 insertions, 49 deletions

diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 2b568a991a2..53de7f7ec63 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -183,9 +183,9 @@ really need to stick around for very long."
   "The face used for highlighting junk file names.")
 
 (defsubst eshell-ls-filetype-p (attrs type)
-  "Test whether ATTRS specifies a directory."
-  (if (nth 8 attrs)
-      (eq (aref (nth 8 attrs) 0) type)))
+  "Test whether ATTRS specifies a file of type TYPE."
+  (if (file-attribute-modes attrs)
+      (eq (aref (file-attribute-modes attrs) 0) type)))
 
 (defmacro eshell-ls-applicable (attrs index func file)
   "Test whether, for ATTRS, the user can do what corresponds to INDEX.
@@ -193,8 +193,8 @@ ATTRS is a string of file modes.  See `file-attributes'.
 If we cannot determine the answer using ATTRS (e.g., if we need
 to know what group the user is in), compute the return value by
 calling FUNC with FILE as an argument."
-  `(let ((owner (nth 2 ,attrs))
-         (modes (nth 8 ,attrs)))
+  `(let ((owner (file-attribute-user-id ,attrs))
+         (modes (file-attribute-modes ,attrs)))
      (cond ((cond ((numberp owner)
                    (= owner (user-uid)))
                   ((stringp owner)
@@ -437,7 +437,7 @@ Sort entries alphabetically across.")
 
 (defsubst eshell-ls-size-string (attrs size-width)
   "Return the size string for ATTRS length, using SIZE-WIDTH."
-  (let* ((str (eshell-ls-printable-size (nth 7 attrs) t))
+  (let* ((str (eshell-ls-printable-size (file-attribute-size attrs) t))
          (len (length str)))
     (if (< len size-width)
         (concat (make-string (- size-width len) ? ) str)
@@ -503,19 +503,19 @@ whose cdr is the list of file attributes."
                  (if numeric-uid-gid
                      "%s%4d %-8s %-8s "
                    "%s%4d %-14s %-8s ")
-                 (or (nth 8 attrs) "??????????")
-                 (or (nth 1 attrs) 0)
-                 (or (let ((user (nth 2 attrs)))
+                 (or (file-attribute-modes attrs) "??????????")
+                 (or (file-attribute-link-number attrs) 0)
+                 (or (let ((user (file-attribute-user-id attrs)))
                        (and (stringp user)
                             (eshell-substring user 14)))
-                     (nth 2 attrs)
+                     (file-attribute-user-id attrs)
                      "")
-                 (or (let ((group (nth 3 attrs)))
+                 (or (let ((group (file-attribute-group-id attrs)))
                        (and (stringp group)
                             (eshell-substring group 8)))
-                     (nth 3 attrs)
+                     (file-attribute-group-id attrs)
                      ""))
-                (let* ((str (eshell-ls-printable-size (nth 7 attrs)))
+                (let* ((str (eshell-ls-printable-size (file-attribute-size attrs)))
                        (len (length str)))
                   ;; Let file sizes shorter than 9 align neatly.
                   (if (< len (or size-width 8))
@@ -585,12 +585,12 @@ relative to that directory."
             (let ((total 0.0))
               (setq size-width 0)
               (dolist (e entries)
-                (if (nth 7 (cdr e))
-                    (setq total (+ total (nth 7 (cdr e)))
+                (if (file-attribute-size (cdr e))
+                    (setq total (+ total (file-attribute-size (cdr e)))
                           size-width
                           (max size-width
                                (length (eshell-ls-printable-size
-                                        (nth 7 (cdr e))
+                                        (file-attribute-size (cdr e))
                                         (not
                                          ;; If we are under -l, count length
                                          ;; of sizes in bytes, not in blocks.
@@ -700,7 +700,7 @@ Each member of FILES is either a string or a cons cell of the form
       (if (not show-size)
           (setq display-files (mapcar 'eshell-ls-annotate files))
         (dolist (file files)
-          (let* ((str (eshell-ls-printable-size (nth 7 (cdr file)) t))
+          (let* ((str (eshell-ls-printable-size (file-attribute-size (cdr file)) t))
                  (len (length str)))
             (if (< len size-width)
                 (setq str (concat (make-string (- size-width len) ? ) str)))
@@ -766,14 +766,14 @@ need to be printed."
                     (if show-size
                         (max size-width
                              (length (eshell-ls-printable-size
-                                      (nth 7 (cdr entry)) t))))))
+                                      (file-attribute-size (cdr entry)) t))))))
             (setq dirs (cons entry dirs)))
         (setq files (cons entry files)
               size-width
               (if show-size
                   (max size-width
                        (length (eshell-ls-printable-size
-                                (nth 7 (cdr entry)) t)))))))
+                                (file-attribute-size (cdr entry)) t)))))))
     (when files
       (eshell-ls-files (eshell-ls-sort-entries files)
                        size-width show-recursive)
diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index b3b16d909ba..c3b942d25a7 100644
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -89,10 +89,12 @@ ordinary strings."
     (?t . (eshell-pred-file-mode 1000)) ; sticky bit
     (?U . #'(lambda (file)                   ; owned by effective uid
               (if (file-exists-p file)
-                  (= (nth 2 (file-attributes file)) (user-uid)))))
+                  (= (file-attribute-user-id (file-attributes file))
+                     (user-uid)))))
     ;; (?G . #'(lambda (file)               ; owned by effective gid
     ;;          (if (file-exists-p file)
-    ;;              (= (nth 2 (file-attributes file)) (user-uid)))))
+    ;;              (= (file-attribute-user-id (file-attributes file))
+    ;;                 (user-uid)))))
     (?* . #'(lambda (file)
               (and (file-regular-p file)
                    (not (file-symlink-p file))
@@ -460,7 +462,7 @@ that `ls -l' will show in the first column of its display. "
   `(lambda (file)
      (let ((attrs (eshell-file-attributes (directory-file-name file))))
        (if attrs
-           (memq (aref (nth 8 attrs) 0)
+           (memq (aref (file-attribute-modes attrs) 0)
                  ,(if (eq type ?%)
                       '(?b ?c)
                     (list 'quote (list type))))))))
@@ -489,7 +491,8 @@ that `ls -l' will show in the first column of its display. "
                    '<
                  (if (eq qual ?+)
                      '>
-                   '=)) (nth 1 attrs) ,amount))))))
+                   '=))
+              (file-attribute-link-number attrs) ,amount))))))
 
 (defun eshell-pred-file-size ()
   "Return a predicate to test whether a file is of a given size."
@@ -518,7 +521,8 @@ that `ls -l' will show in the first column of its display. "
                    '<
                  (if (eq qual ?+)
                      '>
-                   '=)) (nth 7 attrs) ,amount))))))
+                   '=))
+              (file-attribute-size attrs) ,amount))))))
 
 (defun eshell-pred-substitute (&optional repeat)
   "Return a modifier function that will substitute matches."
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 9a99c53571c..3aecebc2ebf 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -370,12 +370,14 @@ Remove the DIRECTORY(ies), if they are empty.")
              (or (not (eshell-under-windows-p))
                  (eq system-type 'ms-dos))
              (setq attr (eshell-file-attributes (car files)))
-             (nth 10 attr-target) (nth 10 attr)
-             ;; Use equal, not -, since the inode and the device could
-             ;; cons cells.
-             (equal (nth 10 attr-target) (nth 10 attr))
-             (nth 11 attr-target) (nth 11 attr)
-             (equal (nth 11 attr-target) (nth 11 attr)))
+             (file-attribute-inode-number attr-target)
+             (file-attribute-inode-number attr)
+             (equal (file-attribute-inode-number attr-target)
+                    (file-attribute-inode-number attr))
+             (file-attribute-device-number attr-target)
+             (file-attribute-device-number attr)
+             (equal (file-attribute-device-number attr-target)
+                    (file-attribute-device-number attr)))
         (eshell-error (format-message "%s: `%s' and `%s' are the same file\n"
                                       command (car files) target)))
        (t
@@ -397,16 +399,16 @@ Remove the DIRECTORY(ies), if they are empty.")
                 (let (eshell-warn-dot-directories)
                   (if (and (not deep)
                            (eq func 'rename-file)
-                           ;; Use equal, since the device might be a
-                           ;; cons cell.
-                           (equal (nth 11 (eshell-file-attributes
-                                           (file-name-directory
-                                            (directory-file-name
-                                             (expand-file-name source)))))
-                                  (nth 11 (eshell-file-attributes
-                                           (file-name-directory
-                                            (directory-file-name
-                                             (expand-file-name target)))))))
+                           (equal (file-attribute-device-number
+                                   (eshell-file-attributes
+                                    (file-name-directory
+                                     (directory-file-name
+                                      (expand-file-name source)))))
+                                  (file-attribute-device-number
+                                   (eshell-file-attributes
+                                    (file-name-directory
+                                     (directory-file-name
+                                      (expand-file-name target)))))))
                       (apply 'eshell-funcalln func source target args)
                   (unless (file-directory-p target)
                     (if em-verbose
@@ -612,7 +614,8 @@ symlink, then revert to the system's definition of cat."
                                (> (length arg) 0)
                                (eq (aref arg 0) ?-))
                           (let ((attrs (eshell-file-attributes arg)))
-                            (and attrs (memq (aref (nth 8 attrs) 0)
+                            (and attrs
+                                 (memq (aref (file-attribute-modes attrs) 0)
                                              '(?d ?l ?-)))))
                 (throw 'special t)))))
       (let ((ext-cat (eshell-search-path "cat")))
@@ -843,19 +846,19 @@ external command."
       (unless (string-match "\\`\\.\\.?\\'" (caar entries))
         (let* ((entry (concat path "/"
                               (caar entries)))
-               (symlink (and (stringp (cadr (car entries)))
-                             (cadr (car entries)))))
+               (symlink (and (stringp (file-attribute-type (cdar entries)))
+                             (file-attribute-type (cdar entries)))))
           (unless (or (and symlink (not dereference-links))
                       (and only-one-filesystem
                            (/= only-one-filesystem
-                               (nth 12 (car entries)))))
+                               (file-attribute-device-number (cdar entries)))))
             (if symlink
                 (setq entry symlink))
             (setq size
                   (+ size
-                     (if (eq t (cadr (car entries)))
+                     (if (eq t (car (cdar entries)))
                          (eshell-du-sum-directory entry (1+ depth))
-                       (let ((file-size (nth 8 (car entries))))
+                       (let ((file-size (file-attribute-size (cdar entries))))
                          (prog1
                              file-size
                            (if show-all
@@ -926,7 +929,7 @@ Summarize disk usage of each FILE, recursively for directories.")
          (while args
            (if only-one-filesystem
                (setq only-one-filesystem
-                     (nth 11 (eshell-file-attributes
+                     (file-attribute-device-number (eshell-file-attributes
                               (file-name-as-directory (car args))))))
            (setq size (+ size (eshell-du-sum-directory
                                (directory-file-name (car args)) 0)))
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 5ef1ae41297..8fe8c461fdb 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -447,7 +447,7 @@ list."
           (not (symbol-value timestamp-var))
           (time-less-p
            (symbol-value timestamp-var)
-           (nth 5 (file-attributes file))))
+           (file-attribute-modification-time (file-attributes file))))
       (progn
         (set result-var (eshell-read-passwd-file file))
         (set timestamp-var (current-time))))
@@ -501,7 +501,7 @@ list."
           (not (symbol-value timestamp-var))
           (time-less-p
            (symbol-value timestamp-var)
-           (nth 5 (file-attributes file))))
+           (file-attribute-modification-time (file-attributes file))))
       (progn
         (set result-var (eshell-read-hosts-file file))
         (set timestamp-var (current-time))))