]> granicus.if.org Git - strace/commitdiff
Trivial fixes on error paths
authorDenys Vlasenko <dvlasenk@redhat.com>
Fri, 2 Sep 2011 14:19:30 +0000 (16:19 +0200)
committerDenys Vlasenko <dvlasenk@redhat.com>
Fri, 2 Sep 2011 14:19:30 +0000 (16:19 +0200)
* strace.c (startup_attach): Emit message on fork() failure.
(startup_child): Remove non-informative comment.
* util.c (ptrace_restart): use perror_msg() on error instead of fprintf().

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
strace.c
util.c

index fcdae0bb03584b4b4d2e24a8838ed8e9f7ae2548..722a0f0b4140c65fcf38e2d85b4431a354fe6220 100644 (file)
--- a/strace.c
+++ b/strace.c
@@ -424,7 +424,7 @@ startup_attach(void)
        if (daemonized_tracer) {
                pid_t pid = fork();
                if (pid < 0) {
-                       _exit(1);
+                       perror_msg_and_die("fork");
                }
                if (pid) { /* parent */
                        /*
@@ -641,7 +641,7 @@ startup_child(char **argv)
 # ifndef FREEBSD
                pause();
 # else
-               kill(pid, SIGSTOP); /* stop HERE */
+               kill(pid, SIGSTOP);
 # endif
 #else /* !USE_PROCFS */
                if (!daemonized_tracer) {
diff --git a/util.c b/util.c
index 20311fce2123bb9ad98aece3b250dd05e7c09a2b..0658bc0a18149c27416f1ef3b225578b138f5c2e 100644 (file)
--- a/util.c
+++ b/util.c
@@ -224,8 +224,7 @@ ptrace_restart(int op, struct tcb *tcp, int sig)
                msg = "CONT";
        if (op == PTRACE_DETACH)
                msg = "DETACH";
-       fprintf(stderr, "strace: ptrace(PTRACE_%s,1,%d): %s\n",
-                       msg, sig, strerror(err));
+       perror_msg("ptrace(PTRACE_%s,1,%d)", msg, sig);
        return -1;
 }