Bump to version 1.22.1

[platform/upstream/busybox.git] / coreutils / yes.c

diff --git a/coreutils/yes.c b/coreutils/yes.c
index cafc16b..5d799f0 100644 (file)
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
@@ -27,29 +14,32 @@
  * Size reductions and removed redundant applet name prefix from error messages.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include "busybox.h"
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
+
+//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)
+int yes_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int yes_main(int argc UNUSED_PARAM, char **argv)
 {
-       static const char fmt_str[] = " %s";
-       const char *fmt;
-       char **first_arg;
+       char **pp;
 
-       *argv = "y";
-       if (argc != 1) {
+       argv[0] = (char*)"y";
+       if (argv[1])
                ++argv;
-       }
 
-       first_arg = argv;
        do {
-               fmt = fmt_str + 1;
-               do {
-                       bb_printf(fmt, *argv);
-                       fmt = fmt_str;
-               } while (*++argv);
-               argv = first_arg;
+               pp = argv;
+               while (1) {
+                       fputs(*pp, stdout);
+                       if (!*++pp)
+                               break;
+                       putchar(' ');
+               }
        } while (putchar('\n') != EOF);
 
        bb_perror_nomsg_and_die();