Imported Upstream version 3.1.0

[debian/amanda] / common-src / file.c

diff --git a/common-src/file.c b/common-src/file.c
index e8de92c62677904e4d4b06aa20aa3251e6f143eb..c5179e4d89d2616f6ea30a86b3c2b4a3475dace0 100644 (file)
--- a/common-src/file.c
+++ b/common-src/file.c
@@ -34,47 +34,9 @@
 #include "arglist.h"
 #include "file.h"
 
-static int mk1dir(const char *, mode_t, uid_t, gid_t);
 static void areads_getbuf(const char *s, int l, int fd);
 static char *original_cwd = NULL;
 
-/* Make a directory (internal function).
- * If the directory already exists then we pretend we created it.
- *
- * The uid and gid are used only if we are running as root.
- */
-static int
-mk1dir(
-    const char *dir, /* directory to create */
-    mode_t     mode,   /* mode for new directory */
-    uid_t      uid,    /* uid for new directory */
-    gid_t      gid)    /* gid for new directory */
-{
-    int rc;    /* return code */
-
-    rc = mkdir(dir, mode);
-    if(rc != 0) {
-       int serrno;
-
-       serrno = errno;
-       if(access(dir, F_OK) == 0)
-           rc = 0; /* someone just beat us to it, so it's OK */
-       errno = serrno;
-    }
-
-    /* mkdir is affected by umask, so set the mode bits manually */
-    if (rc == 0) {
-       rc = chmod(dir, mode);
-    }
-
-    if (rc == 0 && geteuid() == 0) {
-       rc = chown(dir, uid, gid);
-    }
-
-    return rc;
-}
-
-
 /*
  * Make a directory hierarchy given an entry to be created (by the caller)
  * in the new target.  In other words, create all the directories down to
@@ -94,14 +56,32 @@ mkpdir(
 
     rc = 0;
 
-    dir = stralloc(file);      /* make a copy we can play with */
+    /* Remove last member of file, put the result in dir */
+    dir = stralloc(file); /* make a copy we can play with */
     p = strrchr(dir, '/');
-    if(p != dir && p != NULL) {        /* got a '/' or a simple name */
-       *p = '\0';
+    *p = '\0';
 
-       if(access(dir, F_OK) != 0) {    /* doesn't exist */
-           if(mkpdir(dir, mode, uid, gid) != 0 ||
-              mk1dir(dir, mode, uid, gid) != 0) rc = -1; /* create failed */
+    rc = mkdir(dir, mode);
+    if (rc != 0) {
+       if (errno == ENOENT) { /* create parent directory */
+           rc = mkpdir(dir, mode, uid, gid);
+           if (rc != 0)
+               return rc;
+           rc = mkdir(dir, mode);
+       }
+       if (rc != 0 && errno == EEXIST) {
+           amfree(dir);
+           return 0;
+       }
+    }
+
+    /* mkdir succeded, set permission and ownership */
+    if (rc == 0) {
+       /* mkdir is affected by umask, so set the mode bits manually */
+       rc = chmod(dir, mode);
+
+       if (rc == 0 && geteuid() == 0) {
+           rc = chown(dir, uid, gid);
        }
     }
 
@@ -889,6 +869,8 @@ main(
        g_fprintf(stderr, _(" done.\n"));
 
        g_fprintf(stderr, _("Finished.\n"));
+
+       dbclose();
        return 0;
 }