From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 11 Apr 2014 08:11:57 +0000 (+0300)
Subject: src/w32.c (sys_umask) <WRITE_USER>: Remove redundant constant.
X-Git-Tag: emacs-24.3.90~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=95765a6ac3a02d60988bd9a4ad73f9d8154113da;p=emacs.git

src/w32.c (sys_umask) <WRITE_USER>: Remove redundant constant.

 src/w32.c (sys_umask) <WRITE_USER>: Remove redundant constant, and
 use S_IWRITE instead.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 9d59ab1c97c..22f25bef6f3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-11  Eli Zaretskii  <eliz@gnu.org>
+
+	* w32.c (sys_umask) <WRITE_USER>: Remove redundant constant, and
+	use S_IWRITE instead.
+
 2014-04-11  Glenn Morris  <rgm@gnu.org>
 
 	* keyboard.c (Fopen_dribble_file): Make file private.  (Bug#17187)
diff --git a/src/w32.c b/src/w32.c
index 8802e13e71d..0892f932bc2 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -5354,11 +5354,6 @@ utime (const char *name, struct utimbuf *times)
   return 0;
 }
 
-/* Emacs expects us to support the traditional octal form of the mode
-   bits, which is not what msvcrt.dll wants.  */
-
-#define WRITE_USER 00200
-
 int
 sys_umask (int mode)
 {
@@ -5370,14 +5365,14 @@ sys_umask (int mode)
      at all.  */
   /* FIXME: if the GROUP and OTHER bits are reset, we should use ACLs
      to prevent access by other users on NTFS.  */
-  if ((mode & WRITE_USER) != 0)
+  if ((mode & S_IWRITE) != 0)
     arg |= S_IWRITE;
 
   retval = _umask (arg);
   /* Merge into the return value the bits they've set the last time,
      which msvcrt.dll ignores and never returns.  Emacs insists on its
      notion of mask being identical to what we return.  */
-  retval |= (current_mask & ~WRITE_USER);
+  retval |= (current_mask & ~S_IWRITE);
   current_mask = mode;
 
   return retval;