Skip to content

Commit

Permalink
lockfile.c: schedule remove_lock_file only once.
Browse files Browse the repository at this point in the history
Removing a lockfile once should be enough.

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Sven Verdoolaege authored and Junio C Hamano committed Jul 13, 2007
1 parent 689b4d5 commit 9a4cbdc
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lockfile.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ static int lock_file(struct lock_file *lk, const char *path)
sprintf(lk->filename, "%s.lock", path);
fd = open(lk->filename, O_RDWR | O_CREAT | O_EXCL, 0666);
if (0 <= fd) {
if (!lock_file_list) {
signal(SIGINT, remove_lock_file_on_signal);
atexit(remove_lock_file);
}
lk->owner = getpid();
if (!lk->on_list) {
lk->next = lock_file_list;
lock_file_list = lk;
lk->on_list = 1;
}
if (lock_file_list) {
signal(SIGINT, remove_lock_file_on_signal);
atexit(remove_lock_file);
}
if (adjust_shared_perm(lk->filename))
return error("cannot fix permission bits on %s",
lk->filename);
Expand Down

0 comments on commit 9a4cbdc

Please sign in to comment.