make a few struct bb_applet members conditional

rename sllep_and_die -> xfunc_die
make fflush_stdout_and_exit NOFORK-safe
fix some buglets found by randomconfig

2 files changed, 4 insertions, 2 deletions

diff --git a/coreutils/cmp.c b/coreutils/cmp.c
index c70f8822d..80fab0b90 100644
--- a/coreutils/cmp.c
+++ b/coreutils/cmp.c
@@ -23,14 +23,14 @@
 
 #include "busybox.h"
 
-static FILE *cmp_xfopen_input(const char * const filename)
+static FILE *cmp_xfopen_input(const char *filename)
 {
         FILE *fp;
 
         fp = fopen_or_warn_stdin(filename);
         if (fp)
                 return fp;
-        sleep_and_die();        /* We already output an error message. */
+        xfunc_die();    /* We already output an error message. */
 }
 
 static const char fmt_eof[] = "cmp: EOF on %s\n";
diff --git a/coreutils/echo.c b/coreutils/echo.c
index 2ee5002ba..2de19c2e3 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -107,7 +107,9 @@ int bb_echo(char **argv)
                 putchar(' ');
         }
 
+#if ENABLE_FEATURE_FANCY_ECHO
  newline_ret:
+#endif
         if (nflag) {
                 putchar('\n');
         }