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

Use run_command within merge-index

Browse Source 
Maybe unnecessary as the merge-index utility may go away in the
future, but its currently here, its shorter to use run_command,
and probably will help the MinGW port out.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Shawn O. Pearce 2007-03-12 19:00:21 -04:00 committed by Junio C Hamano
parent 15a1c01263
commit b49809c961
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
merge-index.c
View File

@ -1,4 +1,5 @@
#include "cache.h" #include "cache.h"
#include "run-command.h"
static const char *pgm; static const char *pgm;
static const char *arguments[8]; static const char *arguments[8];
@ -7,24 +8,10 @@ static int err;
static void run_program(void) static void run_program(void)
{ {
pid_t pid = fork(); struct child_process child;
int status; memset(&child, 0, sizeof(child));
child.argv = arguments;
if (pid < 0) if (run_command(&child)) {
die("unable to fork");
if (!pid) {
execlp(pgm, arguments[0],
arguments[1],
arguments[2],
arguments[3],
arguments[4],
arguments[5],
arguments[6],
arguments[7],
NULL);
die("unable to execute '%s'", pgm);
}
if (waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) || WEXITSTATUS(status)) {
if (one_shot) { if (one_shot) {
err++; err++;
} else { } else {