undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gc: use tempfile module to handle gc.pid file

Browse Source 
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2015-08-10 11:47:49 +02:00 committed by Junio C Hamano
parent 00539cef39
commit ebebeaea0a
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
builtin/gc.c
View File

@ -11,6 +11,7 @@
*/ */
#include "builtin.h" #include "builtin.h"
#include "tempfile.h"
#include "lockfile.h" #include "lockfile.h"
#include "parse-options.h" #include "parse-options.h"
#include "run-command.h" #include "run-command.h"
@ -42,20 +43,7 @@ static struct argv_array prune = ARGV_ARRAY_INIT;
static struct argv_array prune_worktrees = ARGV_ARRAY_INIT; static struct argv_array prune_worktrees = ARGV_ARRAY_INIT;
static struct argv_array rerere = ARGV_ARRAY_INIT; static struct argv_array rerere = ARGV_ARRAY_INIT;
static char *pidfile; static struct tempfile pidfile;
static void remove_pidfile(void)
{
if (pidfile)
unlink(pidfile);
}
static void remove_pidfile_on_signal(int signo)
{
remove_pidfile();
sigchain_pop(signo);
raise(signo);
}
static void git_config_date_string(const char *key, const char **output) static void git_config_date_string(const char *key, const char **output)
{ {
@ -201,7 +189,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
int fd; int fd;
char *pidfile_path; char *pidfile_path;
if (pidfile) if (is_tempfile_active(&pidfile))
/* already locked */ /* already locked */
return NULL; return NULL;
@ -248,11 +236,8 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
write_in_full(fd, sb.buf, sb.len); write_in_full(fd, sb.buf, sb.len);
strbuf_release(&sb); strbuf_release(&sb);
commit_lock_file(&lock); commit_lock_file(&lock);
register_tempfile(&pidfile, pidfile_path);
pidfile = pidfile_path; free(pidfile_path);
sigchain_push_common(remove_pidfile_on_signal);
atexit(remove_pidfile);
return NULL; return NULL;
} }