X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmakepath.c;h=7631c48329f67c69ff7fbbc77b7485ef4ce77b93;hb=1cc4ba44c23782d32d4d2986b355e336f5e21335;hp=d2b2c43c525ef07f7f7784e536e1e46281ce0eac;hpb=6d8337bfc808cddc275899c03482eceb6aff8547;p=gnulib.git diff --git a/lib/makepath.c b/lib/makepath.c index d2b2c43c5..7631c4832 100644 --- a/lib/makepath.c +++ b/lib/makepath.c @@ -1,5 +1,5 @@ /* makepath.c -- Ensure that a directory path exists. - Copyright (C) 1990 Free Software Foundation, Inc. + Copyright (C) 1990, 1997 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 @@ -17,52 +17,52 @@ /* Written by David MacKenzie and Jim Meyering. */ -#ifdef HAVE_CONFIG_H -#include +#if HAVE_CONFIG_H +# include #endif -#ifdef __GNUC__ -#define alloca __builtin_alloca -#else -#ifdef HAVE_ALLOCA_H -#include -#else -#ifdef _AIX - #pragma alloca +#if __GNUC__ +# define alloca __builtin_alloca #else +# if HAVE_ALLOCA_H +# include +# else +# ifdef _AIX + # pragma alloca +# else char *alloca (); -#endif -#endif +# endif +# endif #endif #include #include #include -#ifdef HAVE_UNISTD_H -#include +#if HAVE_UNISTD_H +# include #endif -#ifdef STAT_MACROS_BROKEN -#undef S_ISDIR -#endif /* STAT_MACROS_BROKEN. */ +#if STAT_MACROS_BROKEN +# undef S_ISDIR +#endif #if !defined(S_ISDIR) && defined(S_IFDIR) -#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif -#ifdef STDC_HEADERS -#include +#if STDC_HEADERS +# include #endif -#ifdef HAVE_ERRNO_H -#include +#if HAVE_ERRNO_H +# include #endif #ifndef errno extern int errno; #endif -#ifdef HAVE_STRING_H +#if HAVE_STRING_H # include #else # include @@ -76,9 +76,34 @@ typedef int uid_t; typedef int gid_t; #endif +#include "save-cwd.h" #include "makepath.h" - -void error (); +#include "error.h" + +void strip_trailing_slashes (); + +#define CLEANUP_CWD \ + do \ + { \ + /* We're done operating on basename_dir. \ + Restore working directory. */ \ + if (do_chdir) \ + { \ + int fail = restore_cwd (&cwd, NULL, NULL); \ + free_cwd (&cwd); \ + if (fail) \ + return 1; \ + } \ + } \ + while (0) + +#define CLEANUP \ + do \ + { \ + umask (oldmask); \ + CLEANUP_CWD; \ + } \ + while (0) /* Ensure that the directory ARGPATH exists. Remove any trailing slashes from ARGPATH before calling this function. @@ -120,17 +145,10 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, const char *verbose_fmt_string; #endif { - char *dirpath; /* A copy we can scribble NULs on. */ struct stat stats; int retval = 0; - int oldmask = umask (0); - - /* FIXME: move this alloca and strcpy into the if-block. - Set dirpath to argpath in the else-block. */ - dirpath = (char *) alloca (strlen (argpath) + 1); - strcpy (dirpath, argpath); - if (stat (dirpath, &stats)) + if (stat (argpath, &stats)) { char *slash; int tmp_mode; /* Initial perms for leading dirs. */ @@ -141,6 +159,18 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, struct ptr_list *next; }; struct ptr_list *p, *leading_dirs = NULL; + int do_chdir; /* Whether to chdir before each mkdir. */ + struct saved_cwd cwd; + char *basename_dir; + char *dirpath; + + /* Temporarily relax umask in case it's overly restrictive. */ + int oldmask = umask (0); + + /* Make a copy of ARGPATH that we can scribble NULs on. */ + dirpath = (char *) alloca (strlen (argpath) + 1); + strcpy (dirpath, argpath); + strip_trailing_slashes (dirpath); /* If leading directories shouldn't be writable or executable, or should have set[ug]id or sticky bits set and we are setting @@ -158,49 +188,92 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, re_protect = 0; } + /* If we can record the current working directory, we may be able + to do the chdir optimization. */ + do_chdir = !save_cwd (&cwd); + + /* If we've saved the cwd and DIRPATH is an absolute pathname, + we must chdir to `/' in order to enable the chdir optimization. + So if chdir ("/") fails, turn off the optimization. */ + if (do_chdir && *dirpath == '/' && chdir ("/") < 0) + do_chdir = 0; + slash = dirpath; + + /* Skip over leading slashes. */ while (*slash == '/') slash++; - while ((slash = strchr (slash, '/'))) + + while (1) { + int newly_created_dir = 1; + + /* slash points to the leftmost unprocessed component of dirpath. */ + basename_dir = slash; + + slash = strchr (slash, '/'); + if (slash == NULL) + break; + + /* If we're *not* doing chdir before each mkdir, then we have to refer + to the target using the full (multi-component) directory name. */ + if (!do_chdir) + basename_dir = dirpath; + *slash = '\0'; - if (stat (dirpath, &stats)) + if (mkdir (basename_dir, tmp_mode)) { - if (mkdir (dirpath, tmp_mode)) + if (stat (basename_dir, &stats)) { error (0, errno, "cannot create directory `%s'", dirpath); - umask (oldmask); + CLEANUP; + return 1; + } + else if (!S_ISDIR (stats.st_mode)) + { + error (0, 0, "`%s' exists but is not a directory", dirpath); + CLEANUP; return 1; } else { - if (verbose_fmt_string != NULL) - error (0, 0, verbose_fmt_string, dirpath); + /* DIRPATH already exists and is a directory. */ + newly_created_dir = 0; + } + } + + if (newly_created_dir && verbose_fmt_string != NULL) + fprintf (stderr, verbose_fmt_string, dirpath); - if (owner != (uid_t) -1 && group != (gid_t) -1 - && chown (dirpath, owner, group) + if (owner != (uid_t) -1 && group != (gid_t) -1 + && chown (basename_dir, owner, group) #if defined(AFS) && defined (EPERM) - && errno != EPERM + && errno != EPERM #endif - ) - { - error (0, errno, "%s", dirpath); - retval = 1; - } - if (re_protect) - { - struct ptr_list *new = (struct ptr_list *) - alloca (sizeof (struct ptr_list)); - new->dirname_end = slash; - new->next = leading_dirs; - leading_dirs = new; - } - } + ) + { + error (0, errno, "%s", dirpath); + CLEANUP; + return 1; } - else if (!S_ISDIR (stats.st_mode)) + + if (re_protect) { - error (0, 0, "`%s' exists but is not a directory", dirpath); - umask (oldmask); + struct ptr_list *new = (struct ptr_list *) + alloca (sizeof (struct ptr_list)); + new->dirname_end = slash; + new->next = leading_dirs; + leading_dirs = new; + } + + /* If we were able to save the initial working directory, + then we can use chdir to change into each directory before + creating an entry in that directory. This avoids making + stat and mkdir process O(n^2) file name components. */ + if (do_chdir && chdir (basename_dir) < 0) + { + error (0, errno, "cannot chdir to directory, %s", dirpath); + CLEANUP; return 1; } @@ -212,40 +285,49 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, slash++; } + if (!do_chdir) + basename_dir = dirpath; + /* We're done making leading directories. Create the final component of the path. */ /* The path could end in "/." or contain "/..", so test if we really have to create the directory. */ - if (stat (dirpath, &stats) && mkdir (dirpath, mode)) + if (stat (basename_dir, &stats) && mkdir (basename_dir, mode)) { error (0, errno, "cannot create directory `%s'", dirpath); - umask (oldmask); + CLEANUP; return 1; } + + /* Done creating directories. Restore original umask. */ + umask (oldmask); + if (verbose_fmt_string != NULL) error (0, 0, verbose_fmt_string, dirpath); if (owner != (uid_t) -1 && group != (gid_t) -1) { - if (chown (dirpath, owner, group) + if (chown (basename_dir, owner, group) #ifdef AFS && errno != EPERM #endif ) { - error (0, errno, "%s", dirpath); + error (0, errno, "cannot chown %s", dirpath); retval = 1; } /* chown may have turned off some permission bits we wanted. */ - if ((mode & 07000) != 0 && chmod (dirpath, mode)) + if ((mode & 07000) != 0 && chmod (basename_dir, mode)) { - error (0, errno, "%s", dirpath); + error (0, errno, "cannot chmod %s", dirpath); retval = 1; } } + CLEANUP_CWD; + /* If the mode for leading directories didn't include owner "wx" privileges, we have to reset their protections to the correct value. */ @@ -263,10 +345,11 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, { /* We get here if the entire path already exists. */ + const char *dirpath = argpath; + if (!S_ISDIR (stats.st_mode)) { error (0, 0, "`%s' exists but is not a directory", dirpath); - umask (oldmask); return 1; } @@ -296,6 +379,5 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, } } - umask (oldmask); return retval; }