[PATCH v3 08/17] cmd_init_db(): when creating directories, handle errors conservatively
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Jan 18, 2014, 22:48 UTC
- Message-ID
- <1390085341-2553-9-git-send-email-mhagger@alum.mit.edu>
- In-Reply-To
- <1390085341-2553-1-git-send-email-mhagger@alum.mit.edu>
safe_create_leading_directories_const() returns a non-zero value on error. The old code at this calling site recognized a couple of particular error values, and treated all other return values as success. Instead, be more conservative: recognize the errors we are interested in, but treat any other nonzero values as failures. This is more robust in case somebody adds another possible return value without telling us.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> --- builtin/init-db.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c index 6f69593..c7c76bb 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -515,13 +515,14 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) saved = shared_repository; shared_repository = 0; switch (safe_create_leading_directories_const(argv[0])) { + case SCLD_OK: + case SCLD_PERMS: + break; case SCLD_EXISTS: errno = EEXIST; /* fallthru */ - case SCLD_FAILED: - die_errno(_("cannot mkdir %s"), argv[0]); - break; default: + die_errno(_("cannot mkdir %s"), argv[0]); break; } shared_repository = saved;
-- 1.8.5.2