diff options
| author | kientzle <kientzle@FreeBSD.org> | 2004-08-07 17:17:11 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2004-08-07 17:17:11 +0000 |
| commit | e9c1fd002b5b9b41f9048032bb08e39247ee99bf (patch) | |
| tree | 08627de5a1e6ce580cc175ac621621381c3810c6 /usr.bin/tar | |
| parent | 7d65aa86ff279fea6ab04a43e609284eaf4689e0 (diff) | |
| download | FreeBSD-src-e9c1fd002b5b9b41f9048032bb08e39247ee99bf.zip FreeBSD-src-e9c1fd002b5b9b41f9048032bb08e39247ee99bf.tar.gz | |
Linux port corrections:
* Add a more reasonable default device for linux
* Add an autoconf check for the FNM_LEADING_DIR extension
(which isn't yet obeyed in the code)
Diffstat (limited to 'usr.bin/tar')
| -rw-r--r-- | usr.bin/tar/bsdtar.c | 5 | ||||
| -rw-r--r-- | usr.bin/tar/bsdtar_platform.h | 4 | ||||
| -rw-r--r-- | usr.bin/tar/configure.ac.in | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/tar/bsdtar.c b/usr.bin/tar/bsdtar.c index aa9fc95..535a8aa 100644 --- a/usr.bin/tar/bsdtar.c +++ b/usr.bin/tar/bsdtar.c @@ -65,11 +65,14 @@ struct option { #include "bsdtar.h" +#ifdef linux +#define _PATH_DEFTAPE "/dev/st0" +#endif + #ifndef _PATH_DEFTAPE #define _PATH_DEFTAPE "/dev/tape" #endif - static int bsdtar_getopt(struct bsdtar *, const char *optstring, const struct option **poption); static void long_help(struct bsdtar *); diff --git a/usr.bin/tar/bsdtar_platform.h b/usr.bin/tar/bsdtar_platform.h index a6919a9..c2795a9 100644 --- a/usr.bin/tar/bsdtar_platform.h +++ b/usr.bin/tar/bsdtar_platform.h @@ -133,9 +133,6 @@ #endif #endif -/* XXX get fnmatch GNU extensions (FNM_LEADING_DIR) - * (should probably use AC_FUNC_FNMATCH_GNU once using autoconf...) */ - #if HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC #define ARCHIVE_STAT_MTIME_NANOS(st) (st)->st_mtimespec.tv_nsec #else @@ -146,5 +143,4 @@ #endif #endif - #endif /* !BSDTAR_PLATFORM_H_INCLUDED */ diff --git a/usr.bin/tar/configure.ac.in b/usr.bin/tar/configure.ac.in index 7d21439..d93c3ac 100644 --- a/usr.bin/tar/configure.ac.in +++ b/usr.bin/tar/configure.ac.in @@ -33,6 +33,8 @@ AC_CHECK_DECL([D_MD_ORDER], # Checks for library functions. AC_FUNC_FNMATCH +# Check for FNM_LEADING_DIR fnmatch extension +AC_GNU_SOURCE AC_PROG_GCC_TRADITIONAL AC_FUNC_LSTAT AC_HEADER_MAJOR |
