Closing bug 730. libbb run_parts is using scandir (a GNUism),

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

diff --git a/include/libbb.h b/include/libbb.h
index c30c5a73d25ae55160bcd6de26bc1e53d50f90a0..e9303123136eee6ad81a950b6f47a79bce9a09a7 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -88,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 */
@@ -103,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!) */
@@ -244,6 +245,8 @@ typedef union {
 } 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);
@@ -268,7 +271,7 @@ extern void *xmalloc_open_read_close(const char *filename, size_t *sizep);
 
 extern ssize_t safe_write(int fd, const void *buf, size_t count);
 extern ssize_t full_write(int fd, const void *buf, size_t count);
-extern void xwrite(int fd, void *buf, size_t count);
+extern void xwrite(int fd, const void *buf, size_t count);
 
 /* Reads and prints to stdout till eof, then closes FILE. Exits on error: */
 extern void xprint_and_close_file(FILE *file);
@@ -312,52 +315,13 @@ struct suffix_mult {
        const char *suffix;
        unsigned mult;
 };
-unsigned long long xstrtoull(const char *numstr, int base);
-unsigned long long xatoull(const char *numstr);
-unsigned long xstrtoul_range_sfx(const char *numstr, int base,
-               unsigned long lower,
-               unsigned long upper,
-               const struct suffix_mult *suffixes);
-unsigned long xstrtoul_range(const char *numstr, int base,
-               unsigned long lower,
-               unsigned long upper);
-unsigned long xstrtoul_sfx(const char *numstr, int base,
-               const struct suffix_mult *suffixes);
-unsigned long xstrtoul(const char *numstr, int base);
-unsigned long xatoul_range_sfx(const char *numstr,
-               unsigned long lower,
-               unsigned long upper,
-               const struct suffix_mult *suffixes);
-unsigned long xatoul_sfx(const char *numstr,
-               const struct suffix_mult *suffixes);
-unsigned long xatoul_range(const char *numstr,
-               unsigned long lower,
-               unsigned long upper);
-unsigned long xatoul(const char *numstr);
-long xstrtol_range_sfx(const char *numstr, int base,
-               long lower,
-               long upper,
-               const struct suffix_mult *suffixes);
-long xstrtol_range(const char *numstr, int base, long lower, long upper);
-long xatol_range_sfx(const char *numstr,
-               long lower,
-               long upper,
-               const struct suffix_mult *suffixes);
-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);
+#include "xatonum.h"
 /* 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);
 /* Using xatoi() instead of naive atoi() is not always convenient -
  * in many places people want *non-negative* values, but store them
  * in signed int. Therefore we need this one:
  * dies if input is not in [0, INT_MAX] range. Also will reject '-0' etc */
 int xatoi_u(const char *numstr);
-uint32_t xatou32(const char *numstr);
 /* Useful for reading port numbers */
 uint16_t xatou16(const char *numstr);
 
@@ -485,7 +449,6 @@ extern void run_shell(const char *shell, int loginshell, const char *command, co
 extern void renew_current_security_context(void);
 extern void set_current_security_context(security_context_t sid);
 #endif
-extern int run_parts(char **args, const unsigned char test_mode, char **env);
 extern int restricted_shell(const char *shell);
 extern void setup_environment(const char *shell, int loginshell, int changeenv, const struct passwd *pw);
 extern int correct_password(const struct passwd *pw);
@@ -506,6 +469,12 @@ extern unsigned long get_ug_id(const char *s, long (*__bb_getxxnam)(const char *
 int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name);
 void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name);
 void reset_ino_dev_hashtable(void);
+#ifdef __GLIBC__
+/* At least glibc has horrendously large inline for this, so wrap it */
+extern unsigned long long bb_makedev(unsigned int major, unsigned int minor);
+#undef makedev
+#define makedev(a,b) bb_makedev(a,b)
+#endif
 
 
 #ifndef COMM_LEN
@@ -558,6 +527,7 @@ pid_t *find_pid_by_name(const char* procName);
 pid_t *pidlist_reverse(pid_t *pidList);
 void clear_username_cache(void);
 const char* get_cached_username(uid_t uid);
+const char* get_cached_groupname(gid_t gid);
 
 
 extern const char bb_uuenc_tbl_base64[];
@@ -608,7 +578,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[];
@@ -702,7 +671,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