Merge branch 'origin/master' (early part)

3 files changed, 25 insertions, 30 deletions

diff --git a/libbb/Config.in b/libbb/Config.src
index 55367b21b..a0aeb3683 100644
--- a/libbb/Config.in
+++ b/libbb/Config.src
@@ -28,7 +28,7 @@ config MD5_SIZE_VS_SPEED
 
 config FEATURE_FAST_TOP
         bool "Faster /proc scanning code (+100 bytes)"
-        default n
+        default y
         help
           This option makes top (and ps) ~20% faster (or 20% less CPU hungry),
           but code size is slightly bigger.
@@ -43,7 +43,7 @@ config FEATURE_ETC_NETWORKS
 
 config FEATURE_EDITING
         bool "Command line editing"
-        default n
+        default y
         help
           Enable line editing (mainly for shell command line).
 
@@ -68,21 +68,21 @@ config FEATURE_EDITING_VI
 config FEATURE_EDITING_HISTORY
         int "History size"
         range 0 99999
-        default 15
+        default 255
         depends on FEATURE_EDITING
         help
           Specify command history size.
 
 config FEATURE_EDITING_SAVEHISTORY
         bool "History saving"
-        default n
+        default y
         depends on ASH && FEATURE_EDITING
         help
           Enable history saving in ash shell.
 
 config FEATURE_TAB_COMPLETION
         bool "Tab completion"
-        default n
+        default y
         depends on FEATURE_EDITING
         help
           Enable tab completion.
@@ -150,7 +150,7 @@ config FEATURE_COPYBUF_KB
 
 config MONOTONIC_SYSCALL
         bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
-        default y
+        default n
         help
           Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
           time intervals (time, ping, traceroute etc need this).
diff --git a/libbb/Kbuild b/libbb/Kbuild.src
index a8a1da1f9..a8a1da1f9 100644
--- a/libbb/Kbuild
+++ b/libbb/Kbuild.src
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index f6dc1f171..cb18a688e 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -43,35 +43,30 @@
 #include "applets.h"
 #undef PROTOTYPES
 
-#if ENABLE_SHOW_USAGE && !ENABLE_FEATURE_COMPRESS_USAGE
-/* Define usage_messages[] */
-static const char usage_messages[] ALIGN1 = ""
-# define MAKE_USAGE
-# include "usage.h"
-# include "applets.h"
-;
-# undef MAKE_USAGE
-#else
-# define usage_messages 0
-#endif /* SHOW_USAGE */
-
 
 /* Include generated applet names, pointers to <applet>_main, etc */
 #include "applet_tables.h"
 /* ...and if applet_tables generator says we have only one applet... */
 #ifdef SINGLE_APPLET_MAIN
-#undef ENABLE_FEATURE_INDIVIDUAL
-#define ENABLE_FEATURE_INDIVIDUAL 1
-#undef IF_FEATURE_INDIVIDUAL
-#define IF_FEATURE_INDIVIDUAL(...) __VA_ARGS__
+# undef ENABLE_FEATURE_INDIVIDUAL
+# define ENABLE_FEATURE_INDIVIDUAL 1
+# undef IF_FEATURE_INDIVIDUAL
+# define IF_FEATURE_INDIVIDUAL(...) __VA_ARGS__
 #endif
 
 
-#if ENABLE_FEATURE_COMPRESS_USAGE
-
 #include "usage_compressed.h"
-#include "unarchive.h"
 
+#if ENABLE_SHOW_USAGE && !ENABLE_FEATURE_COMPRESS_USAGE
+static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
+#else
+# define usage_messages 0
+#endif /* SHOW_USAGE */
+
+#if ENABLE_FEATURE_COMPRESS_USAGE
+
+static const char packed_usage[] = { PACKED_USAGE };
+# include "unarchive.h"
 static const char *unpack_usage_messages(void)
 {
         char *outbuf = NULL;
@@ -86,19 +81,19 @@ static const char *unpack_usage_messages(void)
          * end up here with i != 0 on read data errors! Not trivial */
         if (!i) {
                 /* Cannot use xmalloc: will leak bd in NOFORK case! */
-                outbuf = malloc_or_warn(SIZEOF_usage_messages);
+                outbuf = malloc_or_warn(sizeof(UNPACKED_USAGE));
                 if (outbuf)
-                        read_bunzip(bd, outbuf, SIZEOF_usage_messages);
+                        read_bunzip(bd, outbuf, sizeof(UNPACKED_USAGE));
         }
         dealloc_bunzip(bd);
         return outbuf;
 }
-#define dealloc_usage_messages(s) free(s)
+# define dealloc_usage_messages(s) free(s)
 
 #else
 
-#define unpack_usage_messages() usage_messages
-#define dealloc_usage_messages(s) ((void)(s))
+# define unpack_usage_messages() usage_messages
+# define dealloc_usage_messages(s) ((void)(s))
 
 #endif /* FEATURE_COMPRESS_USAGE */