4 files changed, 74 insertions, 48 deletions

diff --git a/include/applets.src.h b/include/applets.src.h
index 87d9cbb7b..252a060fb 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -176,7 +176,6 @@ IF_HD(APPLET_NOEXEC(hd, hexdump, BB_DIR_USR_BIN, BB_SUID_DROP, hd))
 IF_HDPARM(APPLET(hdparm, BB_DIR_SBIN, BB_SUID_DROP))
 IF_HEAD(APPLET_NOEXEC(head, head, BB_DIR_USR_BIN, BB_SUID_DROP, head))
 IF_HEXDUMP(APPLET_NOEXEC(hexdump, hexdump, BB_DIR_USR_BIN, BB_SUID_DROP, hexdump))
-IF_HOSTID(APPLET_NOFORK(hostid, hostid, BB_DIR_USR_BIN, BB_SUID_DROP, hostid))
 IF_HOSTNAME(APPLET(hostname, BB_DIR_BIN, BB_SUID_DROP))
 IF_HTTPD(APPLET(httpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 IF_HWCLOCK(APPLET(hwclock, BB_DIR_SBIN, BB_SUID_DROP))
@@ -240,7 +239,6 @@ IF_MAKEMIME(APPLET(makemime, BB_DIR_BIN, BB_SUID_DROP))
 IF_MAN(APPLET(man, BB_DIR_SBIN, BB_SUID_DROP))
 IF_MATCHPATHCON(APPLET(matchpathcon, BB_DIR_USR_SBIN, BB_SUID_DROP))
 IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, md5sum))
-IF_MDEV(APPLET(mdev, BB_DIR_SBIN, BB_SUID_DROP))
 IF_MICROCOM(APPLET(microcom, BB_DIR_USR_BIN, BB_SUID_DROP))
 IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir))
 IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat))
diff --git a/include/archive.h b/include/bb_archive.h
index 9e176d335..9e176d335 100644
--- a/include/archive.h
+++ b/include/bb_archive.h
diff --git a/include/libbb.h b/include/libbb.h
index 6e63e65f5..a6ecac932 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -32,6 +32,11 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <string.h>
+/* There are two incompatible basename's, let not use them! */
+/* See the dirname/basename man page for details */
+#include <libgen.h> /* dirname,basename */
+#undef basename
+#define basename dont_use_basename
 #include <sys/poll.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
@@ -142,12 +147,6 @@ int vdprintf(int d, const char *format, va_list ap);
 #endif
 /* klogctl is in libc's klog.h, but we cheat and not #include that */
 int klogctl(int type, char *b, int len);
-/* This is declared here rather than #including <libgen.h> in order to avoid
- * confusing the two versions of basename.  See the dirname/basename man page
- * for details. */
-#if !defined __FreeBSD__
-char *dirname(char *path);
-#endif
 #ifndef PATH_MAX
 # define PATH_MAX 256
 #endif
@@ -268,13 +267,6 @@ typedef unsigned long uoff_t;
 #undef SKIP
 #define SKIP    ((int) 2)
 
-/* for mtab.c */
-#define MTAB_GETMOUNTPT '1'
-#define MTAB_GETDEVICE  '2'
-
-#define BUF_SIZE        8192
-#define EXPAND_ALLOC    1024
-
 /* Macros for min/max.  */
 #ifndef MIN
 #define MIN(a,b) (((a)<(b))?(a):(b))
@@ -653,6 +645,7 @@ ssize_t recv_from_to(int fd, void *buf, size_t len, int flags,
                 struct sockaddr *to,
                 socklen_t sa_size) FAST_FUNC;
 
+uint16_t inet_cksum(uint16_t *addr, int len) FAST_FUNC;
 
 char *xstrdup(const char *s) FAST_FUNC RETURNS_MALLOC;
 char *xstrndup(const char *s, int n) FAST_FUNC RETURNS_MALLOC;
@@ -697,10 +690,13 @@ void *malloc_or_warn(size_t size) FAST_FUNC RETURNS_MALLOC;
 void *xmalloc(size_t size) FAST_FUNC RETURNS_MALLOC;
 void *xzalloc(size_t size) FAST_FUNC RETURNS_MALLOC;
 void *xrealloc(void *old, size_t size) FAST_FUNC;
-/* After xrealloc_vector(v, 4, idx) it's ok to use
+/* After v = xrealloc_vector(v, SHIFT, idx) it's ok to use
  * at least v[idx] and v[idx+1], for all idx values.
- * shift specifies how many new elements are added (1: 2, 2: 4... 8: 256...)
- * when all elements are used up. New elements are zeroed out. */
+ * SHIFT specifies how many new elements are added (1:2, 2:4, ..., 8:256...)
+ * when all elements are used up. New elements are zeroed out.
+ * xrealloc_vector(v, SHIFT, idx) *MUST* be called with consecutive IDXs -
+ * skipping an index is a bad bug - it may miss a realloc!
+ */
 #define xrealloc_vector(vector, shift, idx) \
         xrealloc_vector_helper((vector), (sizeof((vector)[0]) << 8) + (shift), (idx))
 void* xrealloc_vector_helper(void *vector, unsigned sizeof_and_shift, int idx) FAST_FUNC;
