diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2017-01-06 17:22:25 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-07 19:30:08 -0800 |
| commit | 204a047f23462e4931eb00c367818d9870237827 (patch) | |
| tree | 73b6d90e28f537ffe36ca8f8b3627aba14da6329 | |
| parent | 029443070a4e5b0290a2d09f3707bc486d84a961 (diff) | |
| download | git-204a047f23462e4931eb00c367818d9870237827.tar.gz | |
safe_create_leading_directories(): set errno on SCLD_EXISTS
The exit path for SCLD_EXISTS wasn't setting errno, which some callers
use to generate error messages for the user. Fix the problem and
document that the function sets errno correctly to help avoid similar
regressions in the future.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | cache.h | 5 | ||||
| -rw-r--r-- | sha1_file.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -1031,8 +1031,9 @@ int adjust_shared_perm(const char *path); /* * Create the directory containing the named path, using care to be - * somewhat safe against races. Return one of the scld_error values - * to indicate success/failure. + * somewhat safe against races. Return one of the scld_error values to + * indicate success/failure. On error, set errno to describe the + * problem. * * SCLD_VANISHED indicates that one of the ancestor directories of the * path existed at one point during the function call and then diff --git a/sha1_file.c b/sha1_file.c index 10395e7e4b..ae8f0b4195 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -137,8 +137,10 @@ enum scld_error safe_create_leading_directories(char *path) *slash = '\0'; if (!stat(path, &st)) { /* path exists */ - if (!S_ISDIR(st.st_mode)) + if (!S_ISDIR(st.st_mode)) { + errno = ENOTDIR; ret = SCLD_EXISTS; + } } else if (mkdir(path, 0777)) { if (errno == EEXIST && !stat(path, &st) && S_ISDIR(st.st_mode)) |