From: Craig Small <csmall@enc.com.au>
Date: Sat, 3 Mar 2012 02:56:32 +0000 (+1100)
Subject: Merge remote-tracking branch 'sami/to-craig' into sami-merge
X-Git-Tag: v3.3.3~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=502a79e02fdf7e2b5125f150b3d22aaf0ec1a208;p=procps-ng

Merge remote-tracking branch 'sami/to-craig' into sami-merge

Conflicts:
	pgrep.c
	w.c
---

502a79e02fdf7e2b5125f150b3d22aaf0ec1a208
diff --cc pgrep.c
index 6c6d2618,9473a1ea..b1d4ace4
--- a/pgrep.c
+++ b/pgrep.c
@@@ -792,15 -774,12 +792,15 @@@ int main (int argc, char **argv
  	if (i_am_pkill) {
  		int i;
  		for (i = 0; i < num; i++) {
 -			if (kill (procs[i].num, opt_signal) != -1)
 -			        continue;
 +			if (kill (procs[i].num, opt_signal) != -1) {
 +				if (opt_echo)
 +					printf(_("%s killed (pid %lu)\n"), procs[i].str, procs[i].num);
 +				continue;
 +			}
  			if (errno==ESRCH)
- 				 /* gone now, which is OK */
- 				continue;
- 			xwarn(_("killing pid %d failed"), procs[i].num);
+ 				 // gone now, which is OK
+ 			        continue;
+ 			xwarn(_("killing pid %ld failed"), procs[i].num);
  		}
  	} else {
  		if (opt_count) {