X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmakepath.c;h=fbe3f6a65e1f25ac24197e471306afe9bc70d855;hb=c50728dcc26ea56e6e20937a97a26a70b0484703;hp=cf570d9ac4ee013fdbce7541a52625b170a892bd;hpb=dd8aa60346fc93beac5077d9a4e3a5b281df9085;p=gnulib.git diff --git a/lib/makepath.c b/lib/makepath.c index cf570d9ac..fbe3f6a65 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, 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 @@ -50,6 +50,10 @@ char *alloca (); # 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,26 +75,41 @@ extern int errno; # endif #endif +#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 +#ifndef S_IRWXU +# define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR) +#endif + #define WX_USR (S_IWUSR | S_IXUSR) -#ifdef __MSDOS__ -typedef int uid_t; -typedef int gid_t; -#endif +/* Include this before libintl.h so we get our definition of PARAMS. */ +#include "makepath.h" + +#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 \ @@ -120,10 +139,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; @@ -134,6 +153,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 @@ -145,12 +165,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 @@ -166,7 +187,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. @@ -212,7 +232,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); @@ -224,9 +244,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 @@ -279,7 +299,7 @@ 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) @@ -288,7 +308,8 @@ make_path (const char *argpath, #endif ) { - error (0, errno, "%s", dirpath); + error (0, errno, _("cannot change owner and/or group of %s"), + quote (dirpath)); CLEANUP; return 1; } @@ -309,7 +330,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; } @@ -338,9 +360,9 @@ make_path (const char *argpath, 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 @@ -348,17 +370,24 @@ 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" @@ -369,7 +398,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; } } @@ -382,7 +412,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; } @@ -401,12 +431,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; } }