CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("rmdir: %s", path);
+ reply_with_perror ("%s", path);
return -1;
}
char *buf, *err;
if (STREQ (path, "/")) {
- reply_with_error ("rm -rf: cannot remove root directory");
+ reply_with_error ("cannot remove root directory");
return -1;
}
/* rm -rf is never supposed to fail. I/O errors perhaps? */
if (r == -1) {
- reply_with_error ("rm -rf: %s: %s", path, err);
+ reply_with_error ("%s: %s", path, err);
free (err);
return -1;
}
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("mkdir: %s", path);
+ reply_with_perror ("%s", path);
return -1;
}
{
int r;
+ if (mode < 0) {
+ reply_with_error ("%s: mode is negative", path);
+ return -1;
+ }
+
CHROOT_IN;
r = mkdir (path, mode);
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("mkdir_mode: %s", path);
+ reply_with_perror ("%s", path);
return -1;
}
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. */
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("mkdir -p: %s", path);
+ reply_with_perror ("%s", path);
return -1;
}
-
- return 0;
-}
-
-int
-do_is_dir (const char *path)
-{
- int r;
- struct stat buf;
-
- CHROOT_IN;
- r = lstat (path, &buf);
- CHROOT_OUT;
-
- if (r == -1) {
- if (errno != ENOENT && errno != ENOTDIR) {
- reply_with_perror ("stat: %s", path);
- return -1;
- }
- else
- return 0; /* Not a directory. */
+ if (r == -2) {
+ reply_with_error ("%s: a path element was not a directory", path);
+ return -1;
}
- return S_ISDIR (buf.st_mode);
+ return 0;
}
char *
CHROOT_OUT;
if (r == NULL) {
- reply_with_perror ("mkdtemp: %s", template);
+ reply_with_perror ("%s", template);
free (writable);
}