[Toybox] [PATCH] Fix killall prompt.

enh enh at google.com
Mon Sep 7 17:32:54 PDT 2015


Fix killall prompt.

I'm not sure how much we care, but the " ?" was deliberately done to
match the desktop. Since I'm here, the desktop also switches between
"Kill" and "Signal" as the verb depending on the specific signal.
(Though the -v output always uses "kill".)

-- 
Elliott Hughes - http://who/enh - http://jessies.org/~enh/
Android native code/tools questions? Mail me/drop by/add me as a reviewer.
-------------- next part --------------
diff --git a/toys/lsb/killall.c b/toys/lsb/killall.c
index e892755..0cc9705 100644
--- a/toys/lsb/killall.c
+++ b/toys/lsb/killall.c
@@ -40,7 +40,8 @@ static int kill_process(pid_t pid, char *name)
   if (pid == TT.cur_pid) return 0;
 
   if (toys.optflags & FLAG_i) {
-    fprintf(stderr, "Signal %s(%d)", name, (int)pid);
+    fprintf(stderr, "%s %s(%d) ?",
+            (TT.signum == SIGTERM) ? "Kill" : "Signal", name, (int)pid);
     if (!yesno(0)) return 0;
   }
 


More information about the Toybox mailing list