Merge branch 'busybox' into merge

3 files changed, 5 insertions, 10 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index e75257a74..7da7cad1c 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -442,7 +442,7 @@ static void parse_config_file(void)
                                                 goto pe_label;
                                         }
                                         *e = ':'; /* get_uidgid needs USER:GROUP syntax */
-                                        if (get_uidgid(&sct->m_ugid, s, /*allow_numeric:*/ 1) == 0) {
+                                        if (get_uidgid(&sct->m_ugid, s) == 0) {
                                                 errmsg = "unknown user/group";
                                                 goto pe_label;
                                         }
diff --git a/libbb/human_readable.c b/libbb/human_readable.c
index 5c7fc076f..b4e0ef181 100644
--- a/libbb/human_readable.c
+++ b/libbb/human_readable.c
@@ -14,16 +14,11 @@
  *      representations (say, powers of 1024) and manipulating coefficients.
  *      The base ten "bytes" output could be handled similarly.
  *
- *   2) This routine always outputs a decimal point and a tenths digit when
- *      display_unit != 0.  Hence, it isn't uncommon for the returned string
+ *   2) This routine outputs a decimal point and a tenths digit when
+ *      display_unit == 0.  Hence, it isn't uncommon for the returned string
  *      to have a length of 5 or 6.
  *
- *      It might be nice to add a flag to indicate no decimal digits in
- *      that case.  This could be either an additional parameter, or a
- *      special value of display_unit.  Such a flag would also be nice for du.
- *
- *      Some code to omit the decimal point and tenths digit is sketched out
- *      and "#if 0"'d below.
+ *      If block_size is also 0, no decimal digits are printed.
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
diff --git a/libbb/messages.c b/libbb/messages.c
index 108cb0285..2aa3f175d 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -29,7 +29,7 @@ const char bb_msg_can_not_create_raw_socket[] ALIGN1 = "can't create raw socket"
 const char bb_msg_perm_denied_are_you_root[] ALIGN1 = "permission denied (are you root?)";
 const char bb_msg_you_must_be_root[] ALIGN1 = "you must be root";
 const char bb_msg_requires_arg[] ALIGN1 = "%s requires an argument";
-const char bb_msg_invalid_arg[] ALIGN1 = "invalid argument '%s' to '%s'";
+const char bb_msg_invalid_arg_to[] ALIGN1 = "invalid argument '%s' to '%s'";
 const char bb_msg_standard_input[] ALIGN1 = "standard input";
 const char bb_msg_standard_output[] ALIGN1 = "standard output";