From owner-freebsd-bugs@FreeBSD.ORG  Sat Feb 27 18:50:04 2010
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D69741065670
	for <freebsd-bugs@hub.freebsd.org>;
	Sat, 27 Feb 2010 18:50:04 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id C51658FC19
	for <freebsd-bugs@hub.freebsd.org>;
	Sat, 27 Feb 2010 18:50:04 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1RIo4iB070912
	for <freebsd-bugs@freefall.freebsd.org>; Sat, 27 Feb 2010 18:50:04 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1RIo4UT070911;
	Sat, 27 Feb 2010 18:50:04 GMT (envelope-from gnats)
Date: Sat, 27 Feb 2010 18:50:04 GMT
Message-Id: <201002271850.o1RIo4UT070911@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: Eitan Adler <eitanadlerlist@gmail.com>
Cc: 
Subject: Re: bin/143558: [patch] Add verbose option to pkill(1)
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Eitan Adler <eitanadlerlist@gmail.com>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Feb 2010 18:50:04 -0000

The following reply was made to PR bin/143558; it has been noted by GNATS.

From: Eitan Adler <eitanadlerlist@gmail.com>
To: bug-followup@freebsd.org, eitanadlerlist@gmail.com
Cc:  
Subject: Re: bin/143558: [patch] Add verbose option to pkill(1)
Date: Sat, 27 Feb 2010 20:48:55 +0200

 Minor fix to my patch:
 
 My first patch had
 +	if (!didAction && !pgrep)
 which I changed to
 +	if (!didAction && !pgrep && longfmt)
 when I realized that the message that nothing happened would always be
 shown if -l was not specified
 
 
 Index: pkill.1
 ===================================================================
 --- pkill.1	(revision 203347)
 +++ pkill.1	(working copy)
 @@ -168,9 +168,9 @@
  If used in conjunction with
  .Fl f ,
  print the process ID and the full argument list for each matching process.
 -This option can only be used with the
 -.Nm pgrep
 -command.
 +If used in conjunction with the
 +.Nm pkill
 +command, it lists the signal sent as well.
  .It Fl n
  Select only the newest (most recently started) of the matching processes.
  .It Fl o
 Index: pkill.c
 ===================================================================
 --- pkill.c	(revision 203347)
 +++ pkill.c	(working copy)
 @@ -182,7 +182,7 @@
  	pidfilelock = 0;
  	execf = coref = _PATH_DEVNULL;
 
 -	while ((ch = getopt(argc, argv,
 "DF:G:ILM:N:P:SU:ad:fg:ij:lnos:t:u:vx")) != -1)
 +	while ((ch = getopt(argc, argv,
 "DF:G:ILM:N:P:SU:ad:fg:ilj:lnos:t:u:vx")) != -1)
  		switch (ch) {
  		case 'D':
  			debug_opt++;
 @@ -245,8 +245,6 @@
  			criteria = 1;
  			break;
  		case 'l':
 -			if (!pgrep)
 -				usage();
  			longfmt = 1;
  			break;
  		case 'n':
 @@ -528,16 +526,26 @@
  	/*
  	 * Take the appropriate action for each matched process, if any.
  	 */
 +	int didAction = 0;
  	for (i = 0, rv = 0, kp = plist; i < nproc; i++, kp++) {
  		if (PSKIP(kp))
  			continue;
  		if (selected[i]) {
 +			if (longfmt)
 +			{
 +				didAction = 1;
 +				printf("kill -%d %d\n",signum,kp->ki_pid);
 +			}
  			if (inverse)
  				continue;
  		} else if (!inverse)
  			continue;
  		rv |= (*action)(kp);
  	}
 +	if (!didAction && !pgrep && longfmt)
 +	{
 +		printf("No matching processes belonging to you were found\n");
 +	}
 
  	exit(rv ? STATUS_MATCH : STATUS_NOMATCH);
  }
 @@ -550,7 +558,7 @@
  	if (pgrep)
  		ustr = "[-LSfilnovx] [-d delim]";
  	else
 -		ustr = "[-signal] [-ILfinovx]";
 +		ustr = "[-signal] [-ILfilnovx]";
 
  	fprintf(stderr,
  		"usage: %s %s [-F pidfile] [-G gid] [-M core] [-N system]\n"