From: Zach Welch <zw@superlucidity.net>
Date: Wed, 20 Apr 2005 04:48:15 +0000 (-0700)
Subject: [PATCH] init-db.c: normalize env var handling.
X-Git-Tag: v0.99~802
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=addb315d341437b11477d617fda3fd80e7bce3c1;p=git.git

[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 bfbe1eb1..7078cf72 100644
--- a/init-db.c
+++ b/init-db.c
@@ -22,15 +22,10 @@ int main(int argc, char **argv)
 	}
 
 	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) {