[Midnightbsd-cvs] src [11460] trunk/usr.bin/paste/paste.c: sync paste with freebsd

[laffer1 at midnightbsd.org]

Revision: 11460
          http://svnweb.midnightbsd.org/src/?rev=11460
Author:   laffer1
Date:     2018-07-07 12:51:32 -0400 (Sat, 07 Jul 2018)
Log Message:
-----------
sync paste with freebsd

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

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

Modified: trunk/usr.bin/paste/Makefile
===================================================================
--- trunk/usr.bin/paste/Makefile	2018-07-07 16:51:18 UTC (rev 11459)
+++ trunk/usr.bin/paste/Makefile	2018-07-07 16:51:32 UTC (rev 11460)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	paste

Modified: trunk/usr.bin/paste/paste.1
===================================================================
--- trunk/usr.bin/paste/paste.1	2018-07-07 16:51:18 UTC (rev 11459)
+++ trunk/usr.bin/paste/paste.1	2018-07-07 16:51:32 UTC (rev 11460)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -30,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)paste.1	8.1 (Berkeley) 6/6/93
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.bin/paste/paste.1 216370 2010-12-11 08:32:16Z joel $
 .\"
 .Dd June 25, 2004
 .Dt PASTE 1


Property changes on: trunk/usr.bin/paste/paste.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/paste/paste.c
===================================================================
--- trunk/usr.bin/paste/paste.c	2018-07-07 16:51:18 UTC (rev 11459)
+++ trunk/usr.bin/paste/paste.c	2018-07-07 16:51:32 UTC (rev 11460)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -43,7 +44,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/paste/paste.c 227242 2011-11-06 18:49:53Z ed $");
 
 #include <sys/types.h>
 
@@ -57,15 +58,15 @@
 #include <unistd.h>
 #include <wchar.h>
 
-wchar_t *delim;
-int delimcnt;
+static wchar_t *delim;
+static int delimcnt;
 
-int parallel(char **);
-int sequential(char **);
-int tr(wchar_t *);
+static int parallel(char **);
+static int sequential(char **);
+static int tr(wchar_t *);
 static void usage(void);
 
-wchar_t tab[] = L"\t";
+static wchar_t tab[] = L"\t";
 
 int
 main(int argc, char *argv[])
@@ -125,7 +126,7 @@
 	char *name;
 } LIST;
 
-int
+static int
 parallel(char **argv)
 {
 	LIST *lp;
@@ -195,7 +196,7 @@
 	return (0);
 }
 
-int
+static int
 sequential(char **argv)
 {
 	FILE *fp;
@@ -235,7 +236,7 @@
 	return (failed != 0);
 }
 
-int
+static int
 tr(wchar_t *arg)
 {
 	int cnt;