diff options
| author | kientzle <kientzle@FreeBSD.org> | 2004-08-07 03:09:28 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2004-08-07 03:09:28 +0000 |
| commit | 237a0ce1f8117c40c606f8734ead347261516646 (patch) | |
| tree | 8e493d11e47f8de67e525de4be33da2d37f8f1d2 /lib/libarchive/archive_read_extract.c | |
| parent | 1f65e2392cd4804c7a7ee4f02c81dbb21584e642 (diff) | |
| download | FreeBSD-src-237a0ce1f8117c40c606f8734ead347261516646.zip FreeBSD-src-237a0ce1f8117c40c606f8734ead347261516646.tar.gz | |
libarchive now has two complete build systems. The usual "Makefile"
is present for FreeBSD. If you "make distfile" on FreeBSD, you will
soon have a tar.gz file suitable for deploying to other systems
(complete with the expected "configure" script, etc). This latter
relies (at least for now) on the GNU auto??? tools. (I like autoconf
okay, but someday I hope to write a custom Makefile.in and dispense
with automake, which is somewhat odious.)
As part of this, I've cleaned up some of the conditional
compilation options, added make-foo to construct archive.h dynamically
(it now contains some version constants), and added some useful
informational files.
Diffstat (limited to 'lib/libarchive/archive_read_extract.c')
| -rw-r--r-- | lib/libarchive/archive_read_extract.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lib/libarchive/archive_read_extract.c b/lib/libarchive/archive_read_extract.c index e91a744..a8d6961 100644 --- a/lib/libarchive/archive_read_extract.c +++ b/lib/libarchive/archive_read_extract.c @@ -27,26 +27,31 @@ #include "archive_platform.h" __FBSDID("$FreeBSD$"); -#include <sys/stat.h> #include <sys/types.h> -#ifdef HAVE_POSIX_ACL +#ifdef HAVE_SYS_ACL_H #include <sys/acl.h> #endif +#ifdef HAVE_SYS_IOCTL_H +#include <sys/ioctl.h> +#endif +#include <sys/stat.h> #include <sys/time.h> +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include <ext2fs/ext2_fs.h> /* for Linux file flags */ +#endif #include <errno.h> #include <fcntl.h> #include <grp.h> +#ifdef HAVE_LINUX_EXT2_FS_H +#include <linux/ext2_fs.h> /* for Linux file flags */ +#endif #include <limits.h> #include <pwd.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#ifdef linux -#include <ext2fs/ext2_fs.h> -#include <sys/ioctl.h> -#endif #include "archive.h" #include "archive_string.h" |
