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

[laffer1 at midnightbsd.org]

Revision: 11568
          http://svnweb.midnightbsd.org/src/?rev=11568
Author:   laffer1
Date:     2018-07-07 19:16:38 -0400 (Sat, 07 Jul 2018)
Log Message:
-----------
sync with freebsd.

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

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

Modified: trunk/usr.bin/column/Makefile
===================================================================
--- trunk/usr.bin/column/Makefile	2018-07-07 23:16:05 UTC (rev 11567)
+++ trunk/usr.bin/column/Makefile	2018-07-07 23:16:38 UTC (rev 11568)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/column/Makefile 90415 2002-02-08 22:31:43Z markm $
 
 PROG=	column
 

Modified: trunk/usr.bin/column/column.1
===================================================================
--- trunk/usr.bin/column/column.1	2018-07-07 23:16:05 UTC (rev 11567)
+++ trunk/usr.bin/column/column.1	2018-07-07 23:16:38 UTC (rev 11568)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -26,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)column.1	8.1 (Berkeley) 6/6/93
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.bin/column/column.1 216370 2010-12-11 08:32:16Z joel $
 .\"
 .Dd July 29, 2004
 .Dt COLUMN 1


Property changes on: trunk/usr.bin/column/column.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/column/column.c
===================================================================
--- trunk/usr.bin/column/column.c	2018-07-07 23:16:05 UTC (rev 11567)
+++ trunk/usr.bin/column/column.c	2018-07-07 23:16:38 UTC (rev 11568)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -40,7 +41,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/column/column.c 227159 2011-11-06 08:14:34Z ed $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -58,21 +59,21 @@
 
 #define	TAB	8
 
-void  c_columnate(void);
-void  input(FILE *);
-void  maketbl(void);
-void  print(void);
-void  r_columnate(void);
-void  usage(void);
-int   width(const wchar_t *);
+static void	c_columnate(void);
+static void	input(FILE *);
+static void	maketbl(void);
+static void	print(void);
+static void	r_columnate(void);
+static void	usage(void);
+static int	width(const wchar_t *);
 
-int termwidth = 80;		/* default terminal width */
+static int	termwidth = 80;		/* default terminal width */
 
-int entries;			/* number of records */
-int eval;			/* exit value */
-int maxlength;			/* longest record */
-wchar_t **list;			/* array of pointers to records */
-const wchar_t *separator = L"\t ";	/* field separator for table option */
+static int	entries;		/* number of records */
+static int	eval;			/* exit value */
+static int	maxlength;		/* longest record */
+static wchar_t	**list;			/* array of pointers to records */
+static const wchar_t *separator = L"\t "; /* field separator for table option */
 
 int
 main(int argc, char **argv)
@@ -149,7 +150,7 @@
 	exit(eval);
 }
 
-void
+static void
 c_columnate(void)
 {
 	int chcnt, col, cnt, endcol, numcols;
@@ -178,7 +179,7 @@
 		putwchar('\n');
 }
 
-void
+static void
 r_columnate(void)
 {
 	int base, chcnt, cnt, col, endcol, numcols, numrows, row;
@@ -205,7 +206,7 @@
 	}
 }
 
-void
+static void
 print(void)
 {
 	int cnt;
@@ -221,7 +222,7 @@
 } TBL;
 #define	DEFCOLS	25
 
-void
+static void
 maketbl(void)
 {
 	TBL *t;
@@ -274,7 +275,7 @@
 #define	DEFNUM		1000
 #define	MAXLINELEN	(LINE_MAX + 1)
 
-void
+static void
 input(FILE *fp)
 {
 	static int maxentry;
@@ -313,7 +314,7 @@
 }
 
 /* Like wcswidth(), but ignores non-printing characters. */
-int
+static int
 width(const wchar_t *wcs)
 {
 	int w, cw;
@@ -324,7 +325,7 @@
 	return (w);
 }
 
-void
+static void
 usage(void)
 {