projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document merges from coreutils.
[gnulib.git]
/
lib
/
makepath.c
diff --git
a/lib/makepath.c
b/lib/makepath.c
index
65a62ff
..
f2dfe88
100644
(file)
--- a/
lib/makepath.c
+++ b/
lib/makepath.c
@@
-1,5
+1,7
@@
/* makepath.c -- Ensure that a directory path exists.
/* 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
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,7
@@
# include <config.h>
#endif
# include <config.h>
#endif
-#if __GNUC__
-# define alloca __builtin_alloca
-#else
-# if HAVE_ALLOCA_H
-# include <alloca.h>
-# else
-# ifdef _AIX
- # pragma alloca
-# else
-char *alloca ();
-# endif
-# endif
-#endif
+#include <alloca.h>
#include <stdio.h>
#include <sys/types.h>
#include <stdio.h>
#include <sys/types.h>
@@
-46,7
+36,7
@@
char *alloca ();
# undef S_ISDIR
#endif
# 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
# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
#endif
@@
-58,9
+48,7
@@
char *alloca ();
# include <stdlib.h>
#endif
# include <stdlib.h>
#endif
-#if HAVE_ERRNO_H
-# include <errno.h>
-#endif
+#include <errno.h>
#ifndef errno
extern int errno;
#ifndef errno
extern int errno;
@@
-100,24
+88,15
@@
extern int errno;
#define WX_USR (S_IWUSR | S_IXUSR)
#define WX_USR (S_IWUSR | S_IXUSR)
-/* Include this before libintl.h so we get our definition of PARAMS. */
#include "makepath.h"
#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
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
#include "save-cwd.h"
#include "save-cwd.h"
+#include "dirname.h"
#include "error.h"
#include "error.h"
-
-void strip_trailing_slashes ();
+#include "quote.h"
#define CLEANUP_CWD \
do \
#define CLEANUP_CWD \
do \
@@
-126,10
+105,16
@@
void strip_trailing_slashes ();
Restore working directory. */ \
if (do_chdir) \
{ \
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); \
free_cwd (&cwd); \
- if (_fail) \
- return 1; \
} \
} \
while (0)
} \
} \
while (0)
@@
-147,10
+132,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.
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;
make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p)
{
int fail = 0;
@@
-173,12
+158,13
@@
make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p)
if (stat (dir, &stats))
{
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))
{
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
fail = 1;
}
else
@@
-194,7
+180,6
@@
make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p)
}
/* Ensure that the directory ARGPATH exists.
}
/* 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.
Create any leading directories that don't already exist, with
permissions PARENT_MODE.
@@
-307,16
+292,17
@@
make_path (const char *argpath,
if (newly_created_dir)
{
if (verbose_fmt_string)
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 ((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
)
{
&& errno != EPERM
#endif
)
{
- error (0, errno, "%s", dirpath);
+ error (0, errno, _("cannot change owner and/or group of %s"),
+ quote (dirpath));
CLEANUP;
return 1;
}
CLEANUP;
return 1;
}
@@
-337,7
+323,8
@@
make_path (const char *argpath,
stat and mkdir process O(n^2) file name components. */
if (do_chdir && chdir (basename_dir) < 0)
{
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;
}
CLEANUP;
return 1;
}
@@
-353,6
+340,9
@@
make_path (const char *argpath,
if (!do_chdir)
basename_dir = dirpath;
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. */
/* We're done making leading directories.
Create the final component of the path. */
@@
-362,11
+352,8
@@
make_path (const char *argpath,
return 1;
}
return 1;
}
- /* Done creating directories. Restore original umask. */
- umask (oldmask);
-
if (verbose_fmt_string != NULL)
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)
{
@@
-376,7
+363,8
@@
make_path (const char *argpath,
#endif
)
{
#endif
)
{
- error (0, errno, _("cannot chown %s"), dirpath);
+ error (0, errno, _("cannot change owner and/or group of %s"),
+ quote (dirpath));
retval = 1;
}
}
retval = 1;
}
}
@@
-389,7
+377,8
@@
make_path (const char *argpath,
if ((mode & ~S_IRWXUGO)
&& chmod (basename_dir, mode))
{
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;
}
retval = 1;
}
@@
-403,7
+392,8
@@
make_path (const char *argpath,
*(p->dirname_end) = '\0';
if (chmod (dirpath, parent_mode))
{
*(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;
}
}
retval = 1;
}
}
@@
-416,7
+406,7
@@
make_path (const char *argpath,
if (!S_ISDIR (stats.st_mode))
{
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;
}
return 1;
}
@@
-435,12
+425,14
@@
make_path (const char *argpath,
#endif
)
{
#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))
{
retval = 1;
}
if (chmod (dirpath, mode))
{
- error (0, errno, "%s", dirpath);
+ error (0, errno, _("cannot change permissions of %s"),
+ quote (dirpath));
retval = 1;
}
}
retval = 1;
}
}