From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 15 Dec 2018 00:25:13 +0000 (-0800)
Subject: mkdir-p: improve diagnostic for FUSE mounts
X-Git-Tag: v1.0~5238
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f5c84748c8828ef18bf456c5d3ff79f00d2f51e;p=thirdparty%2Fgnulib.git

mkdir-p: improve diagnostic for FUSE mounts

Problem reported by Niklas Hambüchen in:
https://lists.gnu.org/r/bug-gnulib/2018-12/msg00074.html
* lib/mkdir-p.c (make_dir_parents): In diagnostic, prefer stat
errno to mkdir errno if the stat errno is likely more interesting.
---

diff --git a/ChangeLog b/ChangeLog
index d66fb6124d..74688d4795 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-12-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	mkdir-p: improve diagnostic for FUSE mounts
+	Problem reported by Niklas Hambüchen in:
+	https://lists.gnu.org/r/bug-gnulib/2018-12/msg00074.html
+	* lib/mkdir-p.c (make_dir_parents): In diagnostic, prefer stat
+	errno to mkdir errno if the stat errno is likely more interesting.
+
 2018-12-14  Bruno Haible  <bruno@clisp.org>
 
 	hash-map: Add tests.
diff --git a/lib/mkdir-p.c b/lib/mkdir-p.c
index c91b6c5227..8ff80dc340 100644
--- a/lib/mkdir-p.c
+++ b/lib/mkdir-p.c
@@ -146,12 +146,23 @@ make_dir_parents (char *dir,
 
           if (preserve_existing)
             {
-              struct stat st;
-              if (mkdir_errno == 0
-                  || (mkdir_errno != ENOENT && make_ancestor
-                      && stat (dir + prefix_len, &st) == 0
-                      && S_ISDIR (st.st_mode)))
+              if (mkdir_errno == 0)
                 return true;
+              if (mkdir_errno != ENOENT && make_ancestor)
+                {
+                  struct stat st;
+                  if (stat (dir + prefix_len, &st) == 0)
+                    {
+                      if (S_ISDIR (st.st_mode))
+                        return true;
+                    }
+                  else if (mkdir_errno == EEXIST
+                           && errno != ENOENT && errno != ENOTDIR)
+                    {
+                      error (0, errno, _("cannot stat %s"), quote (dir));
+                      return false;
+                    }
+                }
             }
           else
             {