@@ -827,9 +823,9 @@ void smart_ulltoa5(unsigned long long ul, char buf[5], const char *scale) FAST_F
 const char *make_human_readable_str(unsigned long long size,
                 unsigned long block_size, unsigned long display_unit) FAST_FUNC;
 /* Put a string of hex bytes ("1b2e66fe"...), return advanced pointer */
-char *bin2hex(char *buf, const char *cp, int count) FAST_FUNC;
+char *bin2hex(char *dst, const char *src, int count) FAST_FUNC;
 /* Reverse */
-char* hex2bin(char *dst, const char *str, int count) FAST_FUNC;
+char* hex2bin(char *dst, const char *src, int count) FAST_FUNC;
 
 /* Generate a UUID */
 void generate_uuid(uint8_t *buf) FAST_FUNC;
@@ -1180,7 +1176,7 @@ extern int del_loop(const char *device) FAST_FUNC;
 /* If *devname is not NULL, use that name, otherwise try to find free one,
  * malloc and return it in *devname.
  * return value: 1: read-only loopdev was setup, 0: rw, < 0: error */
-extern int set_loop(char **devname, const char *file, unsigned long long offset) FAST_FUNC;
+extern int set_loop(char **devname, const char *file, unsigned long long offset, int ro) FAST_FUNC;
 
 /* Like bb_ask below, but asks on stdin with no timeout.  */
 char *bb_ask_stdin(const char * prompt) FAST_FUNC;
