diff options
| -rw-r--r-- | sbin/dump/dumprmt.c | 10 | ||||
| -rw-r--r-- | sbin/dump/itime.c | 12 | ||||
| -rw-r--r-- | sbin/dump/main.c | 11 | ||||
| -rw-r--r-- | sbin/dump/tape.c | 15 | ||||
| -rw-r--r-- | sbin/dump/traverse.c | 12 |
5 files changed, 10 insertions, 50 deletions
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c index 954274fe746..e268f004210 100644 --- a/sbin/dump/dumprmt.c +++ b/sbin/dump/dumprmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dumprmt.c,v 1.23 2004/11/04 20:10:06 deraadt Exp $ */ +/* $OpenBSD: dumprmt.c,v 1.24 2007/03/04 22:36:54 deraadt Exp $ */ /* $NetBSD: dumprmt.c,v 1.17 1997/06/05 16:10:47 mrg Exp $ */ /*- @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dumprmt.c 8.1 (Berkeley) 6/5/93"; #else -static const char rcsid[] = "$OpenBSD: dumprmt.c,v 1.23 2004/11/04 20:10:06 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: dumprmt.c,v 1.24 2007/03/04 22:36:54 deraadt Exp $"; #endif #endif /* not lint */ @@ -43,13 +43,7 @@ static const char rcsid[] = "$OpenBSD: dumprmt.c,v 1.23 2004/11/04 20:10:06 dera #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/time.h> -#ifdef sunos -#include <sys/vnode.h> - -#include <ufs/inode.h> -#else #include <ufs/ufs/dinode.h> -#endif #include <netinet/in.h> #include <netinet/tcp.h> diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c index 14a7a6275af..2241697b0c3 100644 --- a/sbin/dump/itime.c +++ b/sbin/dump/itime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: itime.c,v 1.12 2004/11/04 20:10:07 deraadt Exp $ */ +/* $OpenBSD: itime.c,v 1.13 2007/03/04 22:36:54 deraadt Exp $ */ /* $NetBSD: itime.c,v 1.4 1997/04/15 01:09:50 lukem Exp $ */ /*- @@ -34,21 +34,13 @@ #if 0 static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93"; #else -static const char rcsid[] = "$OpenBSD: itime.c,v 1.12 2004/11/04 20:10:07 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: itime.c,v 1.13 2007/03/04 22:36:54 deraadt Exp $"; #endif #endif /* not lint */ #include <sys/param.h> #include <sys/time.h> -#ifdef sunos -#include <sys/vnode.h> - -#include <ufs/fsdir.h> -#include <ufs/inode.h> -#include <ufs/fs.h> -#else #include <ufs/ufs/dinode.h> -#endif #include <protocols/dumprestore.h> diff --git a/sbin/dump/main.c b/sbin/dump/main.c index 3da22392f8a..327f0c64e3f 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.39 2007/02/25 16:48:46 jmc Exp $ */ +/* $OpenBSD: main.c,v 1.40 2007/03/04 22:36:54 deraadt Exp $ */ /* $NetBSD: main.c,v 1.14 1997/06/05 11:13:24 lukem Exp $ */ /*- @@ -40,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.4 (Berkeley) 4/15/94"; #else -static const char rcsid[] = "$OpenBSD: main.c,v 1.39 2007/02/25 16:48:46 jmc Exp $"; +static const char rcsid[] = "$OpenBSD: main.c,v 1.40 2007/03/04 22:36:54 deraadt Exp $"; #endif #endif /* not lint */ @@ -48,15 +48,8 @@ static const char rcsid[] = "$OpenBSD: main.c,v 1.39 2007/02/25 16:48:46 jmc Exp #include <sys/mount.h> #include <sys/stat.h> #include <sys/time.h> -#ifdef sunos -#include <sys/vnode.h> - -#include <ufs/inode.h> -#include <ufs/fs.h> -#else #include <ufs/ffs/fs.h> #include <ufs/ufs/dinode.h> -#endif #include <protocols/dumprestore.h> diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c index 503088766b2..062b8ad2bfd 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tape.c,v 1.27 2006/06/02 05:09:35 krw Exp $ */ +/* $OpenBSD: tape.c,v 1.28 2007/03/04 22:36:54 deraadt Exp $ */ /* $NetBSD: tape.c,v 1.11 1997/06/05 11:13:26 lukem Exp $ */ /*- @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)tape.c 8.2 (Berkeley) 3/17/94"; #else -static const char rcsid[] = "$OpenBSD: tape.c,v 1.27 2006/06/02 05:09:35 krw Exp $"; +static const char rcsid[] = "$OpenBSD: tape.c,v 1.28 2007/03/04 22:36:54 deraadt Exp $"; #endif #endif /* not lint */ @@ -44,15 +44,8 @@ static const char rcsid[] = "$OpenBSD: tape.c,v 1.27 2006/06/02 05:09:35 krw Exp #include <sys/time.h> #include <sys/wait.h> #include <sys/stat.h> -#ifdef sunos -#include <sys/vnode.h> - -#include <ufs/fs.h> -#include <ufs/inode.h> -#else #include <ufs/ffs/fs.h> #include <ufs/ufs/dinode.h> -#endif #include <protocols/dumprestore.h> @@ -571,11 +564,7 @@ startnewtape(int top) int status; pid_t waitingpid; char *p; -#ifdef sunos - void (*interrupt_save)(); -#else sig_t interrupt_save; -#endif interrupt_save = signal(SIGINT, SIG_IGN); parentpid = getpid(); diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index bb045875d3a..9e78834f124 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: traverse.c,v 1.17 2006/12/26 20:57:54 otto Exp $ */ +/* $OpenBSD: traverse.c,v 1.18 2007/03/04 22:36:54 deraadt Exp $ */ /* $NetBSD: traverse.c,v 1.17 1997/06/05 11:13:27 lukem Exp $ */ /*- @@ -34,24 +34,16 @@ #if 0 static char sccsid[] = "@(#)traverse.c 8.2 (Berkeley) 9/23/93"; #else -static const char rcsid[] = "$OpenBSD: traverse.c,v 1.17 2006/12/26 20:57:54 otto Exp $"; +static const char rcsid[] = "$OpenBSD: traverse.c,v 1.18 2007/03/04 22:36:54 deraadt Exp $"; #endif #endif /* not lint */ #include <sys/param.h> #include <sys/time.h> #include <sys/stat.h> -#ifdef sunos -#include <sys/vnode.h> - -#include <ufs/fs.h> -#include <ufs/fsdir.h> -#include <ufs/inode.h> -#else #include <ufs/ffs/fs.h> #include <ufs/ufs/dir.h> #include <ufs/ufs/dinode.h> -#endif #include <protocols/dumprestore.h> |