X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmakepath.c;h=422bcda82ac5c27113e04d6570b4d753b6bfa150;hb=55da53d0db0c7a9fd82b2abc809560b3089df6a5;hp=00d42461dce1cdec52a43904cf14cfffd6af064d;hpb=a5b7dcf8bc429ce5b5cebb9b3ebd72d68b69d754;p=gnulib.git diff --git a/lib/makepath.c b/lib/makepath.c index 00d42461d..422bcda82 100644 --- a/lib/makepath.c +++ b/lib/makepath.c @@ -1,5 +1,7 @@ /* makepath.c -- Ensure that a directory path exists. - Copyright (C) 1990, 1997, 1998, 1999 Free Software Foundation, Inc. + + Copyright (C) 1990, 1997, 1998, 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 +23,9 @@ # 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 "makepath.h" + +#include #include #include @@ -46,62 +38,56 @@ 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 -#if STDC_HEADERS -# include +#ifndef S_IRWXUGO +# define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO) #endif -#if HAVE_ERRNO_H -# include -#endif +#include + +#include #ifndef errno extern int errno; #endif -#if HAVE_STRING_H -# include -#else -# include -# ifndef strchr -# define strchr index -# endif -#endif +#include +#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 -#define WX_USR (S_IWUSR | S_IXUSR) - -#if HAVE_LOCALE_H -# include +#ifndef S_IRWXU +# define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR) #endif -#if ENABLE_NLS -# include -# define _(Text) gettext (Text) -#else -# define _(Text) Text -#endif +#define WX_USR (S_IWUSR | S_IXUSR) -#ifdef __MSDOS__ -typedef int uid_t; -typedef int gid_t; -#endif +#include "gettext.h" +#define _(msgid) gettext (msgid) #include "save-cwd.h" -#include "makepath.h" +#include "dirname.h" #include "error.h" - -void strip_trailing_slashes (); +#include "quote.h" #define CLEANUP_CWD \ do \ @@ -110,10 +96,16 @@ void strip_trailing_slashes (); Restore working directory. */ \ if (do_chdir) \ { \ - int _fail = restore_cwd (&cwd, NULL, NULL); \ + if (restore_cwd (&cwd) != 0) \ + { \ + int _saved_errno = errno; \ + error (0, errno, \ + _("failed to return to initial working directory")); \ + free_cwd (&cwd); \ + errno = _saved_errno; \ + return 1; \ + } \ free_cwd (&cwd); \ - if (_fail) \ - return 1; \ } \ } \ while (0) @@ -131,10 +123,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; @@ -145,6 +137,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,12 +149,13 @@ 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"), + 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 @@ -177,7 +171,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. @@ -223,7 +216,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 +228,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,16 +283,17 @@ 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, 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; } @@ -320,7 +314,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; } @@ -336,6 +331,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. */ @@ -345,13 +343,10 @@ 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) + if (owner != (uid_t) -1 || group != (gid_t) -1) { if (chown (basename_dir, owner, group) #ifdef AFS @@ -359,17 +354,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 & 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" @@ -380,7 +383,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; } } @@ -393,7 +397,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; } @@ -412,12 +416,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; } }