#include "actions.h"
int
-do_rmdir (const char *path)
+do_rmdir (char *path)
{
int r;
* do stupid stuff, who are we to try to stop them?
*/
int
-do_rm_rf (const char *path)
+do_rm_rf (char *path)
{
int r, len;
char *buf, *err;
snprintf (buf, len, "/sysroot%s", path);
- r = command (NULL, &err, "rm", "-rf", buf);
+ r = command (NULL, &err, "rm", "-rf", buf, NULL);
free (buf);
/* rm -rf is never supposed to fail. I/O errors perhaps? */
}
int
-do_mkdir (const char *path)
+do_mkdir (char *path)
{
int r;
int loop = 0;
int r;
char *ppath, *p;
+ struct stat buf;
again:
r = mkdir (path, 0777);
if (r == -1) {
+ 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;
+ }
+ return 0; /* OK - directory exists here already. */
+ }
+
if (!loop && errno == ENOENT) {
loop = 1; /* Stops it looping forever. */
}
int
-do_mkdir_p (const char *path)
+do_mkdir_p (char *path)
{
int r;
return 0;
}
+
+int
+do_is_dir (char *path)
+{
+ int r;
+ struct stat buf;
+
+ NEED_ROOT (-1);
+ ABS_PATH (path, -1);
+
+ 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. */
+ }
+
+ return S_ISDIR (buf.st_mode);
+}