Better handling of collision with AIX stpncpy() function.

[gnulib.git] / lib / makepath.c

diff --git a/lib/makepath.c b/lib/makepath.c
index 513549d..422bcda 100644 (file)
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -1,5 +1,7 @@
 /* makepath.c -- Ensure that a directory path exists.
-   Copyright (C) 1990, 1997-1999, 2000, 2002-2003 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
@@ -21,6 +23,8 @@
 # include <config.h>
 #endif
 
+#include "makepath.h"
+
 #include <alloca.h>
 
 #include <stdio.h>
@@ -42,9 +46,7 @@
 # define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO)
 #endif
 
-#if STDC_HEADERS
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
 #include <errno.h>
 
@@ -52,14 +54,7 @@
 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
@@ -86,9 +81,6 @@ extern int errno;
 
 #define WX_USR (S_IWUSR | S_IXUSR)
 
-/* Include this before libintl.h so we get our definition of PARAMS. */
-#include "makepath.h"
-
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -104,10 +96,16 @@ extern int errno;
         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);                              \
-         if (_fail)                                    \
-           return 1;                                   \
        }                                               \
     }                                                  \
   while (0)
@@ -385,7 +383,7 @@ make_path (const char *argpath,
          *(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;
            }