projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* malloc/obstack.c (_obstack) [defined _LIBC]: Bring back this var.
[gnulib.git]
/
lib
/
makepath.c
diff --git
a/lib/makepath.c
b/lib/makepath.c
index
42a0cf5
..
422bcda
100644
(file)
--- a/
lib/makepath.c
+++ b/
lib/makepath.c
@@
-23,6
+23,8
@@
# include <config.h>
#endif
# include <config.h>
#endif
+#include "makepath.h"
+
#include <alloca.h>
#include <stdio.h>
#include <alloca.h>
#include <stdio.h>
@@
-44,9
+46,7
@@
# 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>
#include <errno.h>
#include <errno.h>
@@
-54,14
+54,7
@@
extern int errno;
#endif
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
@@
-88,8
+81,6
@@
extern int errno;
#define WX_USR (S_IWUSR | S_IXUSR)
#define WX_USR (S_IWUSR | S_IXUSR)
-#include "makepath.h"
-
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-105,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)
@@
-386,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;
}