X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=lockfile.c;h=23db35aff21d7c33197726128e2f120291e6e9f0;hb=bc32fed5516375ef78bc0f6270eb57bf1bb12d47;hp=731bbf3c9c312687714d19391e6e02ffde8eaebd;hpb=e27e609bbf81271318d99f2643f378f3fde6c6c6;p=git.git

diff --git a/lockfile.c b/lockfile.c
index 731bbf3c9..23db35aff 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -4,11 +4,15 @@
 #include "cache.h"
 
 static struct lock_file *lock_file_list;
+static const char *alternate_index_output;
 
 static void remove_lock_file(void)
 {
+	pid_t me = getpid();
+
 	while (lock_file_list) {
-		if (lock_file_list->filename[0])
+		if (lock_file_list->owner == me &&
+		    lock_file_list->filename[0])
 			unlink(lock_file_list->filename);
 		lock_file_list = lock_file_list->next;
 	}
@@ -27,6 +31,7 @@ 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) {
+		lk->owner = getpid();
 		if (!lk->on_list) {
 			lk->next = lock_file_list;
 			lock_file_list = lk;
@@ -49,7 +54,7 @@ int hold_lock_file_for_update(struct lock_file *lk, const char *path, int die_on
 {
 	int fd = lock_file(lk, path);
 	if (fd < 0 && die_on_error)
-		die("unable to create '%s': %s", path, strerror(errno));
+		die("unable to create '%s.lock': %s", path, strerror(errno));
 	return fd;
 }
 
@@ -65,6 +70,27 @@ int commit_lock_file(struct lock_file *lk)
 	return i;
 }
 
+int hold_locked_index(struct lock_file *lk, int die_on_error)
+{
+	return hold_lock_file_for_update(lk, get_index_file(), die_on_error);
+}
+
+void set_alternate_index_output(const char *name)
+{
+	alternate_index_output = name;
+}
+
+int commit_locked_index(struct lock_file *lk)
+{
+	if (alternate_index_output) {
+		int result = rename(lk->filename, alternate_index_output);
+		lk->filename[0] = 0;
+		return result;
+	}
+	else
+		return commit_lock_file(lk);
+}
+
 void rollback_lock_file(struct lock_file *lk)
 {
 	if (lk->filename[0])