From 9614b8dcf8f295b6063d2a85bf8ec53960b072b6 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 11 Apr 2005 15:39:26 -0700 Subject: Fix stale index.lock file removal using "atexit()". Problem noted by Randy Dunlap. --- update-cache.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) (limited to 'update-cache.c') diff --git a/update-cache.c b/update-cache.c index b39185a1fe..ea956e47b3 100644 --- a/update-cache.c +++ b/update-cache.c @@ -230,22 +230,30 @@ inside: } } +static int remove_lock = 0; + +static void remove_lock_file(void) +{ + if (remove_lock) + unlink(".dircache/index.lock"); +} + int main(int argc, char **argv) { int i, newfd, entries; int allow_options = 1; + newfd = open(".dircache/index.lock", O_RDWR | O_CREAT | O_EXCL, 0600); + if (newfd < 0) + usage("unable to create new cachefile"); + + atexit(remove_lock_file); + remove_lock = 1; + entries = read_cache(); - if (entries < 0) { - perror("cache corrupted"); - return -1; - } + if (entries < 0) + usage("cache corrupted"); - newfd = open(".dircache/index.lock", O_RDWR | O_CREAT | O_EXCL, 0600); - if (newfd < 0) { - perror("unable to create new cachefile"); - return -1; - } for (i = 1 ; i < argc; i++) { char *path = argv[i]; @@ -272,14 +280,13 @@ int main(int argc, char **argv) fprintf(stderr, "Ignoring path %s\n", argv[i]); continue; } - if (add_file_to_cache(path)) { - fprintf(stderr, "Unable to add %s to database\n", path); - goto out; - } + if (add_file_to_cache(path)) + usage("Unable to add %s to database", path); } - if (!write_cache(newfd, active_cache, active_nr) && !rename(".dircache/index.lock", ".dircache/index")) - return 0; -out: - unlink(".dircache/index.lock"); + if (write_cache(newfd, active_cache, active_nr) || + rename(".dircache/index.lock", ".dircache/index")) + usage("Unable to write new cachefile"); + + remove_lock = 0; return 0; } -- cgit v1.2.3