projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.
[gnulib.git]
/
lib
/
makepath.c
diff --git
a/lib/makepath.c
b/lib/makepath.c
index
7fdc4e0
..
d4eaade
100644
(file)
--- a/
lib/makepath.c
+++ b/
lib/makepath.c
@@
-1,5
+1,5
@@
/* 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
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
@@
-46,7
+46,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
@@
-103,16
+103,8
@@
extern int errno;
/* Include this before libintl.h so we get our definition of PARAMS. */
#include "makepath.h"
/* 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
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
#include "save-cwd.h"
#include "dirname.h"
#include "save-cwd.h"
#include "dirname.h"
@@
-311,7
+303,7
@@
make_path (const char *argpath,
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
)
@@
-338,7
+330,7
@@
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"),
+ error (0, errno, _("cannot chdir to directory %s"),
quote (dirpath));
CLEANUP;
return 1;
quote (dirpath));
CLEANUP;
return 1;
@@
-355,6
+347,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. */
@@
-364,9
+359,6
@@
make_path (const char *argpath,
return 1;
}
return 1;
}
- /* Done creating directories. Restore original umask. */
- umask (oldmask);
-
if (verbose_fmt_string != NULL)
error (0, 0, verbose_fmt_string, quote (dirpath));
if (verbose_fmt_string != NULL)
error (0, 0, verbose_fmt_string, quote (dirpath));
@@
-392,7
+384,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 change permissions of %s"), quote (dirpath));
+ error (0, errno, _("cannot change permissions of %s"),
+ quote (dirpath));
retval = 1;
}
retval = 1;
}