Merge branch 'busybox' into merge

4 files changed, 34 insertions, 11 deletions

diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src
index 8e2c097a3..d9a448781 100644
--- a/coreutils/Kbuild.src
+++ b/coreutils/Kbuild.src
@@ -10,12 +10,16 @@ lib-y:=
 
 INSERT
 
-lib-$(CONFIG_MORE)      += cat.o   # more uses it if stdout isn't a tty
-lib-$(CONFIG_LESS)      += cat.o   # less too
-lib-$(CONFIG_CRONTAB)   += cat.o   # crontab -l
-lib-$(CONFIG_ADDUSER)   += chown.o # used by adduser
-lib-$(CONFIG_ADDGROUP)  += chown.o # used by adduser
-lib-$(CONFIG_ASH)       += echo.o  # used by ash
-lib-$(CONFIG_HUSH)      += echo.o  # used by hush
-lib-$(CONFIG_FTPD)      += ls.o    # used by ftpd
+lib-$(CONFIG_MORE)          += cat.o   # more uses it if stdout isn't a tty
+lib-$(CONFIG_LESS)          += cat.o   # less too
+lib-$(CONFIG_CRONTAB)       += cat.o   # crontab -l
+lib-$(CONFIG_ADDUSER)       += chown.o # used by adduser
+lib-$(CONFIG_ADDGROUP)      += chown.o # used by adduser
+lib-$(CONFIG_ASH)           += echo.o  # used by ash
+lib-$(CONFIG_SH_IS_ASH)     += echo.o  # used by ash
+lib-$(CONFIG_BASH_IS_ASH)   += echo.o  # used by ash
+lib-$(CONFIG_HUSH)          += echo.o  # used by hush
+lib-$(CONFIG_SH_IS_HUSH)    += echo.o  # used by hush
+lib-$(CONFIG_BASH_IS_HUSH)  += echo.o  # used by hush
+lib-$(CONFIG_FTPD)          += ls.o    # used by ftpd
 lib-$(CONFIG_ASH_BUILTIN_PRINTF) += printf.o
diff --git a/coreutils/df.c b/coreutils/df.c
index fdcdae675..79e4c4670 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -129,8 +129,19 @@ int df_main(int argc UNUSED_PARAM, char **argv)
         if (opt & OPT_MEGA)
                 df_disp_hr = 1024*1024;
 
-        if (opt & OPT_BSIZE)
-                df_disp_hr = xatoul_range(chp, 1, ULONG_MAX); /* disallow 0 */
+        if (opt & OPT_BSIZE) {
+                /* GNU coreutils 8.25 accepts "-BMiB" form too */
+                int i;
+                for (i = 0; kmg_i_suffixes[i].suffix[0]; i++) {
+                        if (strcmp(kmg_i_suffixes[i].suffix, chp) == 0) {
+                                df_disp_hr = kmg_i_suffixes[i].mult;
+                                goto got_it;
+                        }
+                }
+                /* Range used to disallow 0 */
+                df_disp_hr = xatoul_range_sfx(chp, 1, ULONG_MAX, kmg_i_suffixes);
+ got_it: ;
+        }
 
         /* From the manpage of df from coreutils-6.10:
          * Disk space is shown in 1K blocks by default, unless the environment
@@ -203,6 +214,11 @@ int df_main(int argc UNUSED_PARAM, char **argv)
                         bb_simple_perror_msg(mount_point);
                         goto set_error;
                 }
+                /* Some uclibc versions were seen to lose f_frsize
+                 * (kernel does return it, but then uclibc does not copy it)
+                 */
+                if (s.f_frsize == 0)
+                        s.f_frsize = s.f_bsize;
 
                 if ((s.f_blocks > 0) || !mount_table || (opt & OPT_ALL)) {
                         if (opt & OPT_INODE) {
diff --git a/coreutils/install.c b/coreutils/install.c
index e68589229..831f9b802 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -211,7 +211,8 @@ int install_main(int argc, char **argv)
                                 char *ddir = xstrdup(dest);
                                 bb_make_directory(dirname(ddir), 0755, mkdir_flags);
                                 /* errors are not checked. copy_file
-                                 * will fail if dir is not created. */
+                                 * will fail if dir is not created.
+                                 */
                                 free(ddir);
                         }
                         if (isdir)
diff --git a/coreutils/test.c b/coreutils/test.c
index df42590e4..67fdfde4f 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -55,6 +55,8 @@
 //kbuild:lib-$(CONFIG_TEST2) += test.o test_ptr_hack.o
 //kbuild:lib-$(CONFIG_ASH_BUILTIN_TEST) += test.o test_ptr_hack.o
 //kbuild:lib-$(CONFIG_HUSH) += test.o test_ptr_hack.o
+//kbuild:lib-$(CONFIG_SH_IS_HUSH) += test.o test_ptr_hack.o
+//kbuild:lib-$(CONFIG_BASH_IS_HUSH) += test.o test_ptr_hack.o
 
 /* "test --help" is special-cased to ignore --help */
 //usage:#define test_trivial_usage NOUSAGE_STR