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

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Jul 4 20:55:31 EDT 2018


Revision: 11329
          http://svnweb.midnightbsd.org/src/?rev=11329
Author:   laffer1
Date:     2018-07-04 20:55:31 -0400 (Wed, 04 Jul 2018)
Log Message:
-----------
sync tcopy with freebsd

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

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

Modified: trunk/usr.bin/tcopy/Makefile
===================================================================
--- trunk/usr.bin/tcopy/Makefile	2018-07-05 00:55:05 UTC (rev 11328)
+++ trunk/usr.bin/tcopy/Makefile	2018-07-05 00:55:31 UTC (rev 11329)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/tcopy/Makefile 209570 2010-06-28 12:00:20Z gavin $
 
 PROG=	tcopy
 

Modified: trunk/usr.bin/tcopy/tcopy.1
===================================================================
--- trunk/usr.bin/tcopy/tcopy.1	2018-07-05 00:55:05 UTC (rev 11328)
+++ trunk/usr.bin/tcopy/tcopy.1	2018-07-05 00:55:31 UTC (rev 11329)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1985, 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -26,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tcopy.1	8.2 (Berkeley) 4/17/94
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.bin/tcopy/tcopy.1 216370 2010-12-11 08:32:16Z joel $
 .\"
 .Dd December 20, 2006
 .Dt TCOPY 1


Property changes on: trunk/usr.bin/tcopy/tcopy.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/tcopy/tcopy.c
===================================================================
--- trunk/usr.bin/tcopy/tcopy.c	2018-07-05 00:55:05 UTC (rev 11328)
+++ trunk/usr.bin/tcopy/tcopy.c	2018-07-05 00:55:31 UTC (rev 11329)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 1985, 1987, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -29,7 +30,7 @@
 
 #include <sys/cdefs.h>
 
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/tcopy/tcopy.c 227186 2011-11-06 08:17:29Z ed $");
 
 #ifndef lint
 static const char copyright[] =
@@ -60,16 +61,16 @@
 #define	MAXREC	(64 * 1024)
 #define	NOCOUNT	(-2)
 
-int	filen, guesslen, maxblk = MAXREC;
-u_int64_t	lastrec, record, size, tsize;
-FILE	*msg;
+static int	filen, guesslen, maxblk = MAXREC;
+static uint64_t	lastrec, record, size, tsize;
+static FILE	*msg;
 
-void	*getspace(int);
-void	 intr(int);
+static void	*getspace(int);
+static void	 intr(int);
 static void	 usage(void) __dead2;
-void	 verify(int, int, char *);
-void	 writeop(int, int);
-void	rewind_tape(int);
+static void	 verify(int, int, char *);
+static void	 writeop(int, int);
+static void	 rewind_tape(int);
 
 int
 main(int argc, char *argv[])
@@ -223,7 +224,7 @@
 	exit(0);
 }
 
-void
+static void
 verify(int inp, int outp, char *outb)
 {
 	int eot, inmaxblk, inn, outmaxblk, outn;
@@ -275,7 +276,7 @@
 	exit(1);
 }
 
-void
+static void
 intr(int signo __unused)
 {
 	if (record) {
@@ -289,7 +290,7 @@
 	exit(1);
 }
 
-void *
+static void *
 getspace(int blk)
 {
 	void *bp;
@@ -299,7 +300,7 @@
 	return (bp);
 }
 
-void
+static void
 writeop(int fd, int type)
 {
 	struct mtop op;
@@ -317,7 +318,7 @@
 	exit(1);
 }
 
-void
+static void
 rewind_tape(int fd)
 {
 	struct stat sp;



More information about the Midnightbsd-cvs mailing list