diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-16 18:50:56 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-16 18:50:56 +0000 |
commit | e755e827f7c8ecb21787a4369d7afdeda54d112b (patch) | |
tree | 007b1506e69ffcc25bc6ba3b0e6686d806a34264 /include | |
parent | ed6ac53104d811ee88c71aff45c7cad666aaee46 (diff) | |
download | busybox-w32-1_7_1.tar.gz busybox-w32-1_7_1.tar.bz2 busybox-w32-1_7_1.zip |
apply post 1.7.0 patches, set version to 1.7.11_7_1
Diffstat (limited to '')
-rw-r--r-- | include/libbb.h | 9 | ||||
-rw-r--r-- | include/unarchive.h | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/include/libbb.h b/include/libbb.h index e514fe2f2..140e21dea 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -248,9 +248,10 @@ void xmove_fd(int, int); | |||
248 | DIR *xopendir(const char *path); | 248 | DIR *xopendir(const char *path); |
249 | DIR *warn_opendir(const char *path); | 249 | DIR *warn_opendir(const char *path); |
250 | 250 | ||
251 | char *xrealloc_getcwd_or_warn(char *cwd); | 251 | /* UNUSED: char *xmalloc_realpath(const char *path); */ |
252 | char *xmalloc_readlink(const char *path); | ||
252 | char *xmalloc_readlink_or_warn(const char *path); | 253 | char *xmalloc_readlink_or_warn(const char *path); |
253 | char *xmalloc_realpath(const char *path); | 254 | char *xrealloc_getcwd_or_warn(char *cwd); |
254 | 255 | ||
255 | 256 | ||
256 | //TODO: signal(sid, f) is the same? then why? | 257 | //TODO: signal(sid, f) is the same? then why? |
@@ -316,8 +317,8 @@ enum { | |||
316 | }; | 317 | }; |
317 | /* Create stream socket, and allocate suitable lsa. | 318 | /* Create stream socket, and allocate suitable lsa. |
318 | * (lsa of correct size and lsa->sa.sa_family (AF_INET/AF_INET6)) | 319 | * (lsa of correct size and lsa->sa.sa_family (AF_INET/AF_INET6)) |
319 | * af == AF_UNSPEC will result in trying to create IPv6, and | 320 | * af == AF_UNSPEC will result in trying to create IPv6 socket, |
320 | * if kernel doesn't support it, IPv4. | 321 | * and if kernel doesn't support it, IPv4. |
321 | */ | 322 | */ |
322 | int xsocket_type(len_and_sockaddr **lsap, USE_FEATURE_IPV6(int af,) int sock_type); | 323 | int xsocket_type(len_and_sockaddr **lsap, USE_FEATURE_IPV6(int af,) int sock_type); |
323 | int xsocket_stream(len_and_sockaddr **lsap); | 324 | int xsocket_stream(len_and_sockaddr **lsap); |
diff --git a/include/unarchive.h b/include/unarchive.h index bea055852..51ec89cc0 100644 --- a/include/unarchive.h +++ b/include/unarchive.h | |||
@@ -115,7 +115,13 @@ extern USE_DESKTOP(long long) int inflate_unzip(inflate_unzip_result *res, unsig | |||
115 | extern USE_DESKTOP(long long) int unpack_gz_stream(int src_fd, int dst_fd); | 115 | extern USE_DESKTOP(long long) int unpack_gz_stream(int src_fd, int dst_fd); |
116 | extern USE_DESKTOP(long long) int unpack_lzma_stream(int src_fd, int dst_fd); | 116 | extern USE_DESKTOP(long long) int unpack_lzma_stream(int src_fd, int dst_fd); |
117 | 117 | ||
118 | #if BB_MMU | ||
118 | extern int open_transformer(int src_fd, | 119 | extern int open_transformer(int src_fd, |
119 | USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd)); | 120 | USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd)); |
121 | #define open_transformer(src_fd, transformer, transform_prog, ...) open_transformer(src_fd, transformer) | ||
122 | #else | ||
123 | extern int open_transformer(int src_fd, const char *transform_prog, ...); | ||
124 | #define open_transformer(src_fd, transformer, transform_prog, ...) open_transformer(src_fd, transform_prog, __VA_ARGS__) | ||
125 | #endif | ||
120 | 126 | ||
121 | #endif | 127 | #endif |