* net/tramp.el (tramp-perl-directory-files-and-attributes)

(tramp-get-device): Make device number a cons cell.
(tramp-convert-file-attributes): Make inode a cons cell.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index a9c56fa5aea8e27f15f91ee781dec5c8d6bb68f8..8c836aea4fa18c38ebb29cff987890fda2eca81e 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1486,7 +1486,7 @@ we have this shell function.")
 ;; unless this spits out a complete line, including the '\n' at the
 ;; end.
 ;; The device number is returned as "-1", because there will be a virtual
-;; device number set in `tramp-handle-file-attributes'
+;; device number set in `tramp-handle-file-attributes'.
 (defconst tramp-perl-file-attributes
   "%s -e '
 @stat = lstat($ARGV[0]);
@@ -1555,7 +1555,7 @@ for($i = 0; $i < $n; $i++)
     $uid = ($ARGV[1] eq \"integer\") ? $stat[4] : \"\\\"\" . getpwuid($stat[4]) . \"\\\"\";
     $gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\";
     printf(
-        \"(\\\"%%s\\\" %%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u.0 %%u t (%%u . %%u) (%%u %%u))\\n\",
+        \"(\\\"%%s\\\" %%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u.0 %%u t (%%u . %%u) (%%u . %%u))\\n\",
         $filename,
         $type,
         $stat[3],
@@ -2327,7 +2327,7 @@ target of the symlink differ."
 ;; provided by "lstat" aren't unique, because we operate on different hosts.
 ;; So we use virtual device numbers, generated by Tramp.  Both Ange-FTP and
 ;; EFS use device number "-1".  In order to be different, we use device number
-;; (-1 x), whereby "x" is unique for a given (method user host).
+;; (-1 . x), whereby "x" is unique for a given (method user host).
 (defvar tramp-devices nil
   "Keeps virtual device numbers.")
 
@@ -6645,7 +6645,7 @@ Return ATTR."
   (unless (listp (nth 10 attr))
     (setcar (nthcdr 10 attr)
            (condition-case nil
-               (list (floor (nth 10 attr) 65536)
+               (cons (floor (nth 10 attr) 65536)
                      (floor (mod (nth 10 attr) 65536)))
              ;; Inodes can be incredible huge.  We must hide this.
              (error (tramp-get-inode vec)))))
@@ -6678,7 +6678,7 @@ If it doesn't exist, generate a new one."
     (unless (assoc string tramp-devices)
       (add-to-list 'tramp-devices
                   (list string (length tramp-devices))))
-    (list -1 (nth 1 (assoc string tramp-devices)))))
+    (cons -1 (nth 1 (assoc string tramp-devices)))))
 
 (defun tramp-file-mode-from-int (mode)
   "Turn an integer representing a file mode into an ls(1)-like string."