Module Name: src
Committed By: snj
Date: Sat Oct 3 21:30:37 UTC 2009
Modified Files:
src/bin/pax [netbsd-5-0]: Makefile ar_io.c
src/tools/compat [netbsd-5-0]: configure configure.ac
Log Message:
Pull up following revision(s) (requested by apb in ticket #1020):
bin/pax/Makefile: revision 1.38
bin/pax/ar_io.c: revision 1.49
tools/compat/configure: revision 1.69
tools/compat/configure.ac: revision 1.69
do not require sys/mtio.h for a tools build of pax
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.10.1 src/bin/pax/Makefile
cvs rdiff -u -r1.48 -r1.48.20.1 src/bin/pax/ar_io.c
cvs rdiff -u -r1.67.2.1 -r1.67.2.1.2.1 src/tools/compat/configure \
src/tools/compat/configure.ac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/Makefile
diff -u src/bin/pax/Makefile:1.37 src/bin/pax/Makefile:1.37.10.1
--- src/bin/pax/Makefile:1.37 Sun Feb 24 20:42:46 2008
+++ src/bin/pax/Makefile Sat Oct 3 21:30:36 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2008/02/24 20:42:46 joerg Exp $
+# $NetBSD: Makefile,v 1.37.10.1 2009/10/03 21:30:36 snj Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
.include <bsd.own.mk>
@@ -25,12 +25,13 @@
MAN= pax.1 tar.1 cpio.1
-# XXX: Interix does not have it; we need a conditional for it.
-CPPFLAGS+= -DHAVE_MTIO_H
-
.if defined(HOSTPROG)
CPPFLAGS+= -DHOSTPROG
.else # { ! HOSTPROG
+
+# XXX: Interix does not have it; we need a conditional for it.
+CPPFLAGS+= -DHAVE_SYS_MTIO_H
+
LINKS+= ${BINDIR}/pax ${BINDIR}/tar
SYMLINKS+=${BINDIR}/tar /usr/bin/tar
Index: src/bin/pax/ar_io.c
diff -u src/bin/pax/ar_io.c:1.48 src/bin/pax/ar_io.c:1.48.20.1
--- src/bin/pax/ar_io.c:1.48 Mon Apr 23 18:40:22 2007
+++ src/bin/pax/ar_io.c Sat Oct 3 21:30:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ar_io.c,v 1.48 2007/04/23 18:40:22 christos Exp $ */
+/* $netbsd: ar_io.c,v 1.48 2007/04/23 18:40:22 christos Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: ar_io.c,v 1.48 2007/04/23 18:40:22 christos Exp $");
+__RCSID("$NetBSD: ar_io.c,v 1.48.20.1 2009/10/03 21:30:36 snj Exp $");
#endif
#endif /* not lint */
@@ -51,7 +51,7 @@
#include <sys/time.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
#include <sys/mtio.h>
#endif
#include <sys/wait.h>
@@ -99,7 +99,7 @@
time_t starttime; /* time the run started */
int force_one_volume; /* 1 if we ignore volume changes */
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
static int get_phys(void);
#endif
extern sigset_t s_mask;
@@ -129,7 +129,7 @@
int
ar_open(const char *name)
{
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
struct mtget mb;
#endif
@@ -220,7 +220,7 @@
}
if (S_ISCHR(arsb.st_mode)) {
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
artyp = ioctl(arfd, MTIOCGET, &mb) ? ISCHR : ISTAPE;
#else
tty_warn(1, "System does not have tape support");
@@ -941,7 +941,7 @@
long fsbz;
off_t cpos;
off_t mpos;
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
struct mtop mb;
#endif
@@ -965,7 +965,7 @@
case ISRMT:
#endif /* SUPPORT_RMT */
case ISTAPE:
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
/*
* if the last i/o was a successful data transfer, we assume
* the fault is just a bad record on the tape that we are now
@@ -1109,7 +1109,7 @@
ar_rev(off_t sksz)
{
off_t cpos;
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
int phyblk;
struct mtop mb;
#endif
@@ -1180,7 +1180,7 @@
#ifdef SUPPORT_RMT
case ISRMT:
#endif /* SUPPORT_RMT */
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
/*
* Calculate and move the proper number of PHYSICAL tape
* blocks. If the sksz is not an even multiple of the physical
@@ -1242,7 +1242,7 @@
return 0;
}
-#ifdef HAVE_MTIO_H
+#ifdef HAVE_SYS_MTIO_H
/*
* get_phys()
* Determine the physical block size on a tape drive. We need the physical
Index: src/tools/compat/configure
diff -u src/tools/compat/configure:1.67.2.1 src/tools/compat/configure:1.67.2.1.2.1
--- src/tools/compat/configure:1.67.2.1 Thu Jan 15 04:30:19 2009
+++ src/tools/compat/configure Sat Oct 3 21:30:36 2009
@@ -2328,7 +2328,7 @@
# These are not necessarily required by the code, but they are not
# currently conditionalized.
-for ac_header in sys/ioctl.h sys/mman.h sys/mtio.h sys/param.h \
+for ac_header in sys/ioctl.h sys/mman.h sys/param.h \
sys/socket.h sys/stat.h sys/time.h sys/types.h sys/utsname.h \
sys/wait.h assert.h ctype.h errno.h fcntl.h grp.h limits.h locale.h \
netdb.h pwd.h signal.h stdarg.h stdio.h stdlib.h string.h \
@@ -2551,7 +2551,7 @@
fi
-for ac_header in sys/sysmacros.h sys/syslimits.h \
+for ac_header in sys/mtio.h sys/sysmacros.h sys/syslimits.h \
getopt.h features.h malloc.h sys/poll.h stddef.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
Index: src/tools/compat/configure.ac
diff -u src/tools/compat/configure.ac:1.67.2.1 src/tools/compat/configure.ac:1.67.2.1.2.1
--- src/tools/compat/configure.ac:1.67.2.1 Thu Jan 15 04:21:26 2009
+++ src/tools/compat/configure.ac Sat Oct 3 21:30:36 2009
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.67.2.1 2009/01/15 04:21:26 snj Exp $
+# $NetBSD: configure.ac,v 1.67.2.1.2.1 2009/10/03 21:30:36 snj Exp $
#
# Autoconf definition file for libnbcompat.
#
@@ -24,7 +24,7 @@
AC_CONFIG_FILES(defs.mk)
# Autoheader header and footer
-AH_TOP([/* $NetBSD: configure.ac,v 1.67.2.1 2009/01/15 04:21:26 snj Exp $ */
+AH_TOP([/* $NetBSD: configure.ac,v 1.67.2.1.2.1 2009/10/03 21:30:36 snj Exp $ */
#ifndef __NETBSD_NBTOOL_CONFIG_H__
#define __NETBSD_NBTOOL_CONFIG_H__])
@@ -69,7 +69,7 @@
# Make sure certain required headers are available.
# These are not necessarily required by the code, but they are not
# currently conditionalized.
-AC_CHECK_HEADERS(sys/ioctl.h sys/mman.h sys/mtio.h sys/param.h \
+AC_CHECK_HEADERS(sys/ioctl.h sys/mman.h sys/param.h \
sys/socket.h sys/stat.h sys/time.h sys/types.h sys/utsname.h \
sys/wait.h assert.h ctype.h errno.h fcntl.h grp.h limits.h locale.h \
netdb.h pwd.h signal.h stdarg.h stdio.h stdlib.h string.h \
@@ -78,7 +78,7 @@
# Find headers that may not be available.
AC_HEADER_DIRENT
-AC_CHECK_HEADERS(sys/sysmacros.h sys/syslimits.h \
+AC_CHECK_HEADERS(sys/mtio.h sys/sysmacros.h sys/syslimits.h \
getopt.h features.h malloc.h sys/poll.h stddef.h)
AC_CHECK_HEADERS(sys/bswap.h machine/bswap.h sys/cdefs.h machine/endian.h \
sys/featuretest.h err.h inttypes.h libgen.h paths.h stdint.h util.h \
