Merge branch 'busybox' into merge

author: Ron Yorston <rmy@pobox.com> 2013-08-27 16:10:53 +0100
committer: Ron Yorston <rmy@pobox.com> 2013-08-27 16:10:53 +0100
commit: 3fd34651ea72ea1c335d3170f234cb0517fd897f (patch)
tree: 36e8fc40cffd464ffda4759020777dd3ca23ca31 /include
parent: e3ac39098326de084a805d0dd31db9666b734f20 (diff)
parent: d6ae4fb446daedfe3073d67be655942e9fa7eb18 (diff)
download: busybox-w32-3fd34651ea72ea1c335d3170f234cb0517fd897f.tar.gz
busybox-w32-3fd34651ea72ea1c335d3170f234cb0517fd897f.tar.bz2
busybox-w32-3fd34651ea72ea1c335d3170f234cb0517fd897f.zip
5 files changed, 29 insertions, 12 deletions
diff --git a/include/applets.src.h b/include/applets.src.h
index 00172b1bc..aa319bbc9 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -52,6 +52,12 @@ s     - suid type:
 # define APPLET_NOEXEC(name,main,l,s,name2)  LINK l name
 # define APPLET_NOFORK(name,main,l,s,name2)  LINK l name
+#elif defined(MAKE_SUID)
+# define APPLET(name,l,s)                    SUID s l name
+# define APPLET_ODDNAME(name,main,l,s,name2) SUID s l name
+# define APPLET_NOEXEC(name,main,l,s,name2)  SUID s l name
+# define APPLET_NOFORK(name,main,l,s,name2)  SUID s l name
 #else
  static struct bb_applet applets[] = { /*    name, main, location, need_suid */
 # define APPLET(name,l,s)                    { #name, #name, l, s },
@@ -415,7 +421,8 @@ IF_YES(APPLET_NOFORK(yes, yes, BB_DIR_USR_BIN, BB_SUID_DROP, yes))
 IF_GUNZIP(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat))
 IF_ZCIP(APPLET(zcip, BB_DIR_SBIN, BB_SUID_DROP))
-#if !defined(PROTOTYPES) && !defined(NAME_MAIN_CNAME) && !defined(MAKE_USAGE)
+#if !defined(PROTOTYPES) && !defined(NAME_MAIN_CNAME) && !defined(MAKE_USAGE) \
+        && !defined(MAKE_LINKS) && !defined(MAKE_SUID)
 };
 #endif
diff --git a/include/bb_e2fs_defs.h b/include/bb_e2fs_defs.h
index b400f8c11..3f5e3c45b 100644
--- a/include/bb_e2fs_defs.h
+++ b/include/bb_e2fs_defs.h
@@ -442,7 +442,7 @@ struct ext2_super_block {
        uint32_t        s_reserved[162];        /* Padding to the end of the block */
 };
 struct BUG_ext2_super_block {
-        char bug[sizeof(struct ext2_super_block) == 1024 ? 1 : -1];
+        char bug[sizeof(struct ext2_super_block) == 1024 ? 1 : -1];
 };
 /*
diff --git a/include/libbb.h b/include/libbb.h
index f5b7d8dc7..9adb037ca 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -496,9 +496,9 @@ int xmkstemp(char *template) FAST_FUNC;
 off_t fdlength(int fd) FAST_FUNC;
 uoff_t FAST_FUNC get_volume_size_in_bytes(int fd,
-                const char *override,
+                const char *override,
-                unsigned override_units,
+                unsigned override_units,
-                int extend);
+                int extend);
 void xpipe(int filedes[2]) FAST_FUNC;
 /* In this form code with pipes is much more readable */
@@ -691,6 +691,13 @@ const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str);
 * else it is printed as-is (except for ch = 0x9b) */
 enum { PRINTABLE_META = 0x100 };
 void fputc_printable(int ch, FILE *file) FAST_FUNC;
+/* Return a string that is the printable representation of character ch.
+ * Buffer must hold at least four characters. */
+enum {
+        VISIBLE_ENDLINE   = 1 << 0,
+        VISIBLE_SHOW_TABS = 1 << 1,
+};
+void visible(unsigned ch, char *buf, int flags) FAST_FUNC;
 /* dmalloc will redefine these to it's own implementation. It is safe
 * to have the prototypes here unconditionally.  */
@@ -848,6 +855,9 @@ struct suffix_mult {
        char suffix[4];
        unsigned mult;
 };
+extern const struct suffix_mult bkm_suffixes[];
+#define km_suffixes (bkm_suffixes + 1)
 #include "xatonum.h"
 /* Specialized: */
@@ -1125,9 +1135,6 @@ void bb_displayroutes(int noresolve, int netstatfmt) FAST_FUNC;
 /* Networking */
-int create_icmp_socket(void) FAST_FUNC;
-int create_icmp6_socket(void) FAST_FUNC;
-/* interface.c */
 /* This structure defines protocol families and their handlers. */
 struct aftype {
        const char *name;
@@ -1156,6 +1163,7 @@ struct hwtype {
 };
 extern smallint interface_opt_a;
 int display_interfaces(char *ifname) FAST_FUNC;
+int in_ether(const char *bufp, struct sockaddr *sap) FAST_FUNC;
 #if ENABLE_FEATURE_HWIB
 int in_ib(const char *bufp, struct sockaddr *sap) FAST_FUNC;
 #else
@@ -1452,7 +1460,7 @@ void read_key_ungets(char *buffer, const char *str, unsigned len) FAST_FUNC;
 /* It's NOT just ENABLEd or disabled. It's a number: */
 # if defined CONFIG_FEATURE_EDITING_HISTORY && CONFIG_FEATURE_EDITING_HISTORY > 0
 #  define MAX_HISTORY (CONFIG_FEATURE_EDITING_HISTORY + 0)
-unsigned size_from_HISTFILESIZE(const char *hp);
+unsigned size_from_HISTFILESIZE(const char *hp) FAST_FUNC;
 # else
 #  define MAX_HISTORY 0
 # endif
@@ -1494,6 +1502,7 @@ line_input_t *new_line_input_t(int flags) FAST_FUNC;
 * >0 length of input string, including terminating '\n'
 */
 int read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize, int timeout) FAST_FUNC;
+void show_history(const line_input_t *st) FAST_FUNC;
 # if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
 void save_history(line_input_t *st);
 # endif
@@ -1825,7 +1834,7 @@ extern const char bb_default_login_shell[] ALIGN1;
 # define VC_4 "/dev/vc/4"
 # define VC_5 "/dev/vc/5"
 # define VC_FORMAT "/dev/vc/%d"
-# define LOOP_FORMAT "/dev/loop/%d"
+# define LOOP_FORMAT "/dev/loop/%u"
 # define LOOP_NAMESIZE (sizeof("/dev/loop/") + sizeof(int)*3 + 1)
 # define LOOP_NAME "/dev/loop/"
 # define FB_0 "/dev/fb/0"
@@ -1838,7 +1847,7 @@ extern const char bb_default_login_shell[] ALIGN1;
 # define VC_4 "/dev/tty4"
 # define VC_5 "/dev/tty5"
 # define VC_FORMAT "/dev/tty%d"
-# define LOOP_FORMAT "/dev/loop%d"
+# define LOOP_FORMAT "/dev/loop%u"
 # define LOOP_NAMESIZE (sizeof("/dev/loop") + sizeof(int)*3 + 1)
 # define LOOP_NAME "/dev/loop"
 # define FB_0 "/dev/fb0"
diff --git a/include/liblzo_interface.h b/include/liblzo_interface.h
index 9a84c0b6b..b7f1b639b 100644
--- a/include/liblzo_interface.h
+++ b/include/liblzo_interface.h
@@ -30,7 +30,7 @@
 /*
 static void die_at(int line)
 {
-        bb_error_msg_and_die("internal error at %d", line);
+        bb_error_msg_and_die("internal error at %d", line);
 }
 #define assert(v) if (!(v)) die_at(__LINE__)
 */
diff --git a/include/platform.h b/include/platform.h
index 432cb9cae..f18d5b74e 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -225,6 +225,7 @@ typedef int      bb__aliased_int      FIX_ALIASING;
 typedef long     bb__aliased_long     FIX_ALIASING;
 typedef uint16_t bb__aliased_uint16_t FIX_ALIASING;
 typedef uint32_t bb__aliased_uint32_t FIX_ALIASING;
+typedef uint64_t bb__aliased_uint64_t FIX_ALIASING;
 /* NB: unaligned parameter should be a pointer, aligned one -
 * a lvalue. This makes it more likely to not swap them by mistake
author	Ron Yorston <rmy@pobox.com>	2013-08-27 16:10:53 +0100
committer	Ron Yorston <rmy@pobox.com>	2013-08-27 16:10:53 +0100
commit	3fd34651ea72ea1c335d3170f234cb0517fd897f (patch)
tree	36e8fc40cffd464ffda4759020777dd3ca23ca31 /include
parent	e3ac39098326de084a805d0dd31db9666b734f20 (diff)
parent	d6ae4fb446daedfe3073d67be655942e9fa7eb18 (diff)
download	busybox-w32-3fd34651ea72ea1c335d3170f234cb0517fd897f.tar.gz busybox-w32-3fd34651ea72ea1c335d3170f234cb0517fd897f.tar.bz2 busybox-w32-3fd34651ea72ea1c335d3170f234cb0517fd897f.zip