[Midnightbsd-cvs] src [10348] trunk/usr.sbin/rmt/rmt.c: sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 10348
          http://svnweb.midnightbsd.org/src/?rev=10348
Author:   laffer1
Date:     2018-06-03 18:52:56 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/usr.sbin/rmt/Makefile
    trunk/usr.sbin/rmt/rmt.8
    trunk/usr.sbin/rmt/rmt.c

Property Changed:
----------------
    trunk/usr.sbin/rmt/rmt.8

Modified: trunk/usr.sbin/rmt/Makefile
===================================================================
--- trunk/usr.sbin/rmt/Makefile	2018-06-03 22:52:16 UTC (rev 10347)
+++ trunk/usr.sbin/rmt/Makefile	2018-06-03 22:52:56 UTC (rev 10348)
@@ -1,14 +1,13 @@
+# $MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD: src/usr.sbin/rmt/Makefile,v 1.10 2003/04/04 17:49:18 obrien Exp $
+# $FreeBSD: stable/10/usr.sbin/rmt/Makefile 318513 2017-05-19 02:12:10Z rgrimes $
 
 PROG=	rmt
 MAN=	rmt.8
 
-WARNS?=	4
-
 # called from /usr/src/etc/Makefile
 etc-rmt:
 	rm -f ${DESTDIR}/etc/rmt
-	ln -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt
+	ln -s ..${BINDIR}/rmt ${DESTDIR}/etc/rmt
 
 .include <bsd.prog.mk>

Modified: trunk/usr.sbin/rmt/rmt.8
===================================================================
--- trunk/usr.sbin/rmt/rmt.8	2018-06-03 22:52:16 UTC (rev 10347)
+++ trunk/usr.sbin/rmt/rmt.8	2018-06-03 22:52:56 UTC (rev 10348)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -26,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rmt.8	8.3 (Berkeley) 6/1/94
-.\" $FreeBSD: src/usr.sbin/rmt/rmt.8,v 1.17 2005/06/10 20:52:35 nectar Exp $
+.\" $FreeBSD: stable/10/usr.sbin/rmt/rmt.8 147270 2005-06-10 20:52:36Z nectar $
 .\"
 .Dd June 1, 1994
 .Dt RMT 8


Property changes on: trunk/usr.sbin/rmt/rmt.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/rmt/rmt.c
===================================================================
--- trunk/usr.sbin/rmt/rmt.c	2018-06-03 22:52:16 UTC (rev 10347)
+++ trunk/usr.sbin/rmt/rmt.c	2018-06-03 22:52:56 UTC (rev 10348)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -39,7 +40,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/rmt/rmt.c,v 1.13 2004/08/07 04:28:54 imp Exp $");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/rmt/rmt.c 227259 2011-11-06 19:02:37Z ed $");
 
 /*
  * rmt
@@ -54,25 +55,25 @@
 #include <string.h>
 #include <unistd.h>
 
-int	tape = -1;
+static int	tape = -1;
 
-char	*record;
-int	maxrecsize = -1;
+static char	*record;
+static int	maxrecsize = -1;
 
 #define	SSIZE	64
-char	device[SSIZE];
-char	count[SSIZE], mode[SSIZE], pos[SSIZE], op[SSIZE];
+static char	device[SSIZE];
+static char	count[SSIZE], mode[SSIZE], pos[SSIZE], op[SSIZE];
 
-char	resp[BUFSIZ];
+static char	resp[BUFSIZ];
 
-FILE	*debug;
+static FILE	*debug;
 #define	DEBUG(f)	if (debug) fprintf(debug, f)
 #define	DEBUG1(f,a)	if (debug) fprintf(debug, f, a)
 #define	DEBUG2(f,a1,a2)	if (debug) fprintf(debug, f, a1, a2)
 
-char	*checkbuf(char *, int);
-void	 error(int);
-void	 getstring(char *);
+static char	*checkbuf(char *, int);
+static void	 error(int);
+static void	 getstring(char *);
 
 int
 main(int argc, char **argv)
@@ -206,8 +207,7 @@
 }
 
 void
-getstring(bp)
-	char *bp;
+getstring(char *bp)
 {
 	int i;
 	char *cp = bp;
@@ -221,10 +221,8 @@
 	cp[i] = '\0';
 }
 
-char *
-checkbuf(rec, size)
-	char *rec;
-	int size;
+static char *
+checkbuf(char *rec, int size)
 {
 
 	if (size <= maxrecsize)
@@ -243,9 +241,8 @@
 	return (rec);
 }
 
-void
-error(num)
-	int num;
+static void
+error(int num)
 {
 
 	DEBUG2("rmtd: E %d (%s)\n", num, strerror(num));