diff options
author | Jim Meyering <jim@meyering.net> | 1993-10-05 18:29:39 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1993-10-05 18:29:39 +0000 |
commit | 712109716a7b75dda2d34751202d210acd879f6b (patch) | |
tree | 93943c37813a5b456347b7e6009ef10b9f782fba /src/wc.c | |
parent | 3b5543d43131da003fcf75c5d9062da0199b3b88 (diff) | |
download | coreutils-712109716a7b75dda2d34751202d210acd879f6b.tar.xz |
merge with 1.8a
Diffstat (limited to 'src/wc.c')
-rw-r--r-- | src/wc.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -49,10 +49,10 @@ static int have_read_stdin; static int exit_status; /* If non-zero, display usage information and exit. */ -static int flag_help; +static int show_help; -/* If non-zero, print the version on standard error. */ -static int flag_version; +/* If non-zero, print the version on standard output then exits. */ +static int show_version; static struct option const longopts[] = { @@ -60,8 +60,8 @@ static struct option const longopts[] = {"chars", no_argument, NULL, 'c'}, {"lines", no_argument, NULL, 'l'}, {"words", no_argument, NULL, 'w'}, - {"help", no_argument, &flag_help, 1}, - {"version", no_argument, &flag_version, 1}, + {"help", no_argument, &show_help, 1}, + {"version", no_argument, &show_version, 1}, {NULL, 0, NULL, 0} }; @@ -110,13 +110,13 @@ main (argc, argv) usage (); } - if (flag_version) + if (show_version) { - fprintf (stderr, "%s\n", version_string); + printf ("%s\n", version_string); exit (0); } - if (flag_help) + if (show_help) usage (); if (print_lines + print_words + print_chars == 0) |