*** empty log message ***

[gnulib.git] / lib / makepath.c

diff --git a/lib/makepath.c b/lib/makepath.c
index 00d4246..bf3528e 100644 (file)
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -71,16 +71,34 @@ extern int errno;
 # endif
 #endif
 
+#ifndef S_ISUID
+# define S_ISUID 04000
+#endif
+#ifndef S_ISGID
+# define S_ISGID 02000
+#endif
+#ifndef S_ISVTX
+# define S_ISVTX 01000
+#endif
+#ifndef S_IRUSR
+# define S_IRUSR 0200
+#endif
 #ifndef S_IWUSR
 # define S_IWUSR 0200
 #endif
-
 #ifndef S_IXUSR
 # define S_IXUSR 0100
 #endif
 
+#ifndef S_IRWXU
+# define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR)
+#endif
+
 #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
@@ -98,7 +116,6 @@ typedef int gid_t;
 #endif
 
 #include "save-cwd.h"
-#include "makepath.h"
 #include "error.h"
 
 void strip_trailing_slashes ();
@@ -145,6 +162,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
@@ -156,7 +174,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))
@@ -223,7 +241,7 @@ make_path (const char *argpath,
       char *dirpath;
 
       /* Temporarily relax umask in case it's overly restrictive.  */
-      int oldmask = umask (0);
+      mode_t oldmask = umask (0);
 
       /* Make a copy of ARGPATH that we can scribble NULs on.  */
       dirpath = (char *) alloca (strlen (argpath) + 1);
@@ -235,9 +253,9 @@ make_path (const char *argpath,
         their owners, we need to fix their permissions after making them.  */
       if (((parent_mode & WX_USR) != WX_USR)
          || ((owner != (uid_t) -1 || group != (gid_t) -1)
-             && (parent_mode & 07000) != 0))
+             && (parent_mode & (S_ISUID | S_ISGID | S_ISVTX)) != 0))
        {
-         tmp_mode = 0700;
+         tmp_mode = S_IRWXU;
          re_protect = 1;
        }
       else
@@ -290,7 +308,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)
@@ -351,7 +369,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
@@ -363,7 +381,8 @@ make_path (const char *argpath,
              retval = 1;
            }
          /* chown may have turned off some permission bits we wanted.  */
-         if ((mode & 07000) != 0 && chmod (basename_dir, mode))
+         if ((mode & (S_ISUID | S_ISGID | S_ISVTX))
+             && chmod (basename_dir, mode))
            {
              error (0, errno, _("cannot chmod %s"), dirpath);
              retval = 1;