projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(error_tail): Don't cast alloca to (void *); it's already (void *).
[gnulib.git]
/
lib
/
makepath.c
diff --git
a/lib/makepath.c
b/lib/makepath.c
index
bebd245
..
422bcda
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, 2002 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,9
@@
# 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 "makepath.h"
+
+#include <alloca.h>
#include <stdio.h>
#include <sys/types.h>
#include <stdio.h>
#include <sys/types.h>
@@
-46,7
+38,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
@@
-54,26
+46,15
@@
char *alloca ();
# define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO)
#endif
# define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO)
#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
-#if HAVE_ERRNO_H
-# include <errno.h>
-#endif
+#include <errno.h>
#ifndef errno
extern int errno;
#endif
#ifndef errno
extern int errno;
#endif
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef strchr
-# define strchr index
-# endif
-#endif
+#include <string.h>
#ifndef S_ISUID
# define S_ISUID 04000
#ifndef S_ISUID
# define S_ISUID 04000
@@
-100,19
+81,8
@@
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"
-
-#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"
@@
-126,10
+96,16
@@
extern int errno;
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)
@@
-311,7
+287,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
)
@@
-355,6
+331,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
+343,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
+368,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;
}
@@
-406,7
+383,7
@@
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,
"cannot change permissions of %s"
,
+ error (0, errno,
_("cannot change permissions of %s")
,
quote (dirpath));
retval = 1;
}
quote (dirpath));
retval = 1;
}