/* Written by David MacKenzie <djm@gnu.ai.mit.edu> and
Jim Meyering <meyering@cs.utexas.edu>. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef __GNUC__
#define alloca __builtin_alloca
#else
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+
+#ifdef STAT_MACROS_BROKEN
+#undef S_ISDIR
+#endif /* STAT_MACROS_BROKEN. */
+
#if !defined(S_ISDIR) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
#endif
#ifdef STDC_HEADERS
#include <errno.h>
#endif
-#ifndef STDC_HEADERS
+#ifndef errno
extern int errno;
#endif
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-#include <string.h>
-#ifndef index
-#define index strchr
-#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
#else
-#include <strings.h>
+# include <strings.h>
+# ifndef strchr
+# define strchr index
+# endif
#endif
#ifdef __MSDOS__
typedef int gid_t;
#endif
+#include "makepath.h"
+
void error ();
/* Ensure that the directory ARGPATH exists.
Remove any trailing slashes from ARGPATH before calling this function.
- Make any leading directories that don't already exist, with
+ Create any leading directories that don't already exist, with
permissions PARENT_MODE.
If the last element of ARGPATH does not exist, create it as
a new directory with permissions MODE.
- If OWNER and GROUP are non-negative, make them the UID and GID of
- created directories.
+ If OWNER and GROUP are non-negative, use them to set the UID and GID of
+ any created directories.
If VERBOSE_FMT_STRING is nonzero, use it as a printf format
string for printing a message after successfully making a directory,
with the name of the directory that was just made as an argument.
+ If PRESERVE_EXISTING is non-zero and ARGPATH is an existing directory,
+ then do not attempt to set its permissions and ownership.
Return 0 if ARGPATH exists as a directory with the proper
ownership and permissions when done, otherwise 1. */
+#if __STDC__
int
-make_path (argpath, mode, parent_mode, owner, group, verbose_fmt_string)
- char *argpath;
+make_path (const char *argpath,
+ int mode,
+ int parent_mode,
+ uid_t owner,
+ 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;
- char *verbose_fmt_string;
+ int preserve_existing;
+ const char *verbose_fmt_string;
+#endif
{
char *dirpath; /* A copy we can scribble NULs on. */
struct stat stats;
int retval = 0;
int oldmask = umask (0);
+ /* FIXME: move this alloca and strcpy into the if-block.
+ Set dirpath to argpath in the else-block. */
dirpath = (char *) alloca (strlen (argpath) + 1);
strcpy (dirpath, argpath);
slash = dirpath;
while (*slash == '/')
slash++;
- while ((slash = index (slash, '/')))
+ while ((slash = strchr (slash, '/')))
{
*slash = '\0';
if (stat (dirpath, &stats))
{
if (mkdir (dirpath, tmp_mode))
{
- error (0, errno, "cannot make directory `%s'", dirpath);
+ error (0, errno, "cannot create directory `%s'", dirpath);
umask (oldmask);
return 1;
}
}
/* We're done making leading directories.
- Make the final component of the path. */
+ Create the final component of the path. */
- if (mkdir (dirpath, mode))
+ /* The path could end in "/." or contain "/..", so test
+ if we really have to create the directory. */
+
+ if (stat (dirpath, &stats) && mkdir (dirpath, mode))
{
- error (0, errno, "cannot make directory `%s'", dirpath);
+ error (0, errno, "cannot create directory `%s'", dirpath);
umask (oldmask);
return 1;
}
return 1;
}
- /* chown must precede chmod because on some systems,
- chown clears the set[ug]id bits for non-superusers,
- resulting in incorrect permissions.
- 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 (!preserve_existing)
+ {
+ /* chown must precede chmod because on some systems,
+ chown clears the set[ug]id bits for non-superusers,
+ resulting in incorrect permissions.
+ 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
- && chown (dirpath, owner, group)
+ if (owner != (uid_t) -1 && group != (gid_t) -1
+ && chown (dirpath, owner, group)
#ifdef AFS
- && errno != EPERM
+ && errno != EPERM
#endif
- )
- {
- error (0, errno, "%s", dirpath);
- retval = 1;
- }
- if (chmod (dirpath, mode))
- {
- error (0, errno, "%s", dirpath);
- retval = 1;
+ )
+ {
+ error (0, errno, "%s", dirpath);
+ retval = 1;
+ }
+ if (chmod (dirpath, mode))
+ {
+ error (0, errno, "%s", dirpath);
+ retval = 1;
+ }
}
}
projects / gnulib.git / blobdiff