diff options
| author | Michael Albinus | 2019-08-25 13:44:11 +0200 |
|---|---|---|
| committer | Michael Albinus | 2019-08-25 13:44:11 +0200 |
| commit | ae7ab3b6ee5237b202d6104aadc2b3f3742f2bf7 (patch) | |
| tree | eeae41798e4b070bcd2c32a6b3622727b06364cb | |
| parent | 29d1c72d7c98ea23d5af434c5af6b39a5bd264d9 (diff) | |
| download | emacs-ae7ab3b6ee5237b202d6104aadc2b3f3742f2bf7.tar.gz emacs-ae7ab3b6ee5237b202d6104aadc2b3f3742f2bf7.zip | |
Fix a further part of Bug#36940
* lisp/net/tramp-sh.el (tramp-perl-file-attributes)
(tramp-perl-directory-files-and-attributes)
(tramp-do-file-attributes-with-stat)
(tramp-do-directory-files-and-attributes-with-stat): Return size
and inode as floating number. (Bug#36940).
| -rw-r--r-- | lisp/net/tramp-sh.el | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index f1f0abc6e5c..1f7c8f6e491 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -669,7 +669,7 @@ else | |||
| 669 | $uid = ($ARGV[1] eq \"integer\") ? $stat[4] : \"\\\"\" . getpwuid($stat[4]) . \"\\\"\"; | 669 | $uid = ($ARGV[1] eq \"integer\") ? $stat[4] : \"\\\"\" . getpwuid($stat[4]) . \"\\\"\"; |
| 670 | $gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\"; | 670 | $gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\"; |
| 671 | printf( | 671 | printf( |
| 672 | \"(%%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u %%u t %%u -1)\\n\", | 672 | \"(%%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u.0 %%u t %%u.0 -1)\\n\", |
| 673 | $type, | 673 | $type, |
| 674 | $stat[3], | 674 | $stat[3], |
| 675 | $uid, | 675 | $uid, |
| @@ -719,7 +719,7 @@ for($i = 0; $i < $n; $i++) | |||
| 719 | $gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\"; | 719 | $gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\"; |
| 720 | $filename =~ s/\"/\\\\\"/g; | 720 | $filename =~ s/\"/\\\\\"/g; |
| 721 | printf( | 721 | printf( |
| 722 | \"(\\\"%%s\\\" %%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u.0 %%u t (%%u . %%u) (%%u . %%u))\\n\", | 722 | \"(\\\"%%s\\\" %%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u.0 %%u t %%u.0 -1)\\n\", |
| 723 | $filename, | 723 | $filename, |
| 724 | $type, | 724 | $type, |
| 725 | $stat[3], | 725 | $stat[3], |
| @@ -733,10 +733,7 @@ for($i = 0; $i < $n; $i++) | |||
| 733 | $stat[10] & 0xffff, | 733 | $stat[10] & 0xffff, |
| 734 | $stat[7], | 734 | $stat[7], |
| 735 | $stat[2], | 735 | $stat[2], |
| 736 | $stat[1] >> 16 & 0xffff, | 736 | $stat[1]); |
| 737 | $stat[1] & 0xffff, | ||
| 738 | $stat[0] >> 16 & 0xffff, | ||
| 739 | $stat[0] & 0xffff); | ||
| 740 | } | 737 | } |
| 741 | printf(\")\\n\");' \"$1\" \"$2\" 2>/dev/null" | 738 | printf(\")\\n\");' \"$1\" \"$2\" 2>/dev/null" |
| 742 | "Perl script implementing `directory-files-attributes' as Lisp `read'able | 739 | "Perl script implementing `directory-files-attributes' as Lisp `read'able |
| @@ -1356,7 +1353,7 @@ component is used as the target of the symlink." | |||
| 1356 | ;; `tramp-stat-marker', in order to make a proper shell escape | 1353 | ;; `tramp-stat-marker', in order to make a proper shell escape |
| 1357 | ;; of them in file names. | 1354 | ;; of them in file names. |
| 1358 | "( (%s %s || %s -h %s) && (%s -c " | 1355 | "( (%s %s || %s -h %s) && (%s -c " |
| 1359 | "'((%s%%N%s) %%h %s %s %%X %%Y %%Z %%s %s%%A%s t %%i -1)' " | 1356 | "'((%s%%N%s) %%h %s %s %%X %%Y %%Z %%s.0 %s%%A%s t %%i.0 -1)' " |
| 1360 | "%s | sed -e 's/\"/\\\\\"/g' -e 's/%s/\"/g') || echo nil)")) | 1357 | "%s | sed -e 's/\"/\\\\\"/g' -e 's/%s/\"/g') || echo nil)")) |
| 1361 | (tramp-get-file-exists-command vec) | 1358 | (tramp-get-file-exists-command vec) |
| 1362 | (tramp-shell-quote-argument localname) | 1359 | (tramp-shell-quote-argument localname) |
| @@ -1767,7 +1764,7 @@ of." | |||
| 1767 | ;; of them in file names. | 1764 | ;; of them in file names. |
| 1768 | "cd %s && echo \"(\"; (%s %s -a | " | 1765 | "cd %s && echo \"(\"; (%s %s -a | " |
| 1769 | "xargs %s -c " | 1766 | "xargs %s -c " |
| 1770 | "'(%s%%n%s (%s%%N%s) %%h %s %s %%X %%Y %%Z %%s %s%%A%s t %%i -1)' " | 1767 | "'(%s%%n%s (%s%%N%s) %%h %s %s %%X %%Y %%Z %%s.0 %s%%A%s t %%i.0 -1)' " |
| 1771 | "-- 2>/dev/null | sed -e 's/\"/\\\\\"/g' -e 's/%s/\"/g'); echo \")\"")) | 1768 | "-- 2>/dev/null | sed -e 's/\"/\\\\\"/g' -e 's/%s/\"/g'); echo \")\"")) |
| 1772 | (tramp-shell-quote-argument localname) | 1769 | (tramp-shell-quote-argument localname) |
| 1773 | (tramp-get-ls-command vec) | 1770 | (tramp-get-ls-command vec) |