diff options
| author | Denis Vlasenko | 2007-09-16 18:50:56 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-09-16 18:50:56 +0000 |
| commit | e755e827f7c8ecb21787a4369d7afdeda54d112b (patch) | |
| tree | 007b1506e69ffcc25bc6ba3b0e6686d806a34264 /include | |
| parent | ed6ac53104d811ee88c71aff45c7cad666aaee46 (diff) | |
| download | busybox-e755e827f7c8ecb21787a4369d7afdeda54d112b.zip busybox-e755e827f7c8ecb21787a4369d7afdeda54d112b.tar.gz | |
apply post 1.7.0 patches, set version to 1.7.11_7_1
Diffstat (limited to 'include')
| -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 e514fe2..140e21d 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -248,9 +248,10 @@ void xmove_fd(int, int); DIR *xopendir(const char *path); DIR *warn_opendir(const char *path); -char *xrealloc_getcwd_or_warn(char *cwd); +/* UNUSED: char *xmalloc_realpath(const char *path); */ +char *xmalloc_readlink(const char *path); char *xmalloc_readlink_or_warn(const char *path); -char *xmalloc_realpath(const char *path); +char *xrealloc_getcwd_or_warn(char *cwd); //TODO: signal(sid, f) is the same? then why? @@ -316,8 +317,8 @@ enum { }; /* Create stream socket, and allocate suitable lsa. * (lsa of correct size and lsa->sa.sa_family (AF_INET/AF_INET6)) - * af == AF_UNSPEC will result in trying to create IPv6, and - * if kernel doesn't support it, IPv4. + * af == AF_UNSPEC will result in trying to create IPv6 socket, + * and if kernel doesn't support it, IPv4. */ int xsocket_type(len_and_sockaddr **lsap, USE_FEATURE_IPV6(int af,) int sock_type); int xsocket_stream(len_and_sockaddr **lsap); diff --git a/include/unarchive.h b/include/unarchive.h index bea0558..51ec89c 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 extern USE_DESKTOP(long long) int unpack_gz_stream(int src_fd, int dst_fd); extern USE_DESKTOP(long long) int unpack_lzma_stream(int src_fd, int dst_fd); +#if BB_MMU extern int open_transformer(int src_fd, USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd)); +#define open_transformer(src_fd, transformer, transform_prog, ...) open_transformer(src_fd, transformer) +#else +extern int open_transformer(int src_fd, const char *transform_prog, ...); +#define open_transformer(src_fd, transformer, transform_prog, ...) open_transformer(src_fd, transform_prog, __VA_ARGS__) +#endif #endif |