From owner-svn-src-stable@FreeBSD.ORG Thu Feb 18 10:46:25 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B9009106568B; Thu, 18 Feb 2010 10:46:25 +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 8D3F88FC14; Thu, 18 Feb 2010 10:46:25 +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 o1IAkPPW040652; Thu, 18 Feb 2010 10:46:25 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1IAkP2k040648; Thu, 18 Feb 2010 10:46:25 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201002181046.o1IAkP2k040648@svn.freebsd.org> From: Bruce Cran Date: Thu, 18 Feb 2010 10:46:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204033 - in stable/8: bin/pkill bin/ps usr.bin/w X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Feb 2010 10:46:25 -0000 Author: brucec Date: Thu Feb 18 10:46:25 2010 New Revision: 204033 URL: http://svn.freebsd.org/changeset/base/204033 Log: MFC r203688: 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) Modified: stable/8/bin/pkill/pkill.c stable/8/bin/ps/ps.c stable/8/usr.bin/w/w.c Directory Properties: stable/8/bin/pkill/ (props changed) stable/8/bin/ps/ (props changed) stable/8/usr.bin/w/ (props changed) Modified: stable/8/bin/pkill/pkill.c ============================================================================== --- stable/8/bin/pkill/pkill.c Thu Feb 18 10:39:53 2010 (r204032) +++ stable/8/bin/pkill/pkill.c Thu Feb 18 10:46:25 2010 (r204033) @@ -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: stable/8/bin/ps/ps.c ============================================================================== --- stable/8/bin/ps/ps.c Thu Feb 18 10:39:53 2010 (r204032) +++ stable/8/bin/ps/ps.c Thu Feb 18 10:46:25 2010 (r204033) @@ -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: stable/8/usr.bin/w/w.c ============================================================================== --- stable/8/usr.bin/w/w.c Thu Feb 18 10:39:53 2010 (r204032) +++ stable/8/usr.bin/w/w.c Thu Feb 18 10:46:25 2010 (r204033) @@ -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':