From owner-svn-src-head@FreeBSD.ORG Mon Feb 8 21:23:48 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id EA4CC106566C;
Mon, 8 Feb 2010 21:23:48 +0000 (UTC)
(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id D9C4C8FC08;
Mon, 8 Feb 2010 21:23:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o18LNm1T061300;
Mon, 8 Feb 2010 21:23:48 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o18LNmeQ061296;
Mon, 8 Feb 2010 21:23:48 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201002082123.o18LNmeQ061296@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Mon, 8 Feb 2010 21:23:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r203688 - in head: bin/pkill bin/ps usr.bin/w
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Feb 2010 21:23:49 -0000
Author: brucec
Date: Mon Feb 8 21:23:48 2010
New Revision: 203688
URL: http://svn.freebsd.org/changeset/base/203688
Log:
Initialize the execfile argument to NULL instead of _PATH_DEVNULL. This allows the -M option to be used without specifying -N.
PR: bin/138146
Approved by: rrs (mentor)
MFC after: 3 days
Modified:
head/bin/pkill/pkill.c
head/bin/ps/ps.c
head/usr.bin/w/w.c
Modified: head/bin/pkill/pkill.c
==============================================================================
--- head/bin/pkill/pkill.c Mon Feb 8 21:01:41 2010 (r203687)
+++ head/bin/pkill/pkill.c Mon Feb 8 21:23:48 2010 (r203688)
@@ -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) {
Modified: head/bin/ps/ps.c
==============================================================================
--- head/bin/ps/ps.c Mon Feb 8 21:01:41 2010 (r203687)
+++ head/bin/ps/ps.c Mon Feb 8 21:23:48 2010 (r203688)
@@ -212,7 +212,8 @@ main(int argc, char *argv[])
init_list(&sesslist, addelem_pid, sizeof(pid_t), "session id");
init_list(&ttylist, addelem_tty, sizeof(dev_t), "tty");
init_list(&uidlist, addelem_uid, sizeof(uid_t), "user");
- memf = nlistf = _PATH_DEVNULL;
+ memf = _PATH_DEVNULL;
+ nlistf = NULL;
while ((ch = getopt(argc, argv, PS_ARGS)) != -1)
switch (ch) {
case 'A':
Modified: head/usr.bin/w/w.c
==============================================================================
--- head/usr.bin/w/w.c Mon Feb 8 21:01:41 2010 (r203687)
+++ head/usr.bin/w/w.c Mon Feb 8 21:23:48 2010 (r203688)
@@ -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':