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

lock_file(): exit early if lockfile cannot be opened

Browse Source 
This is a bit easier to read than the old version, which nested part
of the non-error code in an "if" block.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Ronnie Sahlberg <sahlberg@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2014-10-01 12:28:18 +02:00 committed by Junio C Hamano
parent 35ff08be09
commit e31e949b9f
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lockfile.c
View File

@ -197,19 +197,18 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
resolve_symlink(lk->filename, max_path_len);
strcat(lk->filename, LOCK_SUFFIX);
lk->fd = open(lk->filename, O_RDWR | O_CREAT | O_EXCL, 0666);
if (0 <= lk->fd) {
lk->owner = getpid();
if (adjust_shared_perm(lk->filename)) {
int save_errno = errno;
error("cannot fix permission bits on %s",
lk->filename);
rollback_lock_file(lk);
errno = save_errno;
return -1;
}
}
else
if (lk->fd < 0) {
lk->filename[0] = 0;
return -1;
}
lk->owner = getpid();
if (adjust_shared_perm(lk->filename)) {
int save_errno = errno;
error("cannot fix permission bits on %s", lk->filename);
rollback_lock_file(lk);
errno = save_errno;
return -1;
}
return lk->fd;
}