Use run_command within merge-index
PATCH 5/7 Use run_command within merge-index
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 <[email protected]>
--- merge-index.c | 23 +++++------------------ 1 files changed, 5 insertions(+), 18 deletions(-)
merge-index.c +5 -18
@@ -1,4 +1,5 @@#include "cache.h" +#include "run-command.h" static const char *pgm;static const char *arguments[8 ];
@@ -7,24 +8,10 @@ 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 {
Signature · 1 line
1.5.0.3.985.gcf0b4