X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmakepath.c;h=d4eaadeec280e539f4b754e3aab0d9a8fb6ea926;hb=2bf674b2395b6aff54eff7928d24f2995c37c28e;hp=460129477b81bb3e210433a2721bb779d1e7ce60;hpb=0bd4ecccc6c6547b998b029445c9d9ba36f5f73a;p=gnulib.git diff --git a/lib/makepath.c b/lib/makepath.c index 460129477..d4eaadeec 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 Free Software Foundation, Inc. + Copyright (C) 1990, 1997, 1998, 1999, 2000, 2002 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 @@ -46,10 +46,14 @@ char *alloca (); # undef S_ISDIR #endif -#if !defined(S_ISDIR) && defined(S_IFDIR) +#if !defined S_ISDIR && defined S_IFDIR # 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 #endif @@ -71,27 +75,52 @@ extern int errno; # endif #endif -#ifdef __MSDOS__ -typedef int uid_t; -typedef int gid_t; +#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 -#include "save-cwd.h" +#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" -#include "error.h" -void strip_trailing_slashes (); +#include "gettext.h" +#define _(msgid) gettext (msgid) + +#include "save-cwd.h" +#include "dirname.h" +#include "error.h" +#include "quote.h" #define CLEANUP_CWD \ do \ { \ /* We're done operating on basename_dir. \ Restore working directory. */ \ - if (saved_cwd) \ + if (do_chdir) \ { \ - int fail = restore_cwd (&cwd, NULL, NULL); \ + int _fail = restore_cwd (&cwd, NULL, NULL); \ free_cwd (&cwd); \ - if (fail) \ + if (_fail) \ return 1; \ } \ } \ @@ -105,8 +134,59 @@ void strip_trailing_slashes (); } \ while (0) +/* Attempt to create directory DIR (aka DIRPATH) with the specified MODE. + If CREATED_DIR_P is non-NULL, set *CREATED_DIR_P to non-zero if this + function creates DIR and to zero otherwise. Give a diagnostic and + return non-zero if DIR cannot be created or cannot be determined to + exist already. Use DIRPATH in any diagnostic, not DIR. + Note that if DIR already exists, this function returns zero + (indicating success) and sets *CREATED_DIR_P to zero. */ + +int +make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p) +{ + int fail = 0; + int created_dir; + + created_dir = (mkdir (dir, mode) == 0); + + 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 + call stat (to distinguish the three cases) only if mkdir fails. + The alternative to this approach is to `stat' each directory, + then to call mkdir if it doesn't exist. But if some other process + were to create the directory between the stat & mkdir, the mkdir + would fail with EEXIST. */ + + if (stat (dir, &stats)) + { + error (0, saved_errno, _("cannot create directory %s"), + quote (dirpath)); + fail = 1; + } + else if (!S_ISDIR (stats.st_mode)) + { + error (0, 0, _("%s exists but is not a directory"), quote (dirpath)); + fail = 1; + } + else + { + /* DIR (aka DIRPATH) already exists and is a directory. */ + } + } + + if (created_dir_p) + *created_dir_p = created_dir; + + return fail; +} + /* Ensure that the directory ARGPATH exists. - Remove any trailing slashes from ARGPATH before calling this function. Create any leading directories that don't already exist, with permissions PARENT_MODE. @@ -123,7 +203,6 @@ void strip_trailing_slashes (); Return 0 if ARGPATH exists as a directory with the proper ownership and permissions when done, otherwise 1. */ -#if __STDC__ int make_path (const char *argpath, int mode, @@ -132,18 +211,6 @@ make_path (const char *argpath, gid_t group, int preserve_existing, const char *verbose_fmt_string) -#else -int -make_path (argpath, mode, parent_mode, owner, group, preserve_existing, - verbose_fmt_string) - const char *argpath; - int mode; - int parent_mode; - uid_t owner; - gid_t group; - int preserve_existing; - const char *verbose_fmt_string; -#endif { struct stat stats; int retval = 0; @@ -159,14 +226,13 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, struct ptr_list *next; }; struct ptr_list *p, *leading_dirs = NULL; - int saved_cwd = 0; + int do_chdir; /* Whether to chdir before each mkdir. */ struct saved_cwd cwd; char *basename_dir; - int first_subdir = 1; 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); @@ -176,11 +242,11 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, /* If leading directories shouldn't be writable or executable, or should have set[ug]id or sticky bits set and we are setting their owners, we need to fix their permissions after making them. */ - if (((parent_mode & 0300) != 0300) - || (owner != (uid_t) -1 && group != (gid_t) -1 - && (parent_mode & 07000) != 0)) + if (((parent_mode & WX_USR) != WX_USR) + || ((owner != (uid_t) -1 || group != (gid_t) -1) + && (parent_mode & (S_ISUID | S_ISGID | S_ISVTX)) != 0)) { - tmp_mode = 0700; + tmp_mode = S_IRWXU; re_protect = 1; } else @@ -189,6 +255,16 @@ 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. */ @@ -197,6 +273,9 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, while (1) { + int newly_created_dir; + int fail; + /* slash points to the leftmost unprocessed component of dirpath. */ basename_dir = slash; @@ -204,61 +283,55 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, if (slash == NULL) break; - if (first_subdir) - { - first_subdir = 0; - saved_cwd = !save_cwd (&cwd); - } - - if (!saved_cwd) + /* 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 (basename_dir, &stats)) + fail = make_dir (basename_dir, dirpath, tmp_mode, &newly_created_dir); + if (fail) { - if (mkdir (basename_dir, tmp_mode)) + CLEANUP; + return 1; + } + + if (newly_created_dir) + { + if (verbose_fmt_string) + error (0, 0, verbose_fmt_string, quote (dirpath)); + + if ((owner != (uid_t) -1 || group != (gid_t) -1) + && chown (basename_dir, owner, group) +#if defined AFS && defined EPERM + && errno != EPERM +#endif + ) { - error (0, errno, "cannot create directory `%s'", dirpath); + error (0, errno, _("cannot change owner and/or group of %s"), + quote (dirpath)); CLEANUP; return 1; } - else - { - if (verbose_fmt_string != NULL) - error (0, 0, verbose_fmt_string, dirpath); - if (owner != (uid_t) -1 && group != (gid_t) -1 - && chown (basename_dir, owner, group) -#if defined(AFS) && defined (EPERM) - && errno != EPERM -#endif - ) - { - error (0, errno, "%s", dirpath); - CLEANUP; - return 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; - } + 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; } } - else if (!S_ISDIR (stats.st_mode)) - { - error (0, 0, "`%s' exists but is not a directory", dirpath); - CLEANUP; - return 1; - } - if (saved_cwd && chdir (basename_dir) < 0) + /* 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); + error (0, errno, _("cannot chdir to directory %s"), + quote (dirpath)); CLEANUP; return 1; } @@ -271,29 +344,25 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, slash++; } - if (!saved_cwd) + if (!do_chdir) basename_dir = dirpath; + /* Done creating leading directories. Restore original umask. */ + umask (oldmask); + /* 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 (basename_dir, &stats) && mkdir (basename_dir, mode)) + if (make_dir (basename_dir, dirpath, mode, NULL)) { - error (0, errno, "cannot create directory `%s'", dirpath); CLEANUP; return 1; } - /* Done creating directories. Restore original umask. */ - umask (oldmask); - if (verbose_fmt_string != NULL) - error (0, 0, verbose_fmt_string, dirpath); + error (0, 0, verbose_fmt_string, quote (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 @@ -301,17 +370,25 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, #endif ) { - error (0, errno, "cannot chown %s", dirpath); - retval = 1; - } - /* chown may have turned off some permission bits we wanted. */ - if ((mode & 07000) != 0 && chmod (basename_dir, mode)) - { - error (0, errno, "cannot chmod %s", dirpath); + error (0, errno, _("cannot change owner and/or group of %s"), + quote (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 change permissions of %s"), + quote (dirpath)); + retval = 1; + } + CLEANUP_CWD; /* If the mode for leading directories didn't include owner "wx" @@ -322,7 +399,8 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, *(p->dirname_end) = '\0'; if (chmod (dirpath, parent_mode)) { - error (0, errno, "%s", dirpath); + error (0, errno, "cannot change permissions of %s", + quote (dirpath)); retval = 1; } } @@ -335,7 +413,7 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, if (!S_ISDIR (stats.st_mode)) { - error (0, 0, "`%s' exists but is not a directory", dirpath); + error (0, 0, _("%s exists but is not a directory"), quote (dirpath)); return 1; } @@ -347,19 +425,21 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, On System V, users can give away files with chown and then not be able to chmod them. So don't give files away. */ - if (owner != (uid_t) -1 && group != (gid_t) -1 + if ((owner != (uid_t) -1 || group != (gid_t) -1) && chown (dirpath, owner, group) #ifdef AFS && errno != EPERM #endif ) { - error (0, errno, "%s", dirpath); + error (0, errno, _("cannot change owner and/or group of %s"), + quote (dirpath)); retval = 1; } if (chmod (dirpath, mode)) { - error (0, errno, "%s", dirpath); + error (0, errno, _("cannot change permissions of %s"), + quote (dirpath)); retval = 1; } }