@@ -1378,25 +1374,37 @@ enum {
         KEYCODE_DELETE   =  -9,
         KEYCODE_PAGEUP   = -10,
         KEYCODE_PAGEDOWN = -11,
-
-        KEYCODE_CTRL_UP    = KEYCODE_UP    & ~0x40,
-        KEYCODE_CTRL_DOWN  = KEYCODE_DOWN  & ~0x40,
+        // -12 is reserved for Alt/Ctrl/Shift-TAB
+#if 0
+        KEYCODE_FUN1     = -13,
+        KEYCODE_FUN2     = -14,
+        KEYCODE_FUN3     = -15,
+        KEYCODE_FUN4     = -16,
+        KEYCODE_FUN5     = -17,
+        KEYCODE_FUN6     = -18,
+        KEYCODE_FUN7     = -19,
+        KEYCODE_FUN8     = -20,
+        KEYCODE_FUN9     = -21,
+        KEYCODE_FUN10    = -22,
+        KEYCODE_FUN11    = -23,
+        KEYCODE_FUN12    = -24,
+#endif
+        /* Be sure that last defined value is small enough
+         * to not interfere with Alt/Ctrl/Shift bits.
+         * So far we do not exceed -31 (0xfff..fffe1),
+         * which gives us three upper bits in LSB to play with.
+         */
+        //KEYCODE_SHIFT_TAB  = (-12)         & ~0x80,
+        //KEYCODE_SHIFT_...  = KEYCODE_...   & ~0x80,
+        //KEYCODE_CTRL_UP    = KEYCODE_UP    & ~0x40,
+        //KEYCODE_CTRL_DOWN  = KEYCODE_DOWN  & ~0x40,
         KEYCODE_CTRL_RIGHT = KEYCODE_RIGHT & ~0x40,
         KEYCODE_CTRL_LEFT  = KEYCODE_LEFT  & ~0x40,
-#if 0
-        KEYCODE_FUN1     = -12,
-        KEYCODE_FUN2     = -13,
-        KEYCODE_FUN3     = -14,
-        KEYCODE_FUN4     = -15,
-        KEYCODE_FUN5     = -16,
-        KEYCODE_FUN6     = -17,
-        KEYCODE_FUN7     = -18,
-        KEYCODE_FUN8     = -19,
-        KEYCODE_FUN9     = -20,
-        KEYCODE_FUN10    = -21,
-        KEYCODE_FUN11    = -22,
-        KEYCODE_FUN12    = -23,
-#endif
+        //KEYCODE_ALT_UP     = KEYCODE_UP    & ~0x20,
+        //KEYCODE_ALT_DOWN   = KEYCODE_DOWN  & ~0x20,
+        KEYCODE_ALT_RIGHT  = KEYCODE_RIGHT & ~0x20,
+        KEYCODE_ALT_LEFT   = KEYCODE_LEFT  & ~0x20,
+
         KEYCODE_CURSOR_POS = -0x100, /* 0xfff..fff00 */
         /* How long is the longest ESC sequence we know?
          * We want it big enough to be able to contain
@@ -1437,6 +1445,12 @@ typedef struct line_input_t {
         int cur_history;
         int max_history; /* must never be <= 0 */
 #  if ENABLE_FEATURE_EDITING_SAVEHISTORY
+        /* meaning of this field depends on FEATURE_EDITING_SAVE_ON_EXIT:
+         * if !FEATURE_EDITING_SAVE_ON_EXIT: "how many lines are
+         * in on-disk history"
+         * if FEATURE_EDITING_SAVE_ON_EXIT: "how many in-memory lines are
+         * also in on-disk history (and thus need to be skipped on save)"
+         */
         unsigned cnt_history_in_file;
         const char *hist_file;
 #  endif
@@ -1444,13 +1458,12 @@ typedef struct line_input_t {
 # endif
 } line_input_t;
 enum {
-        DO_HISTORY = 1 * (MAX_HISTORY > 0),
-        SAVE_HISTORY = 2 * (MAX_HISTORY > 0) * ENABLE_FEATURE_EDITING_SAVEHISTORY,
-        TAB_COMPLETION = 4 * ENABLE_FEATURE_TAB_COMPLETION,
-        USERNAME_COMPLETION = 8 * ENABLE_FEATURE_USERNAME_COMPLETION,
-        VI_MODE = 0x10 * ENABLE_FEATURE_EDITING_VI,
-        WITH_PATH_LOOKUP = 0x20,
-        FOR_SHELL = DO_HISTORY | SAVE_HISTORY | TAB_COMPLETION | USERNAME_COMPLETION,
+        DO_HISTORY       = 1 * (MAX_HISTORY > 0),
+        TAB_COMPLETION   = 2 * ENABLE_FEATURE_TAB_COMPLETION,
+        USERNAME_COMPLETION = 4 * ENABLE_FEATURE_USERNAME_COMPLETION,
+        VI_MODE          = 8 * ENABLE_FEATURE_EDITING_VI,
+        WITH_PATH_LOOKUP = 0x10,
+        FOR_SHELL        = DO_HISTORY | TAB_COMPLETION | USERNAME_COMPLETION,
 };
 line_input_t *new_line_input_t(int flags) FAST_FUNC;
 /* So far static: void free_line_input_t(line_input_t *n) FAST_FUNC; */
@@ -1462,6 +1475,9 @@ 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;
+# if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
+void save_history(line_input_t *st);
+# endif
 #else
 #define MAX_HISTORY 0
 int read_line_input(const char* prompt, char* command, int maxsize) FAST_FUNC;
@@ -1589,6 +1605,15 @@ int starts_with_cpu(const char *str) FAST_FUNC;
 unsigned get_cpu_count(void) FAST_FUNC;
 
 
+/* Use strict=1 if you process input from untrusted source:
+ * it will return NULL on invalid %xx (bad hex chars)
+ * and str + 1 if decoded char is / or NUL.
+ * In non-strict mode, it always succeeds (returns str),
+ * and also it additionally decoded '+' to space.
+ */
+char *percent_decode_in_place(char *str, int strict) FAST_FUNC;
+
+
 extern const char bb_uuenc_tbl_base64[];
 extern const char bb_uuenc_tbl_std[];
 void bb_uuencode(char *store, const void *s, int length, const char *tbl) FAST_FUNC;
@@ -1597,7 +1622,8 @@ enum {
         /* Sign-extends to a value which never matches fgetc result: */
         BASE64_FLAG_NO_STOP_CHAR = 0x80,
 };
-void FAST_FUNC read_base64(FILE *src_stream, FILE *dst_stream, int flags);
+const char *decode_base64(char **pp_dst, const char *src) FAST_FUNC;
+void read_base64(FILE *src_stream, FILE *dst_stream, int flags) FAST_FUNC;
 
 typedef struct md5_ctx_t {
         uint8_t wbuffer[64]; /* always correctly aligned for uint64_t */
diff --git a/include/platform.h b/include/platform.h
index e22c42007..96c603c1f 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -383,7 +383,7 @@ typedef unsigned smalluint;
 #if defined(__UCLIBC_MAJOR__)
 # if __UCLIBC_MAJOR__ == 0 \
   && (   __UCLIBC_MINOR__ < 9 \
-     || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 31) \
+     || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 32) \
      )
 #  undef HAVE_STRVERSCMP
 # endif
@@ -451,6 +451,8 @@ typedef unsigned smalluint;
 # undef HAVE_STRVERSCMP
 # undef HAVE_XTABS
 # undef HAVE_DPRINTF
+# undef HAVE_UNLOCKED_STDIO
+# undef HAVE_UNLOCKED_LINE_OPS
 #endif
 
 #if defined(__FreeBSD__)
@@ -465,7 +467,7 @@ typedef unsigned smalluint;
 # undef HAVE_STPCPY
 #endif
 
-#if defined(ANDROID)
+#if defined(ANDROID) || defined(__ANDROID__)
 # undef HAVE_DPRINTF
 # undef HAVE_GETLINE
 # undef HAVE_STPCPY