Bump to version 1.22.1

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

diff --git a/coreutils/yes.c b/coreutils/yes.c
index ad7b98f..5d799f0 100644 (file)
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -1,51 +1,46 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini yes implementation for busybox
+ * yes implementation for busybox
  *
- * Copyright (C) 2000  Edward Betts <edward@debian.org>.
+ * 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. */
+
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
  *
+ * Size reductions and removed redundant applet name prefix from error messages.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include "busybox.h"
+#include "libbb.h"
 
-extern int yes_main(int argc, char **argv)
+/* 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) MAIN_EXTERNALLY_VISIBLE;
+int yes_main(int argc UNUSED_PARAM, char **argv)
 {
-       int i;
-
-       if (argc >= 2 && *argv[1] == '-')
-               show_usage();
-
-       if (argc == 1) {
-               while (1)
-                       if (puts("y") == EOF) {
-                               perror("yes");
-                               return EXIT_FAILURE;
-                       }
-       }
-
-       while (1)
-               for (i = 1; i < argc; i++)
-                       if (fputs(argv[i], stdout) == EOF
-                               || putchar(i == argc - 1 ? '\n' : ' ') == EOF) {
-                               perror("yes");
-                               return EXIT_FAILURE;
-                       }
-
-       return EXIT_SUCCESS;
+       char **pp;
+
+       argv[0] = (char*)"y";
+       if (argv[1])
+               ++argv;
+
+       do {
+               pp = argv;
+               while (1) {
+                       fputs(*pp, stdout);
+                       if (!*++pp)
+                               break;
+                       putchar(' ');
+               }
+       } while (putchar('\n') != EOF);
+
+       bb_perror_nomsg_and_die();
 }