[PATCH] The big git command renaming fallout fix.

diff --git a/init-db.c b/init-db.c
index bfbe1eb1b6a3daa6e462046338a62c954ace1717..83f95e8b926f4fd28e0db0ccfc4f040d4172ee8a 100644 (file)
--- a/init-db.c
+++ b/init-db.c
@@ -5,6 +5,16 @@
  */
 #include "cache.h"
 
+void safe_create_dir(char *dir)
+{
+       if (mkdir(dir, 0755) < 0) {
+               if (errno != EEXIST) {
+                       perror(dir);
+                       exit(1);
+               }
+       }
+}
+
 /*
  * If you want to, you can share the DB area with any number of branches.
  * That has advantages: you can save space by sharing all the SHA1 objects.
@@ -16,38 +26,21 @@ int main(int argc, char **argv)
        char *sha1_dir, *path;
        int len, i;
 
-       if (mkdir(".git", 0755) < 0) {
-               perror("unable to create .git directory");
-               exit(1);
-       }
+       safe_create_dir(".git");
 
        sha1_dir = getenv(DB_ENVIRONMENT);
-       if (sha1_dir) {
-               struct stat st;
-               if (!stat(sha1_dir, &st) && S_ISDIR(st.st_mode))
-                       return 0;
-               fprintf(stderr, "DB_ENVIRONMENT set to bad directory %s: ", sha1_dir);
+       if (!sha1_dir) {
+               sha1_dir = DEFAULT_DB_ENVIRONMENT;
+               fprintf(stderr, "defaulting to local storage area\n");
        }
-
-       sha1_dir = DEFAULT_DB_ENVIRONMENT;
-       fprintf(stderr, "defaulting to private storage area\n");
        len = strlen(sha1_dir);
-       if (mkdir(sha1_dir, 0755) < 0) {
-               if (errno != EEXIST) {
-                       perror(sha1_dir);
-                       exit(1);
-               }
-       }
-       path = malloc(len + 40);
+       path = xmalloc(len + 40);
        memcpy(path, sha1_dir, len);
+
+       safe_create_dir(sha1_dir);
        for (i = 0; i < 256; i++) {
                sprintf(path+len, "/%02x", i);
-               if (mkdir(path, 0755) < 0) {
-                       if (errno != EEXIST) {
-                               perror(path);
-                               exit(1);
-                       }
-               }
+               safe_create_dir(path);
        }
        return 0;
 }