X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmakepath.c;h=65a62ffac35560f39f4e799587c1ee9ceef0b400;hb=e09a10a64b73f68041ba64de52dba9c91d04bca1;hp=bf6ba318761c3ae864d365c836e7e935954b10f2;hpb=60cbbda7e63521392230e1eb7d4ae81c34784e5c;p=gnulib.git

diff --git a/lib/makepath.c b/lib/makepath.c
index bf6ba3187..65a62ffac 100644
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -1,5 +1,5 @@
 /* makepath.c -- Ensure that a directory path exists.
-   Copyright (C) 1990, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997, 1998, 1999, 2000 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
@@ -50,6 +50,10 @@ char *alloca ();
 # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
+#ifndef S_IRWXUGO
+# define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO)
+#endif
+
 #if STDC_HEADERS
 # include <stdlib.h>
 #endif
@@ -96,6 +100,9 @@ extern int errno;
 
 #define WX_USR (S_IWUSR | S_IXUSR)
 
+/* Include this before libintl.h so we get our definition of PARAMS. */
+#include "makepath.h"
+
 #if HAVE_LOCALE_H
 # include <locale.h>
 #endif
@@ -107,13 +114,7 @@ extern int errno;
 # define _(Text) Text
 #endif
 
-#ifdef __MSDOS__
-typedef int uid_t;
-typedef int gid_t;
-#endif
-
 #include "save-cwd.h"
-#include "makepath.h"
 #include "error.h"
 
 void strip_trailing_slashes ();
@@ -160,6 +161,7 @@ make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p)
   if (!created_dir)
     {
       struct stat stats;
+      int saved_errno = errno;
 
       /* The mkdir and stat calls below may appear to be reversed.
 	 They are not.  It is important to call mkdir first and then to
@@ -171,7 +173,7 @@ make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p)
 
       if (stat (dir, &stats))
 	{
-	  error (0, errno, _("cannot create directory `%s'"), dirpath);
+	  error (0, saved_errno, _("cannot create directory `%s'"), dirpath);
 	  fail = 1;
 	}
       else if (!S_ISDIR (stats.st_mode))
@@ -305,7 +307,7 @@ make_path (const char *argpath,
 	  if (newly_created_dir)
 	    {
 	      if (verbose_fmt_string)
-		fprintf (stderr, verbose_fmt_string, dirpath);
+		error (0, 0, verbose_fmt_string, dirpath);
 
 	      if ((owner != (uid_t) -1 || group != (gid_t) -1)
 		  && chown (basename_dir, owner, group)
@@ -366,7 +368,7 @@ make_path (const char *argpath,
       if (verbose_fmt_string != NULL)
 	error (0, 0, verbose_fmt_string, dirpath);
 
-      if (owner != (uid_t) -1 && group != (gid_t) -1)
+      if (owner != (uid_t) -1 || group != (gid_t) -1)
 	{
 	  if (chown (basename_dir, owner, group)
 #ifdef AFS
@@ -377,13 +379,18 @@ make_path (const char *argpath,
 	      error (0, errno, _("cannot chown %s"), dirpath);
 	      retval = 1;
 	    }
-	  /* chown may have turned off some permission bits we wanted.  */
-	  if ((mode & (S_ISUID | S_ISGID | S_ISVTX))
-	      && chmod (basename_dir, mode))
-	    {
-	      error (0, errno, _("cannot chmod %s"), dirpath);
-	      retval = 1;
-	    }
+	}
+
+      /* The above chown may have turned off some permission bits in MODE.
+	 Another reason we may have to use chmod here is that mkdir(2) is
+	 required to honor only the file permission bits.  In particular,
+	 it need not honor the `special' bits, so if MODE includes any
+	 special bits, set them here.  */
+      if ((mode & ~S_IRWXUGO)
+	  && chmod (basename_dir, mode))
+	{
+	  error (0, errno, _("cannot chmod %s"), dirpath);
+	  retval = 1;
 	}
 
       CLEANUP_CWD;