X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirchownmod.c;h=a07c5f0c9b9a662a1a645ffc22c56ee7290ef519;hb=fbe6ced5d2fdadeeea4194725d05a52cf3b5ebd7;hp=3b21a758a5c4a5b0db3fdfba59c2810fe4e24f0c;hpb=3247f1f8ad0dc42bbf863d481e4111b4735e4bb5;p=gnulib.git

diff --git a/lib/dirchownmod.c b/lib/dirchownmod.c
index 3b21a758a..a07c5f0c9 100644
--- a/lib/dirchownmod.c
+++ b/lib/dirchownmod.c
@@ -1,6 +1,6 @@
 /* Change the ownership and mode bits of a directory.
 
-   Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 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
@@ -59,8 +59,8 @@
 
 int
 dirchownmod (int fd, char const *dir, mode_t mkdir_mode,
-	     uid_t owner, gid_t group,
-	     mode_t mode, mode_t mode_bits)
+             uid_t owner, gid_t group,
+             mode_t mode, mode_t mode_bits)
 {
   struct stat st;
   int result = (fd < 0 ? stat (dir, &st) : fstat (fd, &st));
@@ -70,71 +70,71 @@ dirchownmod (int fd, char const *dir, mode_t mkdir_mode,
       mode_t dir_mode = st.st_mode;
 
       /* Check whether DIR is a directory.  If FD is nonnegative, this
-	 check avoids changing the ownership and mode bits of the
-	 wrong file in many cases.  This doesn't fix all the race
-	 conditions, but it is better than nothing.  */
+         check avoids changing the ownership and mode bits of the
+         wrong file in many cases.  This doesn't fix all the race
+         conditions, but it is better than nothing.  */
       if (! S_ISDIR (dir_mode))
-	{
-	  errno = ENOTDIR;
-	  result = -1;
-	}
+        {
+          errno = ENOTDIR;
+          result = -1;
+        }
       else
-	{
-	  /* If at least one of the S_IXUGO bits are set, chown might
-	     clear the S_ISUID and S_SGID bits.  Keep track of any
-	     file mode bits whose values are indeterminate due to this
-	     issue.  */
-	  mode_t indeterminate = 0;
-
-	  /* On some systems, chown clears S_ISUID and S_ISGID, so do
-	     chown before chmod.  On older System V hosts, ordinary
-	     users can give their files away via chown; don't worry
-	     about that here, since users shouldn't do that.  */
-
-	  if ((owner != (uid_t) -1 && owner != st.st_uid)
-	      || (group != (gid_t) -1 && group != st.st_gid))
-	    {
-	      result = (0 <= fd
-			? fchown (fd, owner, group)
-			: mkdir_mode != (mode_t) -1
-			? lchown (dir, owner, group)
-			: chown (dir, owner, group));
-
-	      /* Either the user cares about an indeterminate bit and
-		 it'll be set properly by chmod below, or the user
-		 doesn't care and it's OK to use the bit's pre-chown
-		 value.  So there's no need to re-stat DIR here.  */
-
-	      if (result == 0 && (dir_mode & S_IXUGO))
-		indeterminate = dir_mode & (S_ISUID | S_ISGID);
-	    }
-
-	  /* If the file mode bits might not be right, use chmod to
-	     change them.  Don't change bits the user doesn't care
-	     about.  */
-	  if (result == 0 && (((dir_mode ^ mode) | indeterminate) & mode_bits))
-	    {
-	      mode_t chmod_mode =
-		mode | (dir_mode & CHMOD_MODE_BITS & ~mode_bits);
-	      result = (HAVE_FCHMOD && 0 <= fd
-			? fchmod (fd, chmod_mode)
-			: mkdir_mode != (mode_t) -1
-			? lchmod (dir, chmod_mode)
-			: chmod (dir, chmod_mode));
-	    }
-	}
+        {
+          /* If at least one of the S_IXUGO bits are set, chown might
+             clear the S_ISUID and S_SGID bits.  Keep track of any
+             file mode bits whose values are indeterminate due to this
+             issue.  */
+          mode_t indeterminate = 0;
+
+          /* On some systems, chown clears S_ISUID and S_ISGID, so do
+             chown before chmod.  On older System V hosts, ordinary
+             users can give their files away via chown; don't worry
+             about that here, since users shouldn't do that.  */
+
+          if ((owner != (uid_t) -1 && owner != st.st_uid)
+              || (group != (gid_t) -1 && group != st.st_gid))
+            {
+              result = (0 <= fd
+                        ? fchown (fd, owner, group)
+                        : mkdir_mode != (mode_t) -1
+                        ? lchown (dir, owner, group)
+                        : chown (dir, owner, group));
+
+              /* Either the user cares about an indeterminate bit and
+                 it'll be set properly by chmod below, or the user
+                 doesn't care and it's OK to use the bit's pre-chown
+                 value.  So there's no need to re-stat DIR here.  */
+
+              if (result == 0 && (dir_mode & S_IXUGO))
+                indeterminate = dir_mode & (S_ISUID | S_ISGID);
+            }
+
+          /* If the file mode bits might not be right, use chmod to
+             change them.  Don't change bits the user doesn't care
+             about.  */
+          if (result == 0 && (((dir_mode ^ mode) | indeterminate) & mode_bits))
+            {
+              mode_t chmod_mode =
+                mode | (dir_mode & CHMOD_MODE_BITS & ~mode_bits);
+              result = (HAVE_FCHMOD && 0 <= fd
+                        ? fchmod (fd, chmod_mode)
+                        : mkdir_mode != (mode_t) -1
+                        ? lchmod (dir, chmod_mode)
+                        : chmod (dir, chmod_mode));
+            }
+        }
     }
 
   if (0 <= fd)
     {
       if (result == 0)
-	result = close (fd);
+        result = close (fd);
       else
-	{
-	  int e = errno;
-	  close (fd);
-	  errno = e;
-	}
+        {
+          int e = errno;
+          close (fd);
+          errno = e;
+        }
     }
 
   return result;