aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-06-22 09:05:17 -0700
committerRob Landley <rob@landley.net>2019-06-22 21:30:42 -0500
commitafd29d4ab0d4384cdc0a37f70ccfbdf40dddf27c (patch)
tree2796c1fc2e4ebf2005e73982978ea007d3299f25
parent3b9cfa70db019fa9b43ddba2d5620bff6c72bad6 (diff)
downloadtoybox-afd29d4ab0d4384cdc0a37f70ccfbdf40dddf27c.tar.gz
Use FORCE_FLAGS in kill.c.
Otherwise kill flags don't work unless killall5 is also configured. Also switch to the FLAG() macro.
-rw-r--r--toys/posix/kill.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/toys/posix/kill.c b/toys/posix/kill.c
index ee68980b..c9de98ea 100644
--- a/toys/posix/kill.c
+++ b/toys/posix/kill.c
@@ -41,6 +41,7 @@ config KILLALL5
// This has to match the filename:
#define FOR_kill
+#define FORCE_FLAGS
#include "toys.h"
GLOBALS(
@@ -61,7 +62,7 @@ void kill_main(void)
pid_t pid;
// list signal(s)
- if (toys.optflags & FLAG_l) {
+ if (FLAG(l)) {
if (*args) {
int signum = sig_to_num(*args);
char *s = NULL;
@@ -94,7 +95,7 @@ void kill_main(void)
long *olist = 0, ocount = 0;
// parse omit list
- if (toys.optflags & FLAG_o) {
+ if (FLAG(o)) {
struct arg_list *ptr;
for (ptr = TT.o; ptr; ptr = ptr->next) ocount++;