Commit 7f5344e1 authored by Michael Albinus's avatar Michael Albinus
Browse files

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

(tramp-get-device): Make device number a cons cell.
parent 4874e088
2008-07-27 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-perl-directory-files-and-attributes)
(tramp-get-device): Make device number a cons cell.
2008-07-25 Chong Yidong <cyd@stupidchicken.com>
 
* textmodes/tex-mode.el (tex-compilation-parse-errors): Check for
......@@ -1671,7 +1671,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 "\
@stat = lstat($ARGV[0]);
if (($stat[2] & 0170000) == 0120000)
......@@ -1736,7 +1736,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 %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 @@ 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 (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 @@ 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."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment