aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2007-07-23 20:37:33 +0000
committerMichael Albinus2007-07-23 20:37:33 +0000
commitd4443a0d7d0f65bd73a2059a46cb9992ffbfd779 (patch)
treecb5293fc7baa5dd6172f0b3f170d85cda7fa2811
parent297b8ccd7a0a30b566ea95d6c3ac20a8e68e9818 (diff)
downloademacs-d4443a0d7d0f65bd73a2059a46cb9992ffbfd779.tar.gz
emacs-d4443a0d7d0f65bd73a2059a46cb9992ffbfd779.zip
* net/tramp.el (tramp-perl-file-attributes)
(tramp-perl-directory-files-and-attributes) (tramp-handle-file-attributes-with-stat) (tramp-handle-directory-files-and-attributes-with-stat( (tramp-convert-file-attributes): Handle huge file sizes.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/net/tramp.el13
2 files changed, 17 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8872038d0a..1c2cb6e9529 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12007-07-23 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp.el (tramp-perl-file-attributes)
4 (tramp-perl-directory-files-and-attributes)
5 (tramp-handle-file-attributes-with-stat)
6 (tramp-handle-directory-files-and-attributes-with-stat)
7 (tramp-convert-file-attributes): Handle huge file sizes.
8
12007-07-23 Juri Linkov <juri@jurta.org> 92007-07-23 Juri Linkov <juri@jurta.org>
2 10
3 * isearch.el (isearch-message-function): New variable. 11 * isearch.el (isearch-message-function): New variable.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index cbe7040f609..aa7456ad29a 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1528,7 +1528,7 @@ else
1528$uid = ($ARGV[1] eq \"integer\") ? $stat[4] : \"\\\"\" . getpwuid($stat[4]) . \"\\\"\"; 1528$uid = ($ARGV[1] eq \"integer\") ? $stat[4] : \"\\\"\" . getpwuid($stat[4]) . \"\\\"\";
1529$gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\"; 1529$gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\";
1530printf( 1530printf(
1531 \"(%%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u %%u t (%%u . %%u) -1)\\n\", 1531 \"(%%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u.0 %%u t (%%u . %%u) -1)\\n\",
1532 $type, 1532 $type,
1533 $stat[3], 1533 $stat[3],
1534 $uid, 1534 $uid,
@@ -1577,7 +1577,7 @@ for($i = 0; $i < $n; $i++)
1577 $uid = ($ARGV[1] eq \"integer\") ? $stat[4] : \"\\\"\" . getpwuid($stat[4]) . \"\\\"\"; 1577 $uid = ($ARGV[1] eq \"integer\") ? $stat[4] : \"\\\"\" . getpwuid($stat[4]) . \"\\\"\";
1578 $gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\"; 1578 $gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\";
1579 printf( 1579 printf(
1580 \"(\\\"%%s\\\" %%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u %%u t (%%u . %%u) (%%u %%u))\\n\", 1580 \"(\\\"%%s\\\" %%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u.0 %%u t (%%u . %%u) (%%u %%u))\\n\",
1581 $filename, 1581 $filename,
1582 $type, 1582 $type,
1583 $stat[3], 1583 $stat[3],
@@ -2390,7 +2390,7 @@ target of the symlink differ."
2390 (tramp-send-command-and-read 2390 (tramp-send-command-and-read
2391 vec 2391 vec
2392 (format 2392 (format
2393 "%s -c '((\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s \"%%A\" t %%i.0 -1)' %s" 2393 "%s -c '((\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)' %s"
2394 (tramp-get-remote-stat vec) 2394 (tramp-get-remote-stat vec)
2395 (if (eq id-format 'integer) "%u" "\"%U\"") 2395 (if (eq id-format 'integer) "%u" "\"%U\"")
2396 (if (eq id-format 'integer) "%g" "\"%G\"") 2396 (if (eq id-format 'integer) "%g" "\"%G\"")
@@ -2740,7 +2740,7 @@ of."
2740 (format 2740 (format
2741 (concat 2741 (concat
2742 "cd %s; echo \"(\"; (%s -ab | xargs " 2742 "cd %s; echo \"(\"; (%s -ab | xargs "
2743 "%s -c '(\"%%n\" (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s \"%%A\" t %%i.0 -1)'); " 2743 "%s -c '(\"%%n\" (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)'); "
2744 "echo \")\"") 2744 "echo \")\"")
2745 (tramp-shell-quote-argument localname) 2745 (tramp-shell-quote-argument localname)
2746 (tramp-get-ls-command vec) 2746 (tramp-get-ls-command vec)
@@ -6253,6 +6253,11 @@ Return ATTR."
6253 (setcar (nthcdr 6 attr) 6253 (setcar (nthcdr 6 attr)
6254 (list (floor (nth 6 attr) 65536) 6254 (list (floor (nth 6 attr) 65536)
6255 (floor (mod (nth 6 attr) 65536))))) 6255 (floor (mod (nth 6 attr) 65536)))))
6256 ;; Convert file size.
6257 (when (< (nth 7 attr) 0)
6258 (setcar (nthcdr 7 attr) -1))
6259 (when (and (floatp (nth 7 attr)) (<= (nth 7 attr) most-positive-fixnum))
6260 (setcar (nthcdr 7 attr) (round (nth 7 attr))))
6256 ;; Convert file mode bits to string. 6261 ;; Convert file mode bits to string.
6257 (unless (stringp (nth 8 attr)) 6262 (unless (stringp (nth 8 attr))
6258 (setcar (nthcdr 8 attr) (tramp-file-mode-from-int (nth 8 attr)))) 6263 (setcar (nthcdr 8 attr) (tramp-file-mode-from-int (nth 8 attr))))