/* 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 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
# define _(Text) Text
#endif
-#ifdef __MSDOS__
-typedef int uid_t;
-typedef int gid_t;
-#endif
-
#include "save-cwd.h"
+#include "dirname.h"
#include "error.h"
-
-void strip_trailing_slashes ();
+#include "quote.h"
#define CLEANUP_CWD \
do \
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;
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
}
/* 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.
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)
#endif
)
{
- error (0, errno, "%s", dirpath);
+ error (0, errno, _("cannot change owner and/or group of %s"),
+ quote (dirpath));
CLEANUP;
return 1;
}
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;
}
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)
{
#endif
)
{
- error (0, errno, _("cannot chown %s"), dirpath);
+ error (0, errno, _("cannot change owner and/or group of %s"),
+ quote (dirpath));
retval = 1;
}
}
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;
}
*(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;
}
}
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;
}
#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;
}
}