From: Sven Verdoolaege Date: Fri, 13 Jul 2007 14:14:50 +0000 (+0200) Subject: lockfile.c: schedule remove_lock_file only once. X-Git-Tag: v1.5.3-rc2~20 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9a4cbdca34f6aa9424fce8a55fe9dd6f7c25d97b;p=git.git lockfile.c: schedule remove_lock_file only once. Removing a lockfile once should be enough. Signed-off-by: Sven Verdoolaege Signed-off-by: Junio C Hamano --- diff --git a/lockfile.c b/lockfile.c index 5ad2858b4..fb8f13bbb 100644 --- a/lockfile.c +++ b/lockfile.c @@ -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);