summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--include/libbb.h9
-rw-r--r--include/unarchive.h6
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);
248DIR *xopendir(const char *path); 248DIR *xopendir(const char *path);
249DIR *warn_opendir(const char *path); 249DIR *warn_opendir(const char *path);
250 250
251char *xrealloc_getcwd_or_warn(char *cwd); 251/* UNUSED: char *xmalloc_realpath(const char *path); */
252char *xmalloc_readlink(const char *path);
252char *xmalloc_readlink_or_warn(const char *path); 253char *xmalloc_readlink_or_warn(const char *path);
253char *xmalloc_realpath(const char *path); 254char *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 */
322int xsocket_type(len_and_sockaddr **lsap, USE_FEATURE_IPV6(int af,) int sock_type); 323int xsocket_type(len_and_sockaddr **lsap, USE_FEATURE_IPV6(int af,) int sock_type);
323int xsocket_stream(len_and_sockaddr **lsap); 324int 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
115extern USE_DESKTOP(long long) int unpack_gz_stream(int src_fd, int dst_fd); 115extern USE_DESKTOP(long long) int unpack_gz_stream(int src_fd, int dst_fd);
116extern USE_DESKTOP(long long) int unpack_lzma_stream(int src_fd, int dst_fd); 116extern USE_DESKTOP(long long) int unpack_lzma_stream(int src_fd, int dst_fd);
117 117
118#if BB_MMU
118extern int open_transformer(int src_fd, 119extern 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
123extern 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