summaryrefslogtreecommitdiff
path: root/lockfile.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2014-10-01 12:28:31 +0200
committerJunio C Hamano <gitster@pobox.com>2014-10-01 13:49:01 -0700
commit3e88e8fc085bbfad142d51a07ef918b9b5ca1d72 (patch)
tree0653d33f0f8dad03a06a8ac5a87480f7758874d6 /lockfile.c
parentdaccee387a7f3e4ca332649d5311b032a71892e2 (diff)
downloadgit-3e88e8fc085bbfad142d51a07ef918b9b5ca1d72.tar.gz
commit_lock_file(): use a strbuf to manage temporary space
Avoid relying on the filename length restrictions that are currently checked by lock_file(). Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'lockfile.c')
-rw-r--r--lockfile.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/lockfile.c b/lockfile.c
index 89043f5acc..1dd118f556 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -319,7 +319,8 @@ int reopen_lock_file(struct lock_file *lk)
int commit_lock_file(struct lock_file *lk)
{
- char result_file[PATH_MAX];
+ static struct strbuf result_file = STRBUF_INIT;
+ int err;
if (!lk->active)
die("BUG: attempt to commit unlocked object");
@@ -327,11 +328,12 @@ int commit_lock_file(struct lock_file *lk)
if (close_lock_file(lk))
return -1;
- strcpy(result_file, lk->filename);
/* remove ".lock": */
- result_file[strlen(result_file) - LOCK_SUFFIX_LEN] = 0;
-
- if (rename(lk->filename, result_file)) {
+ strbuf_add(&result_file, lk->filename,
+ strlen(lk->filename) - LOCK_SUFFIX_LEN);
+ err = rename(lk->filename, result_file.buf);
+ strbuf_reset(&result_file);
+ if (err) {
int save_errno = errno;
rollback_lock_file(lk);
errno = save_errno;