X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmodechange.c;h=a102b6956f6bbdf362a1e292b988ec5b61dc3822;hb=d36212cb0a461bc3f063ecbcb1c4d88316eaa397;hp=4456e6b16cec3be7db39b92045aca454fead15cc;hpb=43b0594f91c32af75ee466e7d653915eb778db2c;p=gnulib.git

diff --git a/lib/modechange.c b/lib/modechange.c
index 4456e6b16..a102b6956 100644
--- a/lib/modechange.c
+++ b/lib/modechange.c
@@ -1,5 +1,5 @@
 /* modechange.c -- file mode manipulation
-   Copyright (C) 1989, 1990, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1997, 1998, 1999, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -194,18 +194,18 @@ mode_compile (const char *mode_string, unsigned int masked_ops)
 	       && S_IRGRP == RGRP && S_IWGRP == WGRP && S_IXGRP == XGRP
 	       && S_IROTH == ROTH && S_IWOTH == WOTH && S_IXOTH == XOTH)
 	      ? octal_value
-	      : ((octal_value & SUID ? S_ISUID : 0)
-		 | (octal_value & SGID ? S_ISGID : 0)
-		 | (octal_value & SVTX ? S_ISVTX : 0)
-		 | (octal_value & RUSR ? S_IRUSR : 0)
-		 | (octal_value & WUSR ? S_IWUSR : 0)
-		 | (octal_value & XUSR ? S_IXUSR : 0)
-		 | (octal_value & RGRP ? S_IRGRP : 0)
-		 | (octal_value & WGRP ? S_IWGRP : 0)
-		 | (octal_value & XGRP ? S_IXGRP : 0)
-		 | (octal_value & ROTH ? S_IROTH : 0)
-		 | (octal_value & WOTH ? S_IWOTH : 0)
-		 | (octal_value & XOTH ? S_IXOTH : 0)));
+	      : (mode_t) ((octal_value & SUID ? S_ISUID : 0)
+			  | (octal_value & SGID ? S_ISGID : 0)
+			  | (octal_value & SVTX ? S_ISVTX : 0)
+			  | (octal_value & RUSR ? S_IRUSR : 0)
+			  | (octal_value & WUSR ? S_IWUSR : 0)
+			  | (octal_value & XUSR ? S_IXUSR : 0)
+			  | (octal_value & RGRP ? S_IRGRP : 0)
+			  | (octal_value & WGRP ? S_IWGRP : 0)
+			  | (octal_value & XGRP ? S_IXGRP : 0)
+			  | (octal_value & ROTH ? S_IROTH : 0)
+			  | (octal_value & WOTH ? S_IWOTH : 0)
+			  | (octal_value & XOTH ? S_IXOTH : 0)));
 
       p = make_node_op_equals (mode);
       if (p == NULL)
@@ -413,23 +413,23 @@ mode_adjust (mode_t oldmode, const struct mode_change *changes)
 
 	  if (changes->value & S_IRWXU)
 	    /* Copy `u' permissions onto `g' and `o'. */
-	    value |= ((value & S_IRUSR ? S_IRGRP | S_IROTH : 0)
-		      | (value & S_IWUSR ? S_IWGRP | S_IROTH : 0)
+	    value |= (  (value & S_IRUSR ? S_IRGRP | S_IROTH : 0)
+		      | (value & S_IWUSR ? S_IWGRP | S_IWOTH : 0)
 		      | (value & S_IXUSR ? S_IXGRP | S_IXOTH : 0));
 	  else if (changes->value & S_IRWXG)
 	    /* Copy `g' permissions onto `u' and `o'. */
-	    value |= ((value & S_IRGRP ? S_IRUSR | S_IROTH : 0)
-		      | (value & S_IWGRP ? S_IWUSR | S_IROTH : 0)
+	    value |= (  (value & S_IRGRP ? S_IRUSR | S_IROTH : 0)
+		      | (value & S_IWGRP ? S_IWUSR | S_IWOTH : 0)
 		      | (value & S_IXGRP ? S_IXUSR | S_IXOTH : 0));
 	  else
 	    /* Copy `o' permissions onto `u' and `g'. */
-	    value |= ((value & S_IROTH ? S_IRUSR | S_IRGRP : 0)
-		      | (value & S_IWOTH ? S_IWUSR | S_IRGRP : 0)
+	    value |= (  (value & S_IROTH ? S_IRUSR | S_IRGRP : 0)
+		      | (value & S_IWOTH ? S_IWUSR | S_IWGRP : 0)
 		      | (value & S_IXOTH ? S_IXUSR | S_IXGRP : 0));
 
 	  /* In order to change only `u', `g', or `o' permissions,
 	     or some combination thereof, clear unselected bits.
-	     This can not be done in mode_compile because the value
+	     This cannot be done in mode_compile because the value
 	     to which the `changes->affected' mask is applied depends
 	     on the old mode of each file. */
 	  value &= changes->affected;