[Midnightbsd-cvs] src [11201] trunk/bin/kill/kill.c: sync

[laffer1 at midnightbsd.org]

Revision: 11201
          http://svnweb.midnightbsd.org/src/?rev=11201
Author:   laffer1
Date:     2018-07-01 14:19:13 -0400 (Sun, 01 Jul 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/bin/kill/Makefile
    trunk/bin/kill/kill.1
    trunk/bin/kill/kill.c

Property Changed:
----------------
    trunk/bin/kill/kill.1

Modified: trunk/bin/kill/Makefile
===================================================================
--- trunk/bin/kill/Makefile	2018-07-01 15:54:56 UTC (rev 11200)
+++ trunk/bin/kill/Makefile	2018-07-01 18:19:13 UTC (rev 11201)
@@ -1,6 +1,6 @@
+# $MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/kill/Makefile,v 1.8 2001/12/04 01:57:44 obrien Exp $
-# $MidnightBSD$
+# $FreeBSD: stable/10/bin/kill/Makefile 87323 2001-12-04 01:57:47Z obrien $
 
 PROG=	kill
 

Modified: trunk/bin/kill/kill.1
===================================================================
--- trunk/bin/kill/kill.1	2018-07-01 15:54:56 UTC (rev 11200)
+++ trunk/bin/kill/kill.1	2018-07-01 18:19:13 UTC (rev 11201)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\"-
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -30,10 +31,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kill.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD: src/bin/kill/kill.1,v 1.20 2005/01/16 16:41:57 ru Exp $
-.\" $MidnightBSD: src/bin/kill/kill.1,v 1.2 2006/07/19 13:47:05 laffer1 Exp $
+.\" $FreeBSD: stable/10/bin/kill/kill.1 313144 2017-02-03 11:18:34Z sevan $
 .\"
-.Dd April 28, 1995
+.Dd October 3, 2016
 .Dt KILL 1
 .Os
 .Sh NAME
@@ -148,7 +148,8 @@
 A
 .Nm
 command appeared in
-.At v3 .
+.At v3
+in section 8 of the manual.
 .Sh BUGS
 A replacement for the command
 .Dq Li kill 0


Property changes on: trunk/bin/kill/kill.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/bin/kill/kill.c
===================================================================
--- trunk/bin/kill/kill.c	2018-07-01 15:54:56 UTC (rev 11200)
+++ trunk/bin/kill/kill.c	2018-07-01 18:19:13 UTC (rev 11201)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1988, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -26,7 +27,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD: src/bin/kill/kill.c,v 1.20 2005/01/10 08:39:23 imp Exp $ */
+/*
+ * Important: This file is used both as a standalone program /bin/kill and
+ * as a builtin for /bin/sh (#define SHELL).
+ */
+
 #if 0
 #ifndef lint
 static char const copyright[] =
@@ -39,7 +44,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD: src/bin/kill/kill.c,v 1.2 2006/07/19 13:47:05 laffer1 Exp $");
+__FBSDID("$FreeBSD: stable/10/bin/kill/kill.c 315722 2017-03-22 17:49:56Z bdrewery $");
 
 #include <ctype.h>
 #include <err.h>
@@ -63,7 +68,9 @@
 int
 main(int argc, char *argv[])
 {
-	int errors, numsig, pid;
+	long pidl;
+	pid_t pid;
+	int errors, numsig;
 	char *ep;
 
 	if (argc < 2)
@@ -134,8 +141,10 @@
 		else
 #endif
 		{
-			pid = strtol(*argv, &ep, 10);
-			if (!**argv || *ep)
+			pidl = strtol(*argv, &ep, 10);
+			/* Check for overflow of pid_t. */
+			pid = (pid_t)pidl;
+			if (!**argv || *ep || pid != pidl)
 				errx(2, "illegal process id: %s", *argv);
 		}
 		if (kill(pid, numsig) == -1) {
@@ -152,7 +161,7 @@
 {
 	int n;
 
-	if (!strncasecmp(sig, "SIG", (size_t)3))
+	if (strncasecmp(sig, "SIG", 3) == 0)
 		sig += 3;
 	for (n = 1; n < sys_nsig; n++) {
 		if (!strcasecmp(sys_signame[n], sig))