/* makepath.c -- Ensure that a directory path exists.
- Copyright (C) 1990, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1990, 1997, 1998, 1999 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
# 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)
+
+/* Include this before libintl.h so we get our definition of PARAMS. */
+#include "makepath.h"
+
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
+
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+#else
+# define _(Text) Text
+#endif
+
#ifdef __MSDOS__
typedef int uid_t;
typedef int gid_t;
#endif
#include "save-cwd.h"
-#include "makepath.h"
#include "error.h"
void strip_trailing_slashes ();
Restore working directory. */ \
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; \
} \
} \
} \
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 will return zero
+ (indicating success) and will set *CREATED_DIR_P to zero. */
+
+static 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'"), dirpath);
+ fail = 1;
+ }
+ else if (!S_ISDIR (stats.st_mode))
+ {
+ error (0, 0, _("`%s' exists but is not a directory"), 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.
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,
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;
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);
/* 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
while (1)
{
- int newly_created_dir = 1;
+ int newly_created_dir;
+ int fail;
/* slash points to the leftmost unprocessed component of dirpath. */
basename_dir = slash;
basename_dir = dirpath;
*slash = '\0';
- if (mkdir (basename_dir, tmp_mode))
+ fail = make_dir (basename_dir, dirpath, tmp_mode, &newly_created_dir);
+ if (fail)
{
- if (stat (basename_dir, &stats))
- {
- error (0, errno, "cannot create directory `%s'", dirpath);
- CLEANUP;
- return 1;
- }
- else if (!S_ISDIR (stats.st_mode))
- {
- error (0, 0, "`%s' exists but is not a directory", dirpath);
- CLEANUP;
- return 1;
- }
- else
- {
- /* DIRPATH already exists and is a directory. */
- newly_created_dir = 0;
- }
+ CLEANUP;
+ return 1;
}
- if (newly_created_dir && verbose_fmt_string != NULL)
- fprintf (stderr, verbose_fmt_string, dirpath);
+ if (newly_created_dir)
+ {
+ if (verbose_fmt_string)
+ fprintf (stderr, verbose_fmt_string, dirpath);
- if (owner != (uid_t) -1 && group != (gid_t) -1
- && chown (basename_dir, owner, group)
+ if ((owner != (uid_t) -1 || group != (gid_t) -1)
+ && chown (basename_dir, owner, group)
#if defined(AFS) && defined (EPERM)
- && errno != EPERM
+ && errno != EPERM
#endif
- )
- {
- error (0, errno, "%s", dirpath);
- CLEANUP;
- return 1;
- }
+ )
+ {
+ 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;
+ }
}
/* If we were able to save the initial working directory,
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"), dirpath);
CLEANUP;
return 1;
}
/* 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;
}
#endif
)
{
- error (0, errno, "cannot chown %s", dirpath);
+ 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))
+ if ((mode & (S_ISUID | S_ISGID | S_ISVTX))
+ && chmod (basename_dir, mode))
{
- error (0, errno, "cannot chmod %s", dirpath);
+ error (0, errno, _("cannot chmod %s"), dirpath);
retval = 1;
}
}
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"), dirpath);
return 1;
}
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
projects / gnulib.git / blobdiff