[Midnightbsd-cvs] src [10785] trunk/usr.bin/which/which.c: sync

[laffer1 at midnightbsd.org]

Revision: 10785
          http://svnweb.midnightbsd.org/src/?rev=10785
Author:   laffer1
Date:     2018-06-09 22:48:08 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/usr.bin/which/Makefile
    trunk/usr.bin/which/which.1
    trunk/usr.bin/which/which.c

Property Changed:
----------------
    trunk/usr.bin/which/which.1

Modified: trunk/usr.bin/which/Makefile
===================================================================
--- trunk/usr.bin/which/Makefile	2018-06-10 02:47:16 UTC (rev 10784)
+++ trunk/usr.bin/which/Makefile	2018-06-10 02:48:08 UTC (rev 10785)
@@ -1,6 +1,6 @@
+# $MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD: src/usr.bin/which/Makefile,v 1.6 2000/08/29 23:30:52 green Exp $
-# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/which/Makefile 65226 2000-08-29 23:30:52Z green $
 
 PROG=	which
 

Modified: trunk/usr.bin/which/which.1
===================================================================
--- trunk/usr.bin/which/which.1	2018-06-10 02:47:16 UTC (rev 10784)
+++ trunk/usr.bin/which/which.1	2018-06-10 02:48:08 UTC (rev 10785)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Manpage Copyright (c) 1995, Jordan Hubbard <jkh at FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -27,10 +28,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.bin/which/which.1,v 1.25 2005/02/10 16:04:22 ru Exp $
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.bin/which/which.1 165169 2006-12-13 12:09:41Z ru $
 .\"
-.Dd December 27, 2006
+.Dd December 13, 2006
 .Dt WHICH 1
 .Os
 .Sh NAME
@@ -54,7 +54,7 @@
 of each).
 .It Fl s
 No output, just return 0 if all of the executables are found, or 1 if
-none are found.
+some were not found.
 .El
 .Pp
 Some shells may provide a builtin


Property changes on: trunk/usr.bin/which/which.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/which/which.c
===================================================================
--- trunk/usr.bin/which/which.c	2018-06-10 02:47:16 UTC (rev 10784)
+++ trunk/usr.bin/which/which.c	2018-06-10 02:48:08 UTC (rev 10785)
@@ -26,12 +26,10 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD: src/usr.bin/which/which.c,v 1.6 2005/02/10 16:04:22 ru Exp $");
 __MBSDID("$MidnightBSD$");
 
+#include <sys/param.h>
 #include <sys/stat.h>
-#include <sys/param.h>
-
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -40,10 +38,10 @@
 
 static void	 usage(void);
 static int	 print_matches(char *, char *);
-	
-int 	silent;
-int 	allpaths;
 
+static int 	 silent;
+static int 	 allpaths;
+
 int
 main(int argc, char **argv)
 {
@@ -82,7 +80,7 @@
 
 	while (argc > 0) {
 		memcpy(path, p, pathlen);
-	
+
 		if (strlen(*argv) >= FILENAME_MAX ||
 		    print_matches(path, *argv) == -1)
 			status = EXIT_FAILURE;