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

[laffer1 at midnightbsd.org]

Revision: 11439
          http://svnweb.midnightbsd.org/src/?rev=11439
Author:   laffer1
Date:     2018-07-07 11:52:29 -0400 (Sat, 07 Jul 2018)
Log Message:
-----------
sync with freebsd

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

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

Modified: trunk/usr.bin/rs/Makefile
===================================================================
--- trunk/usr.bin/rs/Makefile	2018-07-07 15:51:58 UTC (rev 11438)
+++ trunk/usr.bin/rs/Makefile	2018-07-07 15:52:29 UTC (rev 11439)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	rs

Modified: trunk/usr.bin/rs/rs.1
===================================================================
--- trunk/usr.bin/rs/rs.1	2018-07-07 15:51:58 UTC (rev 11438)
+++ trunk/usr.bin/rs/rs.1	2018-07-07 15:52:29 UTC (rev 11439)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -26,9 +27,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rs.1	8.2 (Berkeley) 12/30/93
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.bin/rs/rs.1 281574 2015-04-16 00:34:41Z allanjude $
 .\"
-.Dd February 25, 2011
+.Dd April 7, 2015
 .Dt RS 1
 .Os
 .Sh NAME
@@ -222,6 +223,8 @@
 .Nm
 utility first appeared in
 .Bx 4.2 .
+.Sh AUTHORS
+.An John A. Kunze
 .Sh BUGS
 .Bl -item
 .It


Property changes on: trunk/usr.bin/rs/rs.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/rs/rs.c
===================================================================
--- trunk/usr.bin/rs/rs.c	2018-07-07 15:51:58 UTC (rev 11438)
+++ trunk/usr.bin/rs/rs.c	2018-07-07 15:52:29 UTC (rev 11439)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -44,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/rs/rs.c 227177 2011-11-06 08:16:35Z ed $");
 
 #include <err.h>
 #include <ctype.h>
@@ -53,7 +54,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-long	flags;
+static long	flags;
 #define	TRANSPOSE	000001
 #define	MTRANSPOSE	000002
 #define	ONEPERLINE	000004
@@ -72,34 +73,34 @@
 #define ONEPERCHAR	0100000
 #define NOARGS		0200000
 
-short	*colwidths;
-short	*cord;
-short	*icbd;
-short	*ocbd;
-int	nelem;
-char	**elem;
-char	**endelem;
-char	*curline;
-int	allocsize = BUFSIZ;
-int	curlen;
-int	irows, icols;
-int	orows = 0, ocols = 0;
-int	maxlen;
-int	skip;
-int	propgutter;
-char	isep = ' ', osep = ' ';
-char	blank[] = "";
-int	owidth = 80, gutter = 2;
+static short	*colwidths;
+static short	*cord;
+static short	*icbd;
+static short	*ocbd;
+static int	nelem;
+static char	**elem;
+static char	**endelem;
+static char	*curline;
+static int	allocsize = BUFSIZ;
+static int	curlen;
+static int	irows, icols;
+static int	orows = 0, ocols = 0;
+static int	maxlen;
+static int	skip;
+static int	propgutter;
+static char	isep = ' ', osep = ' ';
+static char	blank[] = "";
+static int	owidth = 80, gutter = 2;
 
-void	  getargs(int, char *[]);
-void	  getfile(void);
-int	  getline(void);
-char	 *getlist(short **, char *);
-char	 *getnum(int *, char *, int);
-char	**getptrs(char **);
-void	  prepfile(void);
-void	  prints(char *, int);
-void	  putfile(void);
+static void	  getargs(int, char *[]);
+static void	  getfile(void);
+static int	  getline(void);
+static char	 *getlist(short **, char *);
+static char	 *getnum(int *, char *, int);
+static char	**getptrs(char **);
+static void	  prepfile(void);
+static void	  prints(char *, int);
+static void	  putfile(void);
 static void usage(void);
 
 #define	INCR(ep) do {			\
@@ -121,7 +122,7 @@
 	exit(0);
 }
 
-void
+static void
 getfile(void)
 {
 	char *p;
@@ -189,7 +190,7 @@
 	nelem = ep - elem;
 }
 
-void
+static void
 putfile(void)
 {
 	char **ep;
@@ -211,7 +212,7 @@
 		}
 }
 
-void
+static void
 prints(char *s, int col)
 {
 	int n;
@@ -237,7 +238,7 @@
 	exit(1);
 }
 
-void
+static void
 prepfile(void)
 {
 	char **ep;
@@ -330,9 +331,9 @@
 }
 
 #define	BSIZE	(LINE_MAX * 2)
-char	ibuf[BSIZE];
+static char	ibuf[BSIZE];
 
-int
+static int
 getline(void)	/* get line; maintain curline, curlen; manage storage */
 {
 	static	int putlength;
@@ -372,7 +373,7 @@
 	return(c);
 }
 
-char **
+static char **
 getptrs(char **sp)
 {
 	char **p;
@@ -387,7 +388,7 @@
 	return(sp);
 }
 
-void
+static void
 getargs(int ac, char *av[])
 {
 	char *p;
@@ -498,7 +499,7 @@
 	}
 }
 
-char *
+static char *
 getlist(short **list, char *p)
 {
 	int count = 1;
@@ -534,7 +535,7 @@
  * num = number p points to; if (strict) complain
  * returns pointer to end of num
  */
-char *
+static char *
 getnum(int *num, char *p, int strict)
 {
 	char *t = p;