header_verbose_list: stop truncating file size in listing

[oweals/busybox.git] / include / libbb.h

diff --git a/include/libbb.h b/include/libbb.h
index 60743311876d033097ccd4d5be2015cd203c1947..ad64bad8447fc2484d822b57b893ba7dd14ad702 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -60,7 +60,7 @@
 #define  PATH_MAX         256
 #endif
 
-/* Not (yet) used, but tested to work correctly
+/* Tested to work correctly (IIRC :]) */
 #define MAXINT(T) (T)( \
        ((T)-1) > 0 \
        ? (T)-1 \
@@ -72,7 +72,6 @@
        ? (T)0 \
        : ((T)1 << (sizeof(T)*8-1)) \
        )
-*/
 
 /* Large file support */
 /* Note that CONFIG_LFS forces bbox to be built with all common ops
@@ -89,13 +88,14 @@
 #  define STRTOOFF strtol
 #  define SAFE_STRTOOFF safe_strtol
 #  define XSTRTOUOFF xstrtoul
-#  define OFF_FMT "ld"
+/* usage: printf("size: %"OFF_FMT"d (%"OFF_FMT"x)\n", sz, sz); */
+#  define OFF_FMT "l"
 # else
 /* "long" is too short, need "long long" */
 #  define STRTOOFF strtoll
 #  define SAFE_STRTOOFF safe_strtoll
 #  define XSTRTOUOFF xstrtoull
-#  define OFF_FMT "lld"
+#  define OFF_FMT "ll"
 # endif
 #else
 # if 0 /* #if UINT_MAX == 0xffffffff */
@@ -104,12 +104,12 @@
 #  define STRTOOFF strtol
 #  define SAFE_STRTOOFF safe_strtoi
 #  define XSTRTOUOFF xstrtou
-#  define OFF_FMT "d"
+#  define OFF_FMT ""
 # else
 #  define STRTOOFF strtol
 #  define SAFE_STRTOOFF safe_strtol
 #  define XSTRTOUOFF xstrtoul
-#  define OFF_FMT "ld"
+#  define OFF_FMT "l"
 # endif
 #endif
 /* scary. better ideas? (but do *test* them first!) */
@@ -205,6 +205,7 @@ extern off_t bb_copyfd_size(int fd1, int fd2, off_t size);
 extern off_t bb_copyfd_eof(int fd1, int fd2);
 extern char bb_process_escape_sequence(const char **ptr);
 extern char *bb_get_last_path_component(char *path);
+extern int ndelay_on(int fd);
 
 
 extern DIR *xopendir(const char *path);
@@ -226,6 +227,7 @@ extern int xopen3(const char *pathname, int flags, int mode);
 extern off_t xlseek(int fd, off_t offset, int whence);
 extern off_t fdlength(int fd);
 
+
 extern int xsocket(int domain, int type, int protocol);
 extern void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen);
 extern void xlisten(int s, int backlog);
@@ -233,6 +235,19 @@ extern void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen);
 extern int xconnect_tcp_v4(struct sockaddr_in *s_addr);
 extern struct hostent *xgethostbyname(const char *name);
 extern struct hostent *xgethostbyname2(const char *name, int af);
+extern int xsocket_stream_ip4or6(sa_family_t *fp);
+typedef union {
+       struct sockaddr sa;
+       struct sockaddr_in sin;
+#if ENABLE_FEATURE_IPV6
+       struct sockaddr_in6 sin6;
+#endif
+} sockaddr_inet;
+extern int dotted2sockaddr(const char *dotted, struct sockaddr* sp, int socklen);
+extern int create_and_bind_socket_ip4or6(const char *hostaddr, int port);
+extern int setsockopt_reuseaddr(int fd);
+extern int setsockopt_broadcast(int fd);
+
 
 extern char *xstrdup(const char *s);
 extern char *xstrndup(const char *s, int n);
@@ -278,6 +293,7 @@ extern FILE *fopen_or_warn(const char *filename, const char *mode);
 extern FILE *fopen_or_warn_stdin(const char *filename);
 
 
+extern void smart_ulltoa5(unsigned long long ul, char buf[5]);
 extern void utoa_to_buf(unsigned n, char *buf, unsigned buflen);
 extern char *utoa(unsigned n);
 extern void itoa_to_buf(int n, char *buf, unsigned buflen);
@@ -334,6 +350,8 @@ long xatol_range(const char *numstr, long lower, long upper);
 long xatol_sfx(const char *numstr, const struct suffix_mult *suffixes);
 long xatol(const char *numstr);
 /* Specialized: */
+unsigned xatou_range(const char *numstr, unsigned lower, unsigned upper);
+unsigned xatou_sfx(const char *numstr, const struct suffix_mult *suffixes);
 unsigned xatou(const char *numstr);
 int xatoi_range(const char *numstr, int lower, int upper);
 int xatoi(const char *numstr);
@@ -476,7 +494,8 @@ extern void setup_environment(const char *shell, int loginshell, int changeenv,
 extern int correct_password(const struct passwd *pw);
 extern char *pw_encrypt(const char *clear, const char *salt);
 extern int obscure(const char *old, const char *newval, const struct passwd *pwdp);
-extern int compare_string_array(const char * const string_array[], const char *key);
+extern int index_in_str_array(const char * const string_array[], const char *key);
+extern int index_in_substr_array(const char * const string_array[], const char *key);
 extern void print_login_issue(const char *issue_file, const char *tty);
 extern void print_login_prompt(void);
 #ifdef BB_NOMMU
@@ -592,7 +611,6 @@ extern const char bb_msg_memory_exhausted[];
 extern const char bb_msg_invalid_date[];
 extern const char bb_msg_read_error[];
 extern const char bb_msg_write_error[];
-extern const char bb_msg_name_longer_than_foo[];
 extern const char bb_msg_unknown[];
 extern const char bb_msg_can_not_create_raw_socket[];
 extern const char bb_msg_perm_denied_are_you_root[];
@@ -601,6 +619,8 @@ extern const char bb_msg_invalid_arg[];
 extern const char bb_msg_standard_input[];
 extern const char bb_msg_standard_output[];
 
+extern const char bb_str_default[];
+
 extern const char bb_path_mtab_file[];
 extern const char bb_path_nologin_file[];
 extern const char bb_path_passwd_file[];
@@ -684,7 +704,7 @@ extern const char bb_default_login_shell[];
 #define RB_POWER_OFF   0x4321fedc
 #endif
 
-// Make sure we call functions instead of macros.
+/* Make sure we call functions instead of macros.  */
 #undef isalnum
 #undef isalpha
 #undef isascii