Merge branch 'busybox' into mergeHEADmergemaster

10 files changed, 46 insertions, 27 deletions

diff --git a/Config.in b/Config.in
index 9c16e1583..d5a69f416 100644
--- a/Config.in
+++ b/Config.in
@@ -218,6 +218,13 @@ config FEATURE_INSTALLER
         busybox at runtime to create hard links or symlinks for all the
         applets that are compiled into busybox.
 
+config FEATURE_VERSION
+        bool "Support --version"
+        default y
+        depends on BUSYBOX
+        help
+        Enable 'busybox --version' support.
+
 config INSTALL_NO_USR
         bool "Don't use /usr"
         default n
diff --git a/coreutils/dd.c b/coreutils/dd.c
index e6b88acf5..f439326fd 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -290,12 +290,6 @@ static bool write_and_stats(const void *buf, size_t len, size_t obs,
         return 1;
 }
 
-#if ENABLE_LFS
-# define XATOU_SFX xatoull_sfx
-#else
-# define XATOU_SFX xatoul_sfx
-#endif
-
 #if ENABLE_FEATURE_DD_IBS_OBS
 static int parse_comma_flags(char *val, const char *words, const char *error_in)
 {
@@ -488,15 +482,15 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 /* These can be large: */
                 if (what == OP_count) {
                         G.flags |= FLAG_COUNT;
-                        count = XATOU_SFX(val, cwbkMG_suffixes);
+                        count = XATOOFF_SFX(val, cwbkMG_suffixes);
                         /*continue;*/
                 }
                 if (what == OP_seek) {
-                        seek = XATOU_SFX(val, cwbkMG_suffixes);
+                        seek = XATOOFF_SFX(val, cwbkMG_suffixes);
                         /*continue;*/
                 }
                 if (what == OP_skip) {
-                        skip = XATOU_SFX(val, cwbkMG_suffixes);
+                        skip = XATOOFF_SFX(val, cwbkMG_suffixes);
                         /*continue;*/
                 }
                 if (what == OP_if) {
diff --git a/coreutils/ls.c b/coreutils/ls.c
index b2a6d4d90..b8d276e53 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -239,8 +239,7 @@ SPLIT_SUBDIR    = 2,
         IF_FEATURE_LS_WIDTH("T:w:")      /* 2, 28 */ \
         IF_LONG_OPTS("\xff")             /* 1, 29 */ \
         IF_LONG_OPTS("\xfe")             /* 1, 30 */ \
-IF_PLATFORM_MINGW32(IF_LONG_OPTS("\xfd:"))    /* 1, 31 */ \
-IF_NOT_PLATFORM_MINGW32(IF_LONG_OPTS("\xfd")) \
+        IF_LONG_OPTS("\xfd::")           /* 1, 31 */ \
         "qk"                             /* 2, 33 */
 
 #if ENABLE_LONG_OPTS
diff --git a/include/libbb.h b/include/libbb.h
index 03ca9f057..09ebad1f6 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -342,6 +342,7 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 /* "long" is long enough on this system */
 typedef unsigned long uoff_t;
 #  define XATOOFF(a) xatoul_range((a), 0, LONG_MAX)
+#  define XATOOFF_SFX(a, s) xatoul_range_sfx((a), 0, LONG_MAX, s)
 /* usage: sz = BB_STRTOOFF(s, NULL, 10); if (errno || sz < 0) die(); */
 #  define BB_STRTOOFF bb_strtoul
 #  define STRTOOFF strtoul
@@ -351,6 +352,7 @@ typedef unsigned long uoff_t;
 /* "long" is too short, need "long long" */
 typedef unsigned long long uoff_t;
 #  define XATOOFF(a) xatoull_range((a), 0, LLONG_MAX)
+#  define XATOOFF_SFX(a, s) xatoull_range_sfx((a), 0, LLONG_MAX, s)
 #  define BB_STRTOOFF bb_strtoull
 #  define STRTOOFF strtoull
 #  define OFF_FMT LL_FMT
@@ -366,12 +368,14 @@ typedef unsigned long long uoff_t;
 # if UINT_MAX == ULONG_MAX
 typedef unsigned long uoff_t;
 #  define XATOOFF(a) xatoi_positive(a)
+#  define XATOOFF_SFX(a, s) xatoul_range_sfx((a), 0, INT_MAX, s)
 #  define BB_STRTOOFF bb_strtou
 #  define STRTOOFF strtol
 #  define OFF_FMT "l"
 # else
 typedef unsigned long uoff_t;
 #  define XATOOFF(a) xatoul_range((a), 0, LONG_MAX)
+#  define XATOOFF_SFX(a, s) xatoul_range_sfx((a), 0, LONG_MAX, s)
 #  define BB_STRTOOFF bb_strtoul
 #  define STRTOOFF strtol
 #  define OFF_FMT "l"
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index b1064d10a..496d320cd 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -1122,14 +1122,14 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
 #endif
 
         if (strcmp(argv[1], "--help") == 0) {
-                /* "busybox --help [<applet>]" */
+                /* "busybox --help [APPLET]" */
                 if (!argv[2]
 #  if ENABLE_FEATURE_SH_STANDALONE && ENABLE_FEATURE_TAB_COMPLETION
                  || strcmp(argv[2], "busybox") == 0 /* prevent getting "No help available" */
 #  endif
                 )
                         goto help;
-                /* convert to "<applet> --help" */
+                /* convert to "APPLET --help" */
                 applet_name = argv[0] = argv[2];
                 argv[2] = NULL;
                 if (find_applet_by_name_internal(applet_name) >= 0) {
@@ -1137,8 +1137,16 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
                         xfunc_error_retval = 0;
                         bb_show_usage();
                 } /* else: unknown applet, fall through (causes "applet not found" later) */
-        } else {
-                /* "busybox <applet> arg1 arg2 ..." */
+        }
+#  if ENABLE_FEATURE_VERSION
+        else if (!argv[2] && strcmp(argv[1], "--version") == 0) {
+                full_write1_str(bb_banner); /* reuse const string */
+                full_write1_str("\n");
+                return 0;
+        }
+#  endif
+        else {
+                /* "busybox APPLET arg1 arg2 ..." */
                 argv++;
                 /* We support "busybox /a/path/to/applet args..." too. Allows for
                  * "#!/bin/busybox"-style wrappers
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index e0c0a17dc..7dc39ca80 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -2273,7 +2273,7 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                         if (c == 'w')
                                                 break;
                                         cp = strrchr(pbuf, '/');
-                                        if (cp IF_PLATFORM_MINGW32(&& cp[1]))
+                                        if (cp && cp[1])
                                                 pbuf = (char*)cp + 1;
                                         break;
 // bb_process_escape_sequence does this now:
diff --git a/networking/ntpd.c b/networking/ntpd.c
index dd0a9c91f..efe9f5326 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -1645,7 +1645,7 @@ update_local_clock(peer_t *p)
         /* 65536 is one ppm */
         tmx.freq = G.discipline_freq_drift * 65536e6;
 #endif
-        tmx.modes = ADJ_OFFSET | ADJ_STATUS | ADJ_TIMECONST;// | ADJ_MAXERROR | ADJ_ESTERROR;
+        tmx.modes = ADJ_OFFSET | ADJ_STATUS | ADJ_TIMECONST | ADJ_MAXERROR | ADJ_ESTERROR;
 
         tmx.offset = (long)(offset * 1000000); /* usec */
         if (SLEW_THRESHOLD < STEP_THRESHOLD) {
@@ -1738,16 +1738,23 @@ update_local_clock(peer_t *p)
         if (tmx.constant < 0)
                 tmx.constant = 0;
 
-        //tmx.esterror = (uint32_t)(clock_jitter * 1e6);
-        //tmx.maxerror = (uint32_t)((sys_rootdelay / 2 + sys_rootdisp) * 1e6);
+        /* For ADJ_MAXERROR and ADJ_ESTERROR: */
+        /* kernel increments this by 500us each second, sets STA_UNSYNC if exceeds 16 seconds: */
+        tmx.maxerror = (uint32_t)((G.rootdelay / 2 + G.rootdisp) * 1000000.0);
+        /* (without ADJ_MAXERROR, time adjustment still works, but kernel uses
+         * conservative maxerror value and quickly sets STA_UNSYNC)
+         */
+        /* esterror is not used by kernel, presumably may be used by other programs reading adjtimex result: */
+        tmx.esterror = (uint32_t)(G.discipline_jitter * 1000000.0);
+
         rc = adjtimex(&tmx);
         if (rc < 0)
                 bb_simple_perror_msg_and_die("adjtimex");
         /* NB: here kernel returns constant == G.poll_exp, not == G.poll_exp - 4.
          * Not sure why. Perhaps it is normal.
          */
-        VERB4 bb_error_msg("adjtimex:%d freq:%ld offset:%+ld status:0x%x",
-                                rc, (long)tmx.freq, (long)tmx.offset, tmx.status);
+        VERB4 bb_error_msg("adjtimex:%d freq:%ld offset:%+ld esterror:%ld maxerror:%ld status:0x%x",
+                                rc, (long)tmx.freq, (long)tmx.offset, (long)tmx.esterror, (long)tmx.maxerror, tmx.status);
         G.kernel_freq_drift = tmx.freq / 65536;
         VERB2 bb_error_msg("update from:%s offset:%+f delay:%f jitter:%f clock drift:%+.3fppm tc:%d",
                         p->p_dotted,
diff --git a/procps/pgrep.c b/procps/pgrep.c
index 9773a72c4..adbdd08b7 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -270,16 +270,16 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
                 if (!match) {
  again:
                         match = (regexec(&re_buffer, cmd, 1, re_match, 0) == 0);
+                        if (match && OPT_ANCHOR) {
+                                /* -x requires full string match */
+                                match = (re_match[0].rm_so == 0 && cmd[re_match[0].rm_eo] == '\0');
+                        }
                         if (!match && cmd != proc->comm) {
                                 /* if argv[] did not match, try comm */
                                 cmdlen = -1;
                                 cmd = proc->comm;
                                 goto again;
                         }
-                        if (match && OPT_ANCHOR) {
-                                /* -x requires full string match */
-                                match = (re_match[0].rm_so == 0 && cmd[re_match[0].rm_eo] == '\0');
-                        }
                 }
 
                 /* NB: OPT_INVERT is always 0 or 1 */
diff --git a/util-linux/eject.c b/util-linux/eject.c
index b9813262b..4fa6dbd94 100644
--- a/util-linux/eject.c
+++ b/util-linux/eject.c
@@ -31,7 +31,7 @@
 //kbuild:lib-$(CONFIG_EJECT) += eject.o
 
 //usage:#define eject_trivial_usage
-//usage:       "[-t] [-T] [DEVICE]"
+//usage:       IF_FEATURE_EJECT_SCSI("[-s] ") "[-t] [-T] [DEVICE]"
 //usage:#define eject_full_usage "\n\n"
 //usage:       "Eject DEVICE or default /dev/cdrom\n"
 //usage:        IF_FEATURE_EJECT_SCSI(
diff --git a/util-linux/last.c b/util-linux/last.c
index 7530d013d..aafd01bb9 100644
--- a/util-linux/last.c
+++ b/util-linux/last.c
@@ -157,7 +157,7 @@ int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                         ut.ut_user, ut.ut_line, ut.ut_host, ctime(&t_tmp) + 4);
  next:
                 pos -= sizeof(ut);
-                if (pos <= 0)
+                if (pos < 0)
                         break; /* done. */
                 xlseek(file, pos, SEEK_SET);
         }