X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmakepath.c;h=422bcda82ac5c27113e04d6570b4d753b6bfa150;hb=55da53d0db0c7a9fd82b2abc809560b3089df6a5;hp=65a62ffac35560f39f4e799587c1ee9ceef0b400;hpb=e18ebeefb75af37a3f986f2ba87299cdde02ab79;p=gnulib.git diff --git a/lib/makepath.c b/lib/makepath.c index 65a62ffac..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, 2000 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,7 +38,7 @@ 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 @@ -54,26 +46,15 @@ char *alloca (); # define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO) #endif -#if STDC_HEADERS -# include -#endif +#include -#if HAVE_ERRNO_H -# include -#endif +#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 @@ -100,24 +81,13 @@ extern int errno; #define WX_USR (S_IWUSR | S_IXUSR) -/* 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 +#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 \ @@ -126,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) @@ -147,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; @@ -173,12 +149,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 @@ -194,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. @@ -307,16 +283,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; } @@ -337,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; } @@ -353,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. */ @@ -362,11 +343,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) { @@ -376,7 +354,8 @@ make_path (const char *argpath, #endif ) { - error (0, errno, _("cannot chown %s"), dirpath); + error (0, errno, _("cannot change owner and/or group of %s"), + quote (dirpath)); retval = 1; } } @@ -389,7 +368,8 @@ make_path (const char *argpath, if ((mode & ~S_IRWXUGO) && chmod (basename_dir, mode)) { - error (0, errno, _("cannot chmod %s"), dirpath); + error (0, errno, _("cannot change permissions of %s"), + quote (dirpath)); retval = 1; } @@ -403,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; } } @@ -416,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; } @@ -435,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; } }