aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/tty.c4
-rw-r--r--coreutils/uniq.c14
-rw-r--r--coreutils/wc.c3
-rw-r--r--coreutils/whoami.c4
-rw-r--r--coreutils/yes.c8
5 files changed, 16 insertions, 17 deletions
diff --git a/coreutils/tty.c b/coreutils/tty.c
index 8ac1c1fcd..6f98d1b79 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -25,8 +25,8 @@
#include <sys/types.h>
static const char tty_usage[] = "tty\n\n"
- "Print the file name of the terminal connected to standard input.\n"
-
+ "Print the file name of the terminal connected to standard input.\n\n"
+ "Options:\n"
"\t-s\tprint nothing, only return an exit status\n";
extern int tty_main(int argc, char **argv)
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 2eedb886d..0324856fd 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -28,15 +28,9 @@
#include <errno.h>
static const char uniq_usage[] =
- "uniq [OPTION]... [INPUT [OUTPUT]]\n"
- "Discard all but one of successive identical lines from INPUT (or\n"
- "standard input), writing to OUTPUT (or standard output).\n"
- "\n"
- "\t-h\tdisplay this help and exit\n"
-
- "\n"
- "A field is a run of whitespace, then non-whitespace characters.\n"
- "Fields are skipped before chars.\n";
+ "uniq [OPTION]... [INPUT [OUTPUT]]\n\n"
+ "Discard all but one of successive identical lines from INPUT\n"
+ "(or standard input), writing to OUTPUT (or standard output).\n";
/* max chars in line */
#define UNIQ_MAX 4096
@@ -190,4 +184,4 @@ int uniq_main(int argc, char **argv)
exit(0);
}
-/* $Id: uniq.c,v 1.8 2000/04/13 01:18:56 erik Exp $ */
+/* $Id: uniq.c,v 1.9 2000/04/17 16:16:10 erik Exp $ */
diff --git a/coreutils/wc.c b/coreutils/wc.c
index 8004e6294..030afa9d6 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -25,7 +25,8 @@
static const char wc_usage[] = "wc [OPTION]... [FILE]...\n\n"
"Print line, word, and byte counts for each FILE, and a total line if\n"
- "more than one FILE is specified. With no FILE, read standard input.\n"
+ "more than one FILE is specified. With no FILE, read standard input.\n\n"
+ "Options:\n"
"\t-c\tprint the byte counts\n"
"\t-l\tprint the newline counts\n"
diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 3677c2fbc..5c3fea13f 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -25,9 +25,7 @@
#include <pwd.h>
static const char whoami_usage[] = "whoami\n\n"
- "Print the user name associated with the current effective user id.\n"
-
- "Same as id -un.\n";
+ "Prints the user name associated with the current effective user id.\n";
extern int whoami_main(int argc, char **argv)
{
diff --git a/coreutils/yes.c b/coreutils/yes.c
index ac67845ac..a822ebc1d 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -27,12 +27,18 @@ extern int yes_main(int argc, char **argv)
{
int i;
- if (argc == 1)
+ if (argc >=1 && *argv[1]=='-') {
+ usage("yes [OPTION]... [STRING]...\n\n"
+ "Repeatedly outputs a line with all specified STRING(s), or `y'.\n");
+ }
+
+ if (argc == 1) {
while (1)
if (puts("y") == EOF) {
perror("yes");
exit(FALSE);
}
+ }
while (1)
for (i = 1; i < argc; i++)