Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/lockfile.c b/lockfile.c
index 23db35aff21d7c33197726128e2f120291e6e9f0..920247249823b8f69524b845d6bdb0cb0b1b802b 100644 (file)
--- a/lockfile.c
+++ b/lockfile.c
@@ -28,19 +28,32 @@ static void remove_lock_file_on_signal(int signo)
 static int lock_file(struct lock_file *lk, const char *path)
 {
        int fd;
+       struct stat st;
+
+       if ((!lstat(path, &st)) && S_ISLNK(st.st_mode)) {
+               ssize_t sz;
+               static char target[PATH_MAX];
+               sz = readlink(path, target, sizeof(target));
+               if (sz < 0)
+                       warning("Cannot readlink %s", path);
+               else if (target[0] != '/')
+                       warning("Cannot lock target of relative symlink %s", path);
+               else
+                       path = target;
+       }
        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);
@@ -97,4 +110,3 @@ void rollback_lock_file(struct lock_file *lk)
                unlink(lk->filename);
        lk->filename[0] = 0;
 }
-