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

run-command.c: use error_errno()

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2016-05-08 16:47:53 +07:00 committed by Junio C Hamano
parent 033e011e64
commit fbcb0e0659
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
run-command.c
View File

@ -233,7 +233,7 @@ static int wait_or_whine(pid_t pid, const char *argv0, int in_signal)
if (waiting < 0) { if (waiting < 0) {
failed_errno = errno; failed_errno = errno;
error("waitpid for %s failed: %s", argv0, strerror(errno)); error_errno("waitpid for %s failed", argv0);
} else if (waiting != pid) { } else if (waiting != pid) {
error("waitpid is confused (%s)", argv0); error("waitpid is confused (%s)", argv0);
} else if (WIFSIGNALED(status)) { } else if (WIFSIGNALED(status)) {
@ -420,8 +420,7 @@ fail_pipe:
} }
} }
if (cmd->pid < 0) if (cmd->pid < 0)
error("cannot fork() for %s: %s", cmd->argv[0], error_errno("cannot fork() for %s", cmd->argv[0]);
strerror(errno));
else if (cmd->clean_on_exit) else if (cmd->clean_on_exit)
mark_child_for_cleanup(cmd->pid); mark_child_for_cleanup(cmd->pid);
@ -482,7 +481,7 @@ fail_pipe:
cmd->dir, fhin, fhout, fherr); cmd->dir, fhin, fhout, fherr);
failed_errno = errno; failed_errno = errno;
if (cmd->pid < 0 && (!cmd->silent_exec_failure || errno != ENOENT)) if (cmd->pid < 0 && (!cmd->silent_exec_failure || errno != ENOENT))
error("cannot spawn %s: %s", cmd->argv[0], strerror(errno)); error_errno("cannot spawn %s", cmd->argv[0]);
if (cmd->clean_on_exit && cmd->pid >= 0) if (cmd->clean_on_exit && cmd->pid >= 0)
mark_child_for_cleanup(cmd->pid); mark_child_for_cleanup(cmd->pid);
@ -693,7 +692,7 @@ int start_async(struct async *async)
if (pipe(fdin) < 0) { if (pipe(fdin) < 0) {
if (async->out > 0) if (async->out > 0)
close(async->out); close(async->out);
return error("cannot create pipe: %s", strerror(errno)); return error_errno("cannot create pipe");
} }
async->in = fdin[1]; async->in = fdin[1];
} }
@ -705,7 +704,7 @@ int start_async(struct async *async)
close_pair(fdin); close_pair(fdin);
else if (async->in) else if (async->in)
close(async->in); close(async->in);
return error("cannot create pipe: %s", strerror(errno)); return error_errno("cannot create pipe");
} }
async->out = fdout[0]; async->out = fdout[0];
} }
@ -730,7 +729,7 @@ int start_async(struct async *async)
async->pid = fork(); async->pid = fork();
if (async->pid < 0) { if (async->pid < 0) {
error("fork (async) failed: %s", strerror(errno)); error_errno("fork (async) failed");
goto error; goto error;
} }
if (!async->pid) { if (!async->pid) {
@ -777,7 +776,7 @@ int start_async(struct async *async)
{ {
int err = pthread_create(&async->tid, NULL, run_thread, async); int err = pthread_create(&async->tid, NULL, run_thread, async);
if (err) { if (err) {
error("cannot create thread: %s", strerror(err)); error_errno("cannot create thread");
goto error; goto error;
} }
} }