Module Name: src
Committed By: martin
Date: Tue Jan 27 13:39:31 UTC 2015
Modified Files:
src/usr.bin/pkill [netbsd-7]: pkill.c
Log Message:
Pull up following revision(s) (requested by prlw1 in ticket #461):
usr.bin/pkill/pkill.c: revision 1.30
Simplify code so that gcc 4.8 can understand it.
http://mail-index.netbsd.org/tech-userlevel/2015/01/06/msg008882.html
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.8.1 src/usr.bin/pkill/pkill.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/pkill/pkill.c
diff -u src/usr.bin/pkill/pkill.c:1.29 src/usr.bin/pkill/pkill.c:1.29.8.1
--- src/usr.bin/pkill/pkill.c:1.29 Wed Jan 2 10:36:07 2013
+++ src/usr.bin/pkill/pkill.c Tue Jan 27 13:39:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pkill.c,v 1.29 2013/01/02 10:36:07 dsl Exp $ */
+/* $NetBSD: pkill.c,v 1.29.8.1 2015/01/27 13:39:31 martin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: pkill.c,v 1.29 2013/01/02 10:36:07 dsl Exp $");
+__RCSID("$NetBSD: pkill.c,v 1.29.8.1 2015/01/27 13:39:31 martin Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -128,8 +128,8 @@ main(int argc, char **argv)
action = grepact;
pgrep = 1;
} else if (strcmp(getprogname(), "prenice") == 0) {
+ action = reniceact;
prenice = 1;
-
} else {
action = killact;
p = argv[1];
@@ -171,7 +171,6 @@ main(int argc, char **argv)
if (argc < 2)
usage();
- action = reniceact;
p = argv[1];
i = (int)strtol(p, &q, 10);
