lineedit: do not hang on error, but return error indicator.

[oweals/busybox.git] / coreutils / yes.c

diff --git a/coreutils/yes.c b/coreutils/yes.c
index 569764150aff203a7b8580a2aaf1a1dbc2868bc7..5d799f09b4372ade86ffaaeeb8c8dfe2fac51fea 100644 (file)
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
@@ -14,29 +14,32 @@
  * Size reductions and removed redundant applet name prefix from error messages.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
-int yes_main(int argc, char **argv);
-int yes_main(int argc, char **argv)
+//usage:#define yes_trivial_usage
+//usage:       "[STRING]"
+//usage:#define yes_full_usage "\n\n"
+//usage:       "Repeatedly output a line with STRING, or 'y'"
+
+int yes_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int yes_main(int argc UNUSED_PARAM, char **argv)
 {
-       char **first_arg;
+       char **pp;
 
        argv[0] = (char*)"y";
-       if (argc != 1) {
+       if (argv[1])
                ++argv;
-       }
 
-       first_arg = argv;
        do {
+               pp = argv;
                while (1) {
-                       fputs(*argv, stdout);
-                       if (!*++argv)
+                       fputs(*pp, stdout);
+                       if (!*++pp)
                                break;
                        putchar(' ');
                }
-               argv = first_arg;
        } while (putchar('\n') != EOF);
 
        bb_perror_nomsg_and_die();