[PATCH 3/3] init-db.c: create and use safe_create_dir helper
From: Zach Welch <hidden>
Date: 2016-06-15 22:41:53
This patch applies on top of:
[PATCH 1/3] init-db.c: cleanup comments
[PATCH 2/3] init-db.c: normalize env var handling.
init-db.c | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
Signed-Off-By: Zach Welch <redacted>
Factor mkdir calls into common safe_create_dir subroutine.
--- a/init-db.c 2005-04-19 18:50:14.000000000 -0700
+++ b/init-db.c 2005-04-19 18:45:48.000000000 -0700@@ -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,10 +26,7 @@ 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) {
@@ -27,22 +34,13 @@ fprintf(stderr, "defaulting to local 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); 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; }