undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lockfile.c: make lock_file return a meaningful errno on failurei

Browse Source 
Making errno when returning from lock_file() meaningful, which should
fix

 * an existing almost-bug in lock_ref_sha1_basic where it assumes
   errno==ENOENT is meaningful and could waste some work on retries

 * an existing bug in repack_without_refs where it prints
   strerror(errno) and picks advice based on errno, despite errno
   potentially being zero and potentially having been clobbered by
   that point

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Michael Haggerty <mhagger@alum.mit.edu>
This commit is contained in:
Ronnie Sahlberg 2014-06-20 07:42:48 -07:00 committed by Junio C Hamano
parent 6af926e8bc
commit 447ff1bf0a
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lockfile.c
View File

@ -121,7 +121,7 @@ static char *resolve_symlink(char *p, size_t s)
return p; return p;
} }
/* Make sure errno contains a meaningful value on error */
static int lock_file(struct lock_file *lk, const char *path, int flags) static int lock_file(struct lock_file *lk, const char *path, int flags)
{ {
/* /*
@ -130,8 +130,10 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
*/ */
static const size_t max_path_len = sizeof(lk->filename) - 5; static const size_t max_path_len = sizeof(lk->filename) - 5;
if (strlen(path) >= max_path_len) if (strlen(path) >= max_path_len) {
errno = ENAMETOOLONG;
return -1; return -1;
}
strcpy(lk->filename, path); strcpy(lk->filename, path);
if (!(flags & LOCK_NODEREF)) if (!(flags & LOCK_NODEREF))
resolve_symlink(lk->filename, max_path_len); resolve_symlink(lk->filename, max_path_len);
@ -148,9 +150,13 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
lock_file_list = lk; lock_file_list = lk;
lk->on_list = 1; lk->on_list = 1;
} }
if (adjust_shared_perm(lk->filename)) if (adjust_shared_perm(lk->filename)) {
return error("cannot fix permission bits on %s", int save_errno = errno;
error("cannot fix permission bits on %s",
lk->filename); lk->filename);
errno = save_errno;
return -1;
}
} }
else else
lk->filename[0] = 0; lk->filename[0] = 0;
@ -188,6 +194,7 @@ NORETURN void unable_to_lock_index_die(const char *path, int err)
die("%s", buf.buf); die("%s", buf.buf);
} }
/* This should return a meaningful errno on failure */
int hold_lock_file_for_update(struct lock_file *lk, const char *path, int flags) int hold_lock_file_for_update(struct lock_file *lk, const char *path, int flags)
{ {
int fd = lock_file(lk, path, flags); int fd = lock_file(lk, path, flags);

1
refs.c
View File

@ -2212,6 +2212,7 @@ static int write_packed_entry_fn(struct ref_entry *entry, void *cb_data)
return 0; return 0;
} }
/* This should return a meaningful errno on failure */
int lock_packed_refs(int flags) int lock_packed_refs(int flags)
{ {
struct packed_ref_cache *packed_ref_cache; struct packed_ref_cache *packed_ref_cache;

1
refs.h
View File

@ -82,6 +82,7 @@ extern void warn_dangling_symrefs(FILE *fp, const char *msg_fmt, const struct st
/* /*
* Lock the packed-refs file for writing. Flags is passed to * Lock the packed-refs file for writing. Flags is passed to
* hold_lock_file_for_update(). Return 0 on success. * hold_lock_file_for_update(). Return 0 on success.
* Errno is set to something meaningful on error.
*/ */
extern int lock_packed_refs(int flags); extern int lock_packed_refs(int flags);