diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-11-01 12:54:56 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-11-01 12:54:56 +0000 |
| commit | 1a9e9bdd93b06508b70bd29ef5eeb82f91d86222 (patch) | |
| tree | adcf234f48d8a68a5644f1504cc93025d58ce2a2 /include | |
| parent | 5a89763fb7e57d4fc3d393eafa35c58f8285a083 (diff) | |
gunzip: restore mtime. approx +80 bytes of code
rpm: make code more robust
lsmod: small code shrink
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 5 | ||||
| -rw-r--r-- | include/unarchive.h | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/libbb.h b/include/libbb.h index 2a8b18336..5b6a2dae1 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -912,10 +912,7 @@ int chown_main(int argc, char **argv) USE_CHOWN(MAIN_EXTERNALLY_VISIBLE); /* Don't need USE_xxx() guard for these */ int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int bbunpack(char **argv, - char* (*make_new_name)(char *filename), - USE_DESKTOP(long long) int (*unpacker)(void) -) FAST_FUNC; + #if ENABLE_ROUTE void bb_displayroutes(int noresolve, int netstatfmt) FAST_FUNC; #endif diff --git a/include/unarchive.h b/include/unarchive.h index 7ff791be5..9077130a5 100644 --- a/include/unarchive.h +++ b/include/unarchive.h @@ -77,6 +77,12 @@ typedef struct archive_handle_t { } archive_handle_t; +/* Info struct unpackers can fill out to inform users of thing like + * timestamps of unpacked files */ +typedef struct unpack_info_t { + time_t mtime; +} unpack_info_t; + extern archive_handle_t *init_handle(void) FAST_FUNC; extern char filter_accept_all(archive_handle_t *archive_handle) FAST_FUNC; @@ -126,10 +132,15 @@ USE_DESKTOP(long long) int unpack_lzma_stream(int src_fd, int dst_fd) FAST_FUNC; /* the rest wants 2 first bytes already skipped by the caller */ USE_DESKTOP(long long) int unpack_bz2_stream(int src_fd, int dst_fd) FAST_FUNC; USE_DESKTOP(long long) int unpack_gz_stream(int src_fd, int dst_fd) FAST_FUNC; +USE_DESKTOP(long long) int unpack_gz_stream_with_info(int src_fd, int dst_fd, unpack_info_t *info) FAST_FUNC; USE_DESKTOP(long long) int unpack_Z_stream(int fd_in, int fd_out) FAST_FUNC; /* wrapper which checks first two bytes to be "BZ" */ USE_DESKTOP(long long) int unpack_bz2_stream_prime(int src_fd, int dst_fd) FAST_FUNC; +int bbunpack(char **argv, + char* (*make_new_name)(char *filename), + USE_DESKTOP(long long) int (*unpacker)(unpack_info_t *info)) FAST_FUNC; + #if BB_MMU void open_transformer(int fd, USE_DESKTOP(long long) int FAST_FUNC (*transformer)(int src_fd, int dst_fd)) FAST_FUNC; |