diff options
author | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 12:13:01 +0300 |
---|---|---|
committer | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 12:13:01 +0300 |
commit | cad5364599eb5062d59e0c397ed638ddd61a8d5d (patch) | |
tree | a318d0f03aa076c74b576ea45dc543a5669e8e91 /coreutils/yes.c | |
parent | e01f9662a5bd5d91be4f6b3941b57fff73cd5af1 (diff) |
Major coreutils update.
Diffstat (limited to 'coreutils/yes.c')
-rw-r--r-- | coreutils/yes.c | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/coreutils/yes.c b/coreutils/yes.c index 7d9596d0b..74f7571cf 100644 --- 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,7 +20,12 @@ * */ -/* getopt not needed */ +/* 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> @@ -28,26 +33,24 @@ extern int yes_main(int argc, char **argv) { - int i; - - if (argc >= 2 && *argv[1] == '-') - show_usage(); + static const char fmt_str[] = " %s"; + const char *fmt; + char **first_arg; - if (argc == 1) { - while (1) - if (puts("y") == EOF) { - perror("yes"); - return EXIT_FAILURE; - } + *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"); - return EXIT_FAILURE; - } + 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); - return EXIT_SUCCESS; + bb_perror_nomsg_and_die(); } |