Convert a chunk of usage.h to USE_ and SKIP_ (more to do there), and fix a

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

diff --git a/coreutils/yes.c b/coreutils/yes.c
index f41bbb6ef4375a878afe463ce4cd31c0ac15f2d8..cafc16bc9897f097b2ef1492e76d670c81336bec 100644 (file)
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -1,8 +1,8 @@
 /* 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
@@ -20,30 +20,37 @@
  *
  */
 
-#include "internal.h"
+/* 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"
 
-extern int yes_main(int argc, char **argv)
+int yes_main(int argc, char **argv)
 {
-       int i;
-
-       if (argc >= 2 && *argv[1] == '-')
-               usage(yes_usage);
+       static const char fmt_str[] = " %s";
+       const char *fmt;
+       char **first_arg;
 
-       if (argc == 1) {
-               while (1)
-                       if (puts("y") == EOF) {
-                               perror("yes");
-                               exit(FALSE);
-                       }
+       *argv = "y";
+       if (argc != 1) {
+               ++argv;
        }
 
-       while (1)
-               for (i = 1; i < argc; i++)
-                       if (fputs(argv[i], stdout) == EOF
-                               || putchar(i == argc - 1 ? '\n' : ' ') == EOF) {
-                               perror("yes");
-                               exit(FALSE);
-                       }
-       exit(TRUE);
+       first_arg = argv;
+       do {
+               fmt = fmt_str + 1;
+               do {
+                       bb_printf(fmt, *argv);
+                       fmt = fmt_str;
+               } while (*++argv);
+               argv = first_arg;
+       } while (putchar('\n') != EOF);
+
+       bb_perror_nomsg_and_die();
 }