diff options
author | kientzle <kientzle@FreeBSD.org> | 2010-02-07 01:07:58 +0000 |
---|---|---|
committer | kientzle <kientzle@FreeBSD.org> | 2010-02-07 01:07:58 +0000 |
commit | 8ceb112e107785e435971cd4418604f34c78df02 (patch) | |
tree | 6c927a2522a31d89fb36bd3c0342bf9cb49990a8 | |
parent | 626ec8ce6ef612a0f768c946074b49e7153c2b7b (diff) | |
download | FreeBSD-src-8ceb112e107785e435971cd4418604f34c78df02.zip FreeBSD-src-8ceb112e107785e435971cd4418604f34c78df02.tar.gz |
Trim out some unused configuration variables, remove
some unused headers, etc.
-rw-r--r-- | usr.bin/tar/bsdtar.c | 3 | ||||
-rw-r--r-- | usr.bin/tar/bsdtar_platform.h | 23 | ||||
-rw-r--r-- | usr.bin/tar/config_freebsd.h | 36 | ||||
-rw-r--r-- | usr.bin/tar/write.c | 3 |
4 files changed, 0 insertions, 65 deletions
diff --git a/usr.bin/tar/bsdtar.c b/usr.bin/tar/bsdtar.c index 535c107..d4450f8 100644 --- a/usr.bin/tar/bsdtar.c +++ b/usr.bin/tar/bsdtar.c @@ -63,9 +63,6 @@ __FBSDID("$FreeBSD$"); #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#if HAVE_ZLIB_H -#include <zlib.h> -#endif #include "bsdtar.h" #include "err.h" diff --git a/usr.bin/tar/bsdtar_platform.h b/usr.bin/tar/bsdtar_platform.h index ae586972..6552a98 100644 --- a/usr.bin/tar/bsdtar_platform.h +++ b/usr.bin/tar/bsdtar_platform.h @@ -64,29 +64,6 @@ #endif /* - * Does this platform have complete-looking POSIX-style ACL support, - * including some variant of the acl_get_perm() function (which was - * omitted from the POSIX.1e draft)? - */ -#if HAVE_SYS_ACL_H && HAVE_ACL_PERMSET_T && HAVE_ACL_USER -#if HAVE_ACL_GET_PERM || HAVE_ACL_GET_PERM_NP -#define HAVE_POSIX_ACL 1 -#endif -#endif - -#ifdef HAVE_LIBACL -#include <acl/libacl.h> -#endif - -#if HAVE_ACL_GET_PERM -#define ACL_GET_PERM acl_get_perm -#else -#if HAVE_ACL_GET_PERM_NP -#define ACL_GET_PERM acl_get_perm_np -#endif -#endif - -/* * Include "dirent.h" (or it's equivalent on several different platforms). * * This is slightly modified from the GNU autoconf recipe. diff --git a/usr.bin/tar/config_freebsd.h b/usr.bin/tar/config_freebsd.h index 64e0d98..d3f213c 100644 --- a/usr.bin/tar/config_freebsd.h +++ b/usr.bin/tar/config_freebsd.h @@ -26,21 +26,10 @@ */ /* A default configuration for FreeBSD, used if there is no config.h. */ - #include <sys/param.h> /* __FreeBSD_version */ -#if __FreeBSD__ > 4 -#define HAVE_ACL_GET_PERM 0 -#define HAVE_ACL_GET_PERM_NP 1 -#define HAVE_ACL_PERMSET_T 1 -#define HAVE_ACL_USER 1 -#endif #undef HAVE_ATTR_XATTR_H -#define HAVE_BZLIB_H 1 -#define HAVE_CHFLAGS 1 #define HAVE_CHROOT 1 -#define HAVE_DECL_OPTARG 1 -#define HAVE_DECL_OPTIND 1 #define HAVE_DIRENT_D_NAMLEN 1 #define HAVE_DIRENT_H 1 #define HAVE_D_MD_ORDER 1 @@ -51,26 +40,13 @@ #define HAVE_FNMATCH 1 #define HAVE_FNMATCH_H 1 #define HAVE_FNM_LEADING_DIR 1 -#define HAVE_FTRUNCATE 1 -#undef HAVE_GETXATTR #define HAVE_GRP_H 1 -#define HAVE_INTTYPES_H 1 #define HAVE_LANGINFO_H 1 -#undef HAVE_LGETXATTR -#undef HAVE_LIBACL #define HAVE_LIBARCHIVE 1 -#define HAVE_LIBBZ2 1 -#define HAVE_LIBZ 1 #define HAVE_LIMITS_H 1 #undef HAVE_LINUX_EXT2_FS_H #undef HAVE_LINUX_FS_H -#undef HAVE_LISTXATTR -#undef HAVE_LLISTXATTR #define HAVE_LOCALE_H 1 -#define HAVE_MALLOC 1 -#define HAVE_MEMMOVE 1 -#define HAVE_MEMORY_H 1 -#define HAVE_MEMSET 1 #if __FreeBSD_version >= 450002 /* nl_langinfo introduced */ #define HAVE_NL_LANGINFO 1 #endif @@ -79,19 +55,11 @@ #define HAVE_REGEX_H 1 #define HAVE_SETLOCALE 1 #define HAVE_STDARG_H 1 -#define HAVE_STDINT_H 1 #define HAVE_STDLIB_H 1 -#define HAVE_STRCHR 1 -#define HAVE_STRDUP 1 -#define HAVE_STRERROR 1 -#define HAVE_STRFTIME 1 -#define HAVE_STRINGS_H 1 #define HAVE_STRING_H 1 -#define HAVE_STRRCHR 1 #define HAVE_STRUCT_STAT_ST_FLAGS 1 #undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC #define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 -#define HAVE_SYS_ACL_H 1 #define HAVE_SYS_IOCTL_H 1 #define HAVE_SYS_PARAM_H 1 #define HAVE_SYS_STAT_H 1 @@ -100,9 +68,5 @@ #define HAVE_UINTMAX_T 1 #define HAVE_UNISTD_H 1 #define HAVE_UNSIGNED_LONG_LONG -#define HAVE_VPRINTF 1 #define HAVE_WCTYPE_H 1 -#define HAVE_ZLIB_H 1 #undef MAJOR_IN_MKDEV -#define STDC_HEADERS 1 - diff --git a/usr.bin/tar/write.c b/usr.bin/tar/write.c index 864bfd1..e17bd93 100644 --- a/usr.bin/tar/write.c +++ b/usr.bin/tar/write.c @@ -29,9 +29,6 @@ __FBSDID("$FreeBSD$"); #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif -#ifdef HAVE_SYS_ACL_H -#include <sys/acl.h> -#endif #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif |