diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 11:41:16 +1000 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 11:41:16 +1000 |
commit | 743d85e7d1c2a721baf020b9d79f45f0df2420a9 (patch) | |
tree | 9e551b726ac2bf9fd8eafb2764e7237f352bb429 /include/libbb.h | |
parent | 87911f4fcd86f7abc0aefba8e9cbec2ac9d127e4 (diff) | |
parent | c7f95d23f6bc7e17a3b79decf83eb362b389e53a (diff) | |
download | busybox-w32-743d85e7d1c2a721baf020b9d79f45f0df2420a9.tar.gz busybox-w32-743d85e7d1c2a721baf020b9d79f45f0df2420a9.tar.bz2 busybox-w32-743d85e7d1c2a721baf020b9d79f45f0df2420a9.zip |
Merge branch 'origin/master' (early part)
Diffstat (limited to 'include/libbb.h')
-rw-r--r-- | include/libbb.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h index 11d7f27d3..58a5968c5 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -664,6 +664,15 @@ extern char *xmalloc_reads(int fd, char *pfx, size_t *maxsz_p) FAST_FUNC; | |||
664 | extern void *xmalloc_read(int fd, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC; | 664 | extern void *xmalloc_read(int fd, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC; |
665 | /* Returns NULL if file can't be opened (default max size: INT_MAX - 4095) */ | 665 | /* Returns NULL if file can't be opened (default max size: INT_MAX - 4095) */ |
666 | extern void *xmalloc_open_read_close(const char *filename, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC; | 666 | extern void *xmalloc_open_read_close(const char *filename, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC; |
667 | /* Autodetects gzip/bzip2 formats. fd may be in the middle of the file! */ | ||
668 | #if ENABLE_FEATURE_SEAMLESS_LZMA \ | ||
669 | || ENABLE_FEATURE_SEAMLESS_BZ2 \ | ||
670 | || ENABLE_FEATURE_SEAMLESS_GZ \ | ||
671 | /* || ENABLE_FEATURE_SEAMLESS_Z */ | ||
672 | extern int setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/) FAST_FUNC; | ||
673 | #else | ||
674 | # define setup_unzip_on_fd(...) ((void)0) | ||
675 | #endif | ||
667 | /* Autodetects .gz etc */ | 676 | /* Autodetects .gz etc */ |
668 | extern int open_zipped(const char *fname) FAST_FUNC; | 677 | extern int open_zipped(const char *fname) FAST_FUNC; |
669 | extern void *xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC; | 678 | extern void *xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC; |