Mercurial > emacs
changeset 80644:725d73e3e93b
* net/tramp.el (tramp-perl-directory-files-and-attributes)
(tramp-get-device): Make device number a cons cell.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Mon, 28 Jul 2008 03:54:04 +0000 |
| parents | 159b77870cd1 |
| children | 6b0ef5d1c3de |
| files | lisp/net/tramp.el |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/net/tramp.el Sat Jul 26 07:34:26 2008 +0000 +++ b/lisp/net/tramp.el Mon Jul 28 03:54:04 2008 +0000 @@ -1671,7 +1671,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 "\ @stat = lstat($ARGV[0]); if (($stat[2] & 0170000) == 0120000) @@ -1736,7 +1736,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 %u t (%u . %u) (%u %u))\\n\", + \"(\\\"%s\\\" %s %u %s %s (%u %u) (%u %u) (%u %u) %u %u t (%u . %u) (%u . %u))\\n\", $filename, $type, $stat[3], @@ -2343,7 +2343,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 (multi-method method user host). +;; (-1 . x), whereby "x" is unique for a given (multi-method method user host). (defvar tramp-devices nil "Keeps virtual device numbers.") @@ -7005,7 +7005,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."