[Emacs-diffs] /srv/bzr/emacs/trunk r106156: tar-grind-file-mode fix.

[Glenn Morris]

------------------------------------------------------------
revno: 106156
fixes bug(s): http://debbugs.gnu.org/9817
author: Ulrich Mueller <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-10-20 23:44:20 -0700
message:
  tar-grind-file-mode fix.
  
  * lisp/tar-mode.el (tar-grind-file-mode):
  Fix handling of setuid/setgid, handle sticky bit.
modified:
  lisp/ChangeLog
  lisp/tar-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-21 02:23:59 +0000
+++ b/lisp/ChangeLog    2011-10-21 06:44:20 +0000
@@ -1,3 +1,8 @@
+2011-10-21  Ulrich Mueller  <address@hidden>
+
+       * tar-mode.el (tar-grind-file-mode):
+       Fix handling of setuid/setgid, handle sticky bit.  (Bug#9817)
+
 2011-10-21  Chong Yidong  <address@hidden>
 
        * progmodes/idlwave.el (idlwave-mode):

=== modified file 'lisp/tar-mode.el'
--- a/lisp/tar-mode.el  2011-07-06 02:42:10 +0000
+++ b/lisp/tar-mode.el  2011-10-21 06:44:20 +0000
@@ -404,13 +404,19 @@
   (string
    (if (zerop (logand 256 mode)) ?- ?r)
    (if (zerop (logand 128 mode)) ?- ?w)
-   (if (zerop (logand 1024 mode)) (if (zerop (logand  64 mode)) ?- ?x) ?s)
+   (if (zerop (logand 2048 mode))
+       (if (zerop (logand  64 mode)) ?- ?x)
+     (if (zerop (logand  64 mode)) ?S ?s))
    (if (zerop (logand  32 mode)) ?- ?r)
    (if (zerop (logand  16 mode)) ?- ?w)
-   (if (zerop (logand 2048 mode)) (if (zerop (logand   8 mode)) ?- ?x) ?s)
+   (if (zerop (logand 1024 mode))
+       (if (zerop (logand   8 mode)) ?- ?x)
+     (if (zerop (logand   8 mode)) ?S ?s))
    (if (zerop (logand   4 mode)) ?- ?r)
    (if (zerop (logand   2 mode)) ?- ?w)
-   (if (zerop (logand   1 mode)) ?- ?x)))
+   (if (zerop (logand 512 mode))
+       (if (zerop (logand   1 mode)) ?- ?x)
+     (if (zerop (logand   1 mode)) ?T ?t))))
 
 (defun tar-header-block-summarize (tar-hblock &optional mod-p)
   "Return a line similar to the output of `tar -vtf'."