diff --git a/merge-index.c b/merge-index.c
index a9c8cc1f93a815a9b8226394e6f035a016fedbdb..5599fd321bb4c09c1c0ce4fc62dfb9ecf5531c2b 100644 (file)
--- a/merge-index.c
+++ b/merge-index.c
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-
#include "cache.h"
#include "cache.h"
+#include "run-command.h"
-static const char *pgm = NULL;
-static const char *arguments[8];
+static const char *pgm;
+static const char *arguments[9];
static int one_shot, quiet;
static int err;
static void run_program(void)
{
static int one_shot, quiet;
static int err;
static void run_program(void)
{
- pid_t pid = fork();
- int status;
-
- if (pid < 0)
- 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)) {
+ struct child_process child;
+ memset(&child, 0, sizeof(child));
+ child.argv = arguments;
+ if (run_command(&child)) {
if (one_shot) {
err++;
} else {
if (one_shot) {
err++;
} else {
arguments[5] = "";
arguments[6] = "";
arguments[7] = "";
arguments[5] = "";
arguments[6] = "";
arguments[7] = "";
+ arguments[8] = NULL;
found = 0;
do {
static char hexbuf[4][60];
found = 0;
do {
static char hexbuf[4][60];
break;
found++;
strcpy(hexbuf[stage], sha1_to_hex(ce->sha1));
break;
found++;
strcpy(hexbuf[stage], sha1_to_hex(ce->sha1));
- sprintf(ownbuf[stage], "%o", ntohl(ce->ce_mode) & (~S_IFMT));
+ sprintf(ownbuf[stage], "%o", ntohl(ce->ce_mode));
arguments[stage] = hexbuf[stage];
arguments[stage + 4] = ownbuf[stage];
} while (++pos < active_nr);
arguments[stage] = hexbuf[stage];
arguments[stage + 4] = ownbuf[stage];
} while (++pos < active_nr);