[Emacs-diffs] /srv/bzr/emacs/trunk r111369: Fix bug #13298 with failed backups by falling back on set-file-modes.

[Eli Zaretskii]

------------------------------------------------------------
revno: 111369
fixes bug: http://debbugs.gnu.org/13298
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-12-29 16:32:36 +0200
message:
  Fix bug #13298 with failed backups by falling back on set-file-modes.
  
   src/fileio.c (Fset_file_selinux_context, Fset_file_acl): Return t if
   file's SELinux context or ACLs successfully set, nil otherwise.
  
   lisp/files.el (backup-buffer-copy, basic-save-buffer-2): If
   set-file-extended-attributes fails, fall back on set-file-modes
   instead of signaling an error.
  
   doc/lispref/files.texi (Changing Files): Document the return values of
   set-file-selinux-context and set-file-acl.
modified:
  doc/lispref/ChangeLog
  doc/lispref/files.texi
  lisp/ChangeLog
  lisp/files.el
  src/ChangeLog
  src/fileio.c

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-12-27 08:21:08 +0000
+++ b/doc/lispref/ChangeLog     2012-12-29 14:32:36 +0000
@@ -1,3 +1,8 @@
+2012-12-29  Eli Zaretskii  <address@hidden>
+
+       * files.texi (Changing Files): Document the return values of
+       set-file-selinux-context and set-file-acl.
+
 2012-12-27  Glenn Morris  <address@hidden>
 
        * files.texi (File Names): Mention Cygwin conversion functions.

=== modified file 'doc/lispref/files.texi'
--- a/doc/lispref/files.texi    2012-12-27 08:21:08 +0000
+++ b/doc/lispref/files.texi    2012-12-29 14:32:36 +0000
@@ -1703,9 +1703,11 @@
 @var{filename} to @var{context}.  @xref{File Attributes}, for a brief
 description of SELinux contexts.  The @var{context} argument should be
 a list @code{(@var{user} @var{role} @var{type} @var{range})}, like the
-return value of @code{file-selinux-context}.  The function does
-nothing if SELinux is disabled, or if Emacs was compiled without
-SELinux support.
+return value of @code{file-selinux-context}.  The function returns
address@hidden if it succeeds to set the SELinux security context of
address@hidden, @code{nil} otherwise.  The function does nothing and
+returns @code{nil} if SELinux is disabled, or if Emacs was compiled
+without SELinux support.
 @end defun
 
 @defun set-file-acl filename acl-string
@@ -1713,7 +1715,9 @@
 @var{acl-string}.  @xref{File Attributes}, for a brief description of
 ACLs.  The @var{acl-string} argument should be a string containing the
 textual representation of the desired ACL entries as returned by
address@hidden (@pxref{File Attributes, file-acl}).
address@hidden (@pxref{File Attributes, file-acl}).  The function
+returns @code{t} if it succeeds to set the ACL entries of
address@hidden, @code{nil} otherwise.
 @end defun
 
 @node File Names

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-29 12:57:49 +0000
+++ b/lisp/ChangeLog    2012-12-29 14:32:36 +0000
@@ -1,3 +1,9 @@
+2012-12-29  Eli Zaretskii  <address@hidden>
+
+       * files.el (backup-buffer-copy, basic-save-buffer-2): If
+       set-file-extended-attributes fails, fall back on set-file-modes
+       instead of signaling an error.  (Bug#13298)
+
 2012-12-29  Fabián Ezequiel Gallina  <address@hidden>
 
        * progmodes/python.el: Support other commands triggering

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2012-12-17 15:51:49 +0000
+++ b/lisp/files.el     2012-12-29 14:32:36 +0000
@@ -4019,10 +4019,12 @@
              nil)))
       ;; Reset the umask.
       (set-default-file-modes umask)))
-  (and modes
-       (set-file-modes to-name (logand modes #o1777)))
-  (and extended-attributes
-       (set-file-extended-attributes to-name extended-attributes)))
+  ;; If set-file-extended-attributes fails, fall back on set-file-modes.
+  (unless (and extended-attributes
+              (with-demoted-errors
+                (set-file-extended-attributes to-name extended-attributes)))
+    (and modes
+        (set-file-modes to-name (logand modes #o1777)))))
 
 (defvar file-name-version-regexp
   "\\(?:~\\|\\.~[-[:alnum:]:address@hidden(?:~[[:digit:]]+\\)?~\\)"
@@ -4737,8 +4739,14 @@
               (setq setmodes (list (file-modes buffer-file-name)
                                    (file-extended-attributes buffer-file-name)
                                    buffer-file-name))
-              (set-file-modes buffer-file-name (logior (car setmodes) 128))
-              (set-file-extended-attributes buffer-file-name (nth 1 
setmodes)))))
+              ;; If set-file-extended-attributes fails, fall back on
+              ;; set-file-modes.
+              (unless
+                  (with-demoted-errors
+                    (set-file-extended-attributes buffer-file-name
+                                                  (nth 1 setmodes)))
+                (set-file-modes buffer-file-name
+                                (logior (car setmodes) 128))))))
        (let (success)
          (unwind-protect
              (progn

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-29 10:09:49 +0000
+++ b/src/ChangeLog     2012-12-29 14:32:36 +0000
@@ -1,5 +1,9 @@
 2012-12-29  Eli Zaretskii  <address@hidden>
 
+       * fileio.c (Fset_file_selinux_context, Fset_file_acl): Return t if
+       file's SELinux context or ACLs successfully set, nil otherwise.
+       (Bug#13298)
+
        * w32proc.c (reader_thread): Avoid passing NULL handles to
        SetEvent and WaitForSingleObject.
 

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2012-12-27 08:21:08 +0000
+++ b/src/fileio.c      2012-12-29 14:32:36 +0000
@@ -2996,8 +2996,10 @@
 CONTEXT should be a list (USER ROLE TYPE RANGE), where the list
 elements are strings naming the components of a SELinux context.
 
-This function does nothing if SELinux is disabled, or if Emacs was not
-compiled with SELinux support.  */)
+Value is t if setting of SELinux context was successful, nil otherwise.
+
+This function does nothing and returns nil if SELinux is disabled,
+or if Emacs was not compiled with SELinux support.  */)
   (Lisp_Object filename, Lisp_Object context)
 {
   Lisp_Object absname;
@@ -3063,6 +3065,7 @@
 
          context_free (parsed_con);
          freecon (con);
+         return Qt;
        }
       else
        report_file_error ("Doing lgetfilecon", Fcons (absname, Qnil));
@@ -3127,6 +3130,8 @@
 ACL-STRING should contain the textual representation of the ACL
 entries in a format suitable for the platform.
 
+Value is t if setting of ACL was successful, nil otherwise.
+
 Setting ACL for local files requires Emacs to be built with ACL
 support.  */)
   (Lisp_Object filename, Lisp_Object acl_string)
@@ -3166,6 +3171,7 @@
        report_file_error ("Setting ACL", Fcons (absname, Qnil));
 
       acl_free (acl);
+      return Qt;
     }
 #endif