(CLEANUP_CWD): Report an error if we failed to return to the initial

working directory.  Preserve errno for caller.

diff --git a/lib/makepath.c b/lib/makepath.c
index 0f20bcde9e12b70d805d9d131d4618c2b9a2d01a..f2dfe8891411e582f61f8a7cee175f538b5aee71 100644 (file)
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -105,10 +105,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)