[git commit] randomconfig fixes 3

Denys Vlasenko vda.linux at googlemail.com
Sun Jun 19 22:36:21 UTC 2016


commit: https://git.busybox.net/busybox/commit/?id=94046d04951e1e67ddfb7919d8f382dbbfc70a12
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 findutils/grep.c        | 1 +
 testsuite/du/du-m-works | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/findutils/grep.c b/findutils/grep.c
index b072cd4..aeb7977 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -686,6 +686,7 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_GREP_CONTEXT
 	int Copt, opts;
 #endif
+	INIT_G();
 
 	/* For grep, exitcode of 1 is "not found". Other errors are 2: */
 	xfunc_error_retval = 2;
diff --git a/testsuite/du/du-m-works b/testsuite/du/du-m-works
index c96c3b3..d9693c7 100644
--- a/testsuite/du/du-m-works
+++ b/testsuite/du/du-m-works
@@ -1,4 +1,4 @@
 # FEATURE: CONFIG_FEATURE_HUMAN_READABLE
 
 dd if=/dev/zero of=file bs=1M count=1 2>/dev/null
-test x"`busybox du -m file`" = x"1	."
+test x"`busybox du -m file`" = x"1	file"


More information about the busybox-cvs mailing list