From 5c4b5466f1da41c9e1d498db63ea68a23effc4b3 Mon Sep 17 00:00:00 2001 From: deraadt Date: Tue, 4 Feb 1997 10:06:18 +0000 Subject: [PATCH] maxbsize hack i did was not portable --- sbin/dump/Makefile | 4 ++-- sbin/dump/main.c | 4 ++-- sbin/dump/maxbsize.c | 36 ------------------------------------ 3 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 sbin/dump/maxbsize.c diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile index 2257156bd72..3b09bcd5fa4 100644 --- a/sbin/dump/Makefile +++ b/sbin/dump/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 1997/02/03 11:53:23 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 1997/02/04 10:06:18 deraadt Exp $ # $NetBSD: Makefile,v 1.16 1995/03/18 14:54:53 cgd Exp $ # dump.h header file @@ -16,7 +16,7 @@ PROG= dump LINKS= ${BINDIR}/dump ${BINDIR}/rdump CFLAGS+=-DRDUMP -SRCS= itime.c main.c optr.c dumprmt.c tape.c traverse.c unctime.c maxbsize.c +SRCS= itime.c main.c optr.c dumprmt.c tape.c traverse.c unctime.c MAN= dump.8 MLINKS+=dump.8 rdump.8 diff --git a/sbin/dump/main.c b/sbin/dump/main.c index 04ca7018e3a..7fc6941f5f8 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.12 1997/02/03 11:53:25 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.13 1997/02/04 10:06:20 deraadt Exp $ */ /* $NetBSD: main.c,v 1.8 1996/03/15 22:39:32 scottr Exp $ */ /*- @@ -89,12 +89,12 @@ int cartridge = 0; /* Assume non-cartridge tape */ long dev_bsize = 1; /* recalculated below */ long blocksperfile; /* output blocks per file */ char *host = NULL; /* remote host (if any) */ +int maxbsize = 64*1024; /* XXX MAXBSIZE from sys/param.h */ static long numarg __P((char *, long, long)); static void obsolete __P((int *, char **[])); static void usage __P((void)); -extern int maxbsize; int main(argc, argv) diff --git a/sbin/dump/maxbsize.c b/sbin/dump/maxbsize.c deleted file mode 100644 index 2040c736f2d..00000000000 --- a/sbin/dump/maxbsize.c +++ /dev/null @@ -1,36 +0,0 @@ -/* $OpenBSD: maxbsize.c,v 1.1 1997/02/03 11:53:26 deraadt Exp $ */ - -/* - * Copyright (c) 1997 Theo de Raadt - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Theo de Raadt. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#define _KERNEL -#include - -int maxbsize = MAXBSIZE; -- 2.20.1