lockfile.c: store absolute path

diff --git a/lockfile.c b/lockfile.c
index e0460275e1904e12728840102d0a51e98008eef9..988927775169487df7677a17465b512a567488dd 100644 (file)
--- a/lockfile.c
+++ b/lockfile.c
@@ -128,9 +128,17 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
                    path);
        }
 
-       strbuf_add(&lk->filename, path, pathlen);
-       if (!(flags & LOCK_NO_DEREF))
-               resolve_symlink(&lk->filename);
+       if (flags & LOCK_NO_DEREF) {
+               strbuf_add_absolute_path(&lk->filename, path);
+       } else {
+               struct strbuf resolved_path = STRBUF_INIT;
+
+               strbuf_add(&resolved_path, path, pathlen);
+               resolve_symlink(&resolved_path);
+               strbuf_add_absolute_path(&lk->filename, resolved_path.buf);
+               strbuf_release(&resolved_path);
+       }
+
        strbuf_addstr(&lk->filename, LOCK_SUFFIX);
        lk->fd = open(lk->filename.buf, O_RDWR | O_CREAT | O_EXCL, 0666);
        if (lk->fd < 0) {
@@ -162,16 +170,6 @@ void unable_to_lock_message(const char *path, int err, struct strbuf *buf)
                            absolute_path(path), strerror(err));
 }
 
-int unable_to_lock_error(const char *path, int err)
-{
-       struct strbuf buf = STRBUF_INIT;
-
-       unable_to_lock_message(path, err, &buf);
-       error("%s", buf.buf);
-       strbuf_release(&buf);
-       return -1;
-}
-
 NORETURN void unable_to_lock_die(const char *path, int err)
 {
        struct strbuf buf = STRBUF_INIT;
@@ -217,9 +215,12 @@ int hold_lock_file_for_append(struct lock_file *lk, const char *path, int flags)
 
                if (flags & LOCK_DIE_ON_ERROR)
                        exit(128);
+               close(orig_fd);
                rollback_lock_file(lk);
                errno = save_errno;
                return -1;
+       } else {
+               close(orig_fd);
        }
        return fd;
 }