X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmakepath.c;h=513549ded75f567bca6e65a615eb9c38819c058b;hb=0439822fa6b678aa4be450d5cb14b288f5c6cf0a;hp=bf3528eb4f362809b39cc3b7a2936ff2f1aa5511;hpb=c70a64f30493c2628b49de2e1bd5bd68d334a490;p=gnulib.git diff --git a/lib/makepath.c b/lib/makepath.c index bf3528eb4..513549ded 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-1999, 2000, 2002-2003 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 @@ -21,19 +21,7 @@ # include #endif -#if __GNUC__ -# define alloca __builtin_alloca -#else -# if HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - # pragma alloca -# else -char *alloca (); -# endif -# endif -#endif +#include #include #include @@ -46,17 +34,19 @@ 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 -#if HAVE_ERRNO_H -# include -#endif +#include #ifndef errno extern int errno; @@ -99,26 +89,13 @@ extern int errno; /* Include this before libintl.h so we get our definition of PARAMS. */ #include "makepath.h" -#if HAVE_LOCALE_H -# include -#endif - -#if ENABLE_NLS -# include -# define _(Text) gettext (Text) -#else -# define _(Text) Text -#endif - -#ifdef __MSDOS__ -typedef int uid_t; -typedef int gid_t; -#endif +#include "gettext.h" +#define _(msgid) gettext (msgid) #include "save-cwd.h" +#include "dirname.h" #include "error.h" - -void strip_trailing_slashes (); +#include "quote.h" #define CLEANUP_CWD \ do \ @@ -148,10 +125,10 @@ void strip_trailing_slashes (); 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 will return zero - (indicating success) and will set *CREATED_DIR_P to zero. */ + Note that if DIR already exists, this function returns zero + (indicating success) and sets *CREATED_DIR_P to zero. */ -static int +int make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p) { int fail = 0; @@ -174,12 +151,13 @@ make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p) if (stat (dir, &stats)) { - error (0, saved_errno, _("cannot create directory `%s'"), dirpath); + 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"), dirpath); + error (0, 0, _("%s exists but is not a directory"), quote (dirpath)); fail = 1; } else @@ -195,7 +173,6 @@ make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p) } /* 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. @@ -308,16 +285,17 @@ make_path (const char *argpath, if (newly_created_dir) { if (verbose_fmt_string) - error (0, 0, verbose_fmt_string, dirpath); + 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) +#if defined AFS && defined EPERM && errno != EPERM #endif ) { - error (0, errno, "%s", dirpath); + error (0, errno, _("cannot change owner and/or group of %s"), + quote (dirpath)); CLEANUP; return 1; } @@ -338,7 +316,8 @@ make_path (const char *argpath, 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; } @@ -354,6 +333,9 @@ make_path (const char *argpath, 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. */ @@ -363,11 +345,8 @@ make_path (const char *argpath, 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) { @@ -377,18 +356,25 @@ make_path (const char *argpath, #endif ) { - 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); + 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" @@ -399,7 +385,8 @@ make_path (const char *argpath, *(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; } } @@ -412,7 +399,7 @@ make_path (const char *argpath, 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; } @@ -431,12 +418,14 @@ make_path (const char *argpath, #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; } }