return 0;
}
+/* Returns:
+ * 0 if everything was OK,
+ * -1 for a general error (sets errno),
+ * -2 if an existing path element was not a directory.
+ */
static int
recursive_mkdir (const char *path)
{
if (errno == EEXIST) { /* Something exists here, might not be a dir. */
r = lstat (path, &buf);
if (r == -1) return -1;
- if (!S_ISDIR (buf.st_mode)) {
- errno = ENOTDIR;
- return -1;
- }
+ if (!S_ISDIR (buf.st_mode)) return -2;
return 0; /* OK - directory exists here already. */
}
r = recursive_mkdir (ppath);
free (ppath);
- if (r == -1) return -1;
+ if (r != 0) return r;
goto again;
} else /* Failed for some other reason, so return error. */
reply_with_perror ("mkdir -p: %s", path);
return -1;
}
+ if (r == -2) {
+ reply_with_error ("mkdir -p: %s: a path element was not a directory", path);
+ return -1;
+ }
return 0;
}