War on whitespace

[thirdparty/git.git] / lockfile.c

diff --git a/lockfile.c b/lockfile.c
index bed6b21daf302c76cb87bb99b613f168df9899e1..5ad2858b4885022141d915fa0555c51f80d11c1c 100644 (file)
--- a/lockfile.c
+++ b/lockfile.c
@@ -8,8 +8,11 @@ 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;
        }
@@ -28,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;
@@ -93,4 +97,3 @@ void rollback_lock_file(struct lock_file *lk)
                unlink(lk->filename);
        lk->filename[0] = 0;
 }
-