From 14895c3b5778464fc212f8a382e1707acde7095a Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Wed, 24 Feb 2010 21:57:51 +0000 Subject: MFC r203688: Initialize the execfile argument to NULL instead of _PATH_DEVNULL. This allows the -M option to be used without specifying -N. Approved by: rrs (mentor) --- usr.bin/pkill/pkill.c | 3 ++- usr.bin/w/w.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/pkill/pkill.c b/usr.bin/pkill/pkill.c index 1530428ad6ee..e1a825dfdf5c 100644 --- a/usr.bin/pkill/pkill.c +++ b/usr.bin/pkill/pkill.c @@ -180,7 +180,8 @@ main(int argc, char **argv) debug_opt = 0; pidfile = NULL; pidfilelock = 0; - execf = coref = _PATH_DEVNULL; + execf = NULL; + coref = _PATH_DEVNULL; while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:ad:fg:ij:lnos:t:u:vx")) != -1) switch (ch) { diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index 10ec7b04bd22..dbd41ff60b1b 100644 --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -158,7 +158,8 @@ main(int argc, char *argv[]) } dropgid = 0; - memf = nlistf = _PATH_DEVNULL; + memf = _PATH_DEVNULL; + nlistf = NULL; while ((ch = getopt(argc, argv, p)) != -1) switch (ch) { case 'd': -- cgit v1.3