Code cleanup

This commit is contained in:
Pierre Pronchery 2009-10-24 00:43:13 +00:00
parent 2900d1904b
commit 6136f9e442

View File

@ -27,6 +27,7 @@
/* strace */ /* strace */
static int _strace_error(char const * message, int ret);
static int _strace_parent(pid_t pid); static int _strace_parent(pid_t pid);
static int _strace(char * argv[]) static int _strace(char * argv[])
@ -34,21 +35,23 @@ static int _strace(char * argv[])
pid_t pid; pid_t pid;
if((pid = fork()) == -1) if((pid = fork()) == -1)
{ return _strace_error("fork", 1);
perror("fork");
return 2;
}
if(pid == 0) if(pid == 0)
{ {
ptrace(PTRACE_TRACEME, -1, NULL, (ptrace_data_t)NULL); ptrace(PTRACE_TRACEME, -1, NULL, (ptrace_data_t)NULL);
execvp(argv[0], argv); execvp(argv[0], argv);
fprintf(stderr, "%s", "strace: "); return _strace_error(argv[0], 1);
perror(argv[0]);
return 2;
} }
return _strace_parent(pid); return _strace_parent(pid);
} }
static int _strace_error(char const * message, int ret)
{
fputs("strace: ", stderr);
perror(message);
return ret;
}
static int _handle(pid_t pid, int res); static int _handle(pid_t pid, int res);
static int _strace_parent(pid_t pid) static int _strace_parent(pid_t pid)
{ {
@ -104,5 +107,5 @@ int main(int argc, char * argv[])
{ {
if(argc <= 1) if(argc <= 1)
return _usage(); return _usage();
return _strace(&argv[1]); return (_strace(&argv[1]) == 0) ? 0 : 2;
} }