Mercurial > emacs
changeset 97052:bed318e44ebd
* 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.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Mon, 28 Jul 2008 03:47:00 +0000 |
| parents | b25793a542d3 |
| children | 0e10e4363f29 |
| files | lisp/net/tramp.el |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/net/tramp.el Mon Jul 28 03:45:58 2008 +0000 +++ b/lisp/net/tramp.el Mon Jul 28 03:47:00 2008 +0000 @@ -1486,7 +1486,7 @@ ;; 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 @@ $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 @@ ;; 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 @@ (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 @@ (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."