[PATCH] init-db.c: normalize env var handling.

Normalize init-db environment variable handling, allowing the creation
of object directories with something other than DEFAULT_DB_ENVIRONMENT.

Signed-Off-By: Zach Welch <zw@superlucidity.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/init-db.c b/init-db.c
index bfbe1eb1b6a3daa6e462046338a62c954ace1717..7078cf72c2875490c4262989d04c0ce032484068 100644 (file)
--- a/init-db.c
+++ b/init-db.c
@@ -22,15 +22,10 @@ int main(int argc, char **argv)
        }
 
        sha1_dir = getenv(DB_ENVIRONMENT);
        }
 
        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) {
        len = strlen(sha1_dir);
        if (mkdir(sha1_dir, 0755) < 0) {
                if (errno != EEXIST) {