2007-01-08 Bruno Haible <bruno@clisp.org>

[gnulib.git] / lib / mkdir-p.c

diff --git a/lib/mkdir-p.c b/lib/mkdir-p.c
index 3838c8e..a927d5d 100644 (file)
--- a/lib/mkdir-p.c
+++ b/lib/mkdir-p.c
@@ -25,20 +25,28 @@
 
 #include <errno.h>
 #include <sys/stat.h>
 
 #include <errno.h>
 #include <sys/stat.h>

+#include <unistd.h>

 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

-#include "dirchownmod.c"
+#include "dirchownmod.h"
+#include "dirname.h"

 #include "error.h"
 #include "quote.h"
 #include "mkancesdirs.h"
 #include "error.h"
 #include "quote.h"
 #include "mkancesdirs.h"

-#include "stat-macros.h"
+#include "savewd.h"
+
+#ifndef HAVE_FCHMOD
+# define HAVE_FCHMOD false
+#endif

 
 /* Ensure that the directory DIR exists.
 
 
 /* Ensure that the directory DIR exists.
 

+   WD is the working directory, as in savewd.c.
+

    If MAKE_ANCESTOR is not null, create any ancestor directories that
    If MAKE_ANCESTOR is not null, create any ancestor directories that

-   don't already exist, by invoking MAKE_ANCESTOR (ANCESTOR, OPTIONS).
+   don't already exist, by invoking MAKE_ANCESTOR (DIR, ANCESTOR, OPTIONS).

    This function should return zero if successful, -1 (setting errno)
    otherwise.  In this case, DIR may be modified by storing '\0' bytes
    into it, to access the ancestor directories, and this modification
    This function should return zero if successful, -1 (setting errno)
    otherwise.  In this case, DIR may be modified by storing '\0' bytes
    into it, to access the ancestor directories, and this modification


@@ -46,7 +54,7 @@
    created.
 
    Create DIR as a new directory with using mkdir with permissions
    created.
 
    Create DIR as a new directory with using mkdir with permissions

-   MODE.  It is also OK if MAKE_ANCESTOR_DIR is not null and a
+   MODE.  It is also OK if MAKE_ANCESTOR is not null and a

    directory DIR already exists.
 
    Call ANNOUNCE (DIR, OPTIONS) just after successfully making DIR,
    directory DIR already exists.
 
    Call ANNOUNCE (DIR, OPTIONS) just after successfully making DIR,


@@ -69,13 +77,16 @@
    This implementation assumes the current umask is zero.
 
    Return true if DIR exists as a directory with the proper ownership
    This implementation assumes the current umask is zero.
 
    Return true if DIR exists as a directory with the proper ownership

-   and file mode bits when done.  Report a diagnostic and return false
-   on failure, storing '\0' into *DIR if an ancestor directory had
-   problems.  */
+   and file mode bits when done, or if a child process has been
+   dispatched to do the real work (though the child process may not
+   have finished yet -- it is the caller's responsibility to handle
+   this).  Report a diagnostic and return false on failure, storing
+   '\0' into *DIR if an ancestor directory had problems.  */

 
 bool
 make_dir_parents (char *dir,
 
 bool
 make_dir_parents (char *dir,

-                 int (*make_ancestor) (char const *, void *),
+                 struct savewd *wd,
+                 int (*make_ancestor) (char const *, char const *, void *),

                  void *options,
                  mode_t mode,
                  void (*announce) (char const *, void *),
                  void *options,
                  mode_t mode,
                  void (*announce) (char const *, void *),


@@ -84,51 +95,110 @@ make_dir_parents (char *dir,
                  gid_t group,
                  bool preserve_existing)
 {
                  gid_t group,
                  bool preserve_existing)
 {

-  bool made_dir = (mkdir (dir, mode) == 0);
+  int mkdir_errno = (IS_ABSOLUTE_FILE_NAME (dir) ? 0 : savewd_errno (wd));

 
 

-  if (!made_dir && make_ancestor && errno == ENOENT)
+  if (mkdir_errno == 0)

     {
     {

-      if (mkancesdirs (dir, make_ancestor, options) == 0)
-       made_dir = (mkdir (dir, mode) == 0);
-      else
+      ptrdiff_t prefix_len = 0;
+      int savewd_chdir_options = (HAVE_FCHMOD ? SAVEWD_CHDIR_SKIP_READABLE : 0);
+
+      if (make_ancestor)

        {
        {

-         /* mkancestdirs updated DIR for a better-looking
-            diagnostic, so don't try to stat DIR below.  */
-         make_ancestor = NULL;
+         prefix_len = mkancesdirs (dir, wd, make_ancestor, options);
+         if (prefix_len < 0)
+           {
+             if (prefix_len < -1)
+               return true;
+             mkdir_errno = errno;
+           }

        }
        }

-    }

 
 

-  if (made_dir)
-    {
-      announce (dir, options);
-      preserve_existing =
-       (owner == (uid_t) -1 && group == (gid_t) -1
-        && ! ((mode_bits & (S_ISUID | S_ISGID)) | (mode & S_ISVTX)));
-    }
-  else
-    {
-      int mkdir_errno = errno;
-      struct stat st;
-      if (! (make_ancestor && mkdir_errno != ENOENT
-            && stat (dir, &st) == 0 && S_ISDIR (st.st_mode)))
+      if (0 <= prefix_len)

        {
        {

-         error (0, mkdir_errno, _("cannot create directory %s"), quote (dir));
-         return false;
+         /* If the ownership will change, create the directory with
+            more restrictive permissions at first, so unauthorized
+            users cannot nip in before the directory is ready.  */
+         mode_t mkdir_mode = mode;
+         if (! (owner == (uid_t) -1 && group == (gid_t) -1))
+           mkdir_mode &= S_IRWXU;
+
+         if (mkdir (dir + prefix_len, mkdir_mode) == 0)
+           {
+             announce (dir, options);
+             preserve_existing =
+               (owner == (uid_t) -1 && group == (gid_t) -1
+                && ! ((mode_bits & (S_ISUID | S_ISGID)) | (mode & S_ISVTX)));
+             savewd_chdir_options |=
+               (SAVEWD_CHDIR_NOFOLLOW
+                | (mode & S_IRUSR ? SAVEWD_CHDIR_READABLE : 0));
+           }
+         else
+           {
+             mkdir_errno = errno;
+             mkdir_mode = -1;
+           }
+
+         if (preserve_existing)
+           {
+             struct stat st;
+             if (mkdir_errno == 0
+                 || (mkdir_errno != ENOENT && make_ancestor
+                     && stat (dir + prefix_len, &st) == 0
+                     && S_ISDIR (st.st_mode)))
+               return true;
+           }
+         else
+           {
+             int open_result[2];
+             int chdir_result =
+               savewd_chdir (wd, dir + prefix_len,
+                             savewd_chdir_options, open_result);
+             if (chdir_result < -1)
+               return true;
+             else
+               {
+                 bool chdir_ok = (chdir_result == 0);
+                 int chdir_errno = errno;
+                 int fd = open_result[0];
+                 bool chdir_failed_unexpectedly =
+                   (mkdir_errno == 0
+                    && ((! chdir_ok && (mode & S_IXUSR))
+                        || (fd < 0 && (mode & S_IRUSR))));
+
+                 if (chdir_failed_unexpectedly)
+                   {
+                     /* No need to save errno here; it's irrelevant.  */
+                     if (0 <= fd)
+                       close (fd);
+                   }
+                 else
+                   {
+                     char const *subdir = (chdir_ok ? "." : dir + prefix_len);
+                     if (dirchownmod (fd, subdir, mkdir_mode, owner, group,
+                                      mode, mode_bits)
+                         == 0)
+                       return true;
+                   }
+
+                 if (mkdir_errno == 0
+                     || (mkdir_errno != ENOENT && make_ancestor
+                         && errno != ENOTDIR))
+                   {
+                     error (0,
+                            (! chdir_failed_unexpectedly ? errno
+                             : ! chdir_ok && (mode & S_IXUSR) ? chdir_errno
+                             : open_result[1]),
+                            _(owner == (uid_t) -1 && group == (gid_t) -1
+                              ? "cannot change permissions of %s"
+                              : "cannot change owner and permissions of %s"),
+                            quote (dir));
+                     return false;
+                   }
+               }
+           }

        }
     }
 
        }
     }
 

-  if (! preserve_existing
-      && (dirchownmod (dir, (made_dir ? mode : (mode_t) -1),
-                      owner, group, mode, mode_bits)
-         != 0))
-    {
-      error (0, errno,
-            _(owner == (uid_t) -1 && group == (gid_t) -1
-              ? "cannot change permissions of %s"
-              : "cannot change owner and permissions of %s"),
-            quote (dir));
-      return false;
-    }
-
-  return true;
+  error (0, mkdir_errno, _("cannot create directory %s"), quote (dir));
+  return false;

 }
 }