d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-enable support for bzip2'ed compressed filesystems.

Browse Source
This commit is contained in:
obrien 2005-05-17 16:22:54 +00:00
parent 5afe563c0f
commit f95df4a3be
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libstand/Makefile
View File

@ -45,7 +45,7 @@ SRCS+= strcasecmp.c
SRCS+= htons.S ntohs.S htonl.S ntohl.S SRCS+= htons.S ntohs.S htonl.S ntohl.S
# string functions from libc # string functions from libc
.PATH: ${.CURDIR}/../libc/string .PATH: ${.CURDIR}/../libc/string
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64" ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64"
SRCS+= bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \ SRCS+= bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \
@ -121,14 +121,19 @@ SRCS+= syncicache.c
# _setjmp/_longjmp # _setjmp/_longjmp
.if ${MACHINE_ARCH} == "amd64" .if ${MACHINE_ARCH} == "amd64"
.PATH: ${.CURDIR}/i386 .PATH: ${.CURDIR}/i386
.else .else
.PATH: ${.CURDIR}/${MACHINE_ARCH} .PATH: ${.CURDIR}/${MACHINE_ARCH}
.endif .endif
SRCS+= _setjmp.S SRCS+= _setjmp.S
# decompression functionality from libz # decompression functionality from libz
.PATH: ${.CURDIR}/../libz .PATH: ${.CURDIR}/../../contrib/bzip2
CFLAGS+= -DBZ_NO_STDIO
SRCS+= bzlib.c crctable.c decompress.c huffman.c randtable.c
# decompression functionality from libz
.PATH: ${.CURDIR}/../libz
CFLAGS+=-DHAVE_MEMCPY -I${.CURDIR}/../libz CFLAGS+=-DHAVE_MEMCPY -I${.CURDIR}/../libz
SRCS+= adler32.c crc32.c _infback.c _inffast.c _inflate.c \ SRCS+= adler32.c crc32.c _infback.c _inffast.c _inflate.c \
_inftrees.c _zutil.c _zutil.h _inftrees.c _zutil.c _zutil.h
@ -159,7 +164,7 @@ SRCS+= arp.c ether.c inet_ntoa.c in_cksum.c net.c udp.c netif.c rpc.c
SRCS+= bootp.c rarp.c bootparam.c SRCS+= bootp.c rarp.c bootparam.c
# boot filesystems # boot filesystems
SRCS+= ufs.c nfs.c cd9660.c tftp.c gzipfs.c # bzipfs.c SRCS+= ufs.c nfs.c cd9660.c tftp.c gzipfs.c bzipfs.c
SRCS+= dosfs.c ext2fs.c SRCS+= dosfs.c ext2fs.c
SRCS+= splitfs.c SRCS+= splitfs.c

2
lib/libstand/bzipfs.c
View File

@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <sys/stat.h> #include <sys/stat.h>
#include <string.h> #include <string.h>
#include <_bzlib.h> #include <bzlib.h>
#define BZ_BUFSIZE 2048 /* XXX larger? */ #define BZ_BUFSIZE 2048 /* XXX larger? */