X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=coreutils%2Fyes.c;h=7d9596d0bf72156b53426ec0013254a6fdd127a1;hb=ceeff7381929930fe8d7e33543e285d5fdcf1c68;hp=96d6257d0c5b4d928cd4bd336df85b10ff89fa9f;hpb=3163821967821518cfa4c4315f775ec5301bb023;p=oweals%2Fbusybox.git

diff --git a/coreutils/yes.c b/coreutils/yes.c
index 96d6257d0..7d9596d0b 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini yes implementation for busybox
  *
@@ -19,23 +20,34 @@
  *
  */
 
-#include "internal.h"
+/* getopt not needed */
+
 #include <stdio.h>
+#include <stdlib.h>
+#include "busybox.h"
 
-extern int yes_main(int argc, char **argv) {
+extern int yes_main(int argc, char **argv)
+{
 	int i;
-	if (argc == 1)
+
+	if (argc >= 2 && *argv[1] == '-')
+		show_usage();
+
+	if (argc == 1) {
 		while (1)
-			if (puts ("y") == EOF) {
-				perror ("yes");
-				exit(FALSE);
+			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");
-				exit(FALSE);
+			if (fputs(argv[i], stdout) == EOF
+				|| putchar(i == argc - 1 ? '\n' : ' ') == EOF) {
+				perror("yes");
+				return EXIT_FAILURE;
 			}
-	exit(TRUE);
+
+	return EXIT_SUCCESS;
 }