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/join.c | |
parent | 3b5543d43131da003fcf75c5d9062da0199b3b88 (diff) | |
download | coreutils-712109716a7b75dda2d34751202d210acd879f6b.tar.xz |
merge with 1.8a
Diffstat (limited to 'src/join.c')
-rw-r--r-- | src/join.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/join.c b/src/join.c index 48e791ac0..7d02e0689 100644 --- a/src/join.c +++ b/src/join.c @@ -94,10 +94,10 @@ static struct outlist *outlist_end; static char tab; /* 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 exit. */ +static int show_version; /* When using getopt_long_only, no long option can start with a character that is a short option. */ @@ -106,8 +106,8 @@ static struct option const longopts[] = {"j", required_argument, NULL, 'j'}, {"j1", required_argument, NULL, '1'}, {"j2", required_argument, NULL, '2'}, - {"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} }; @@ -660,13 +660,13 @@ main (argc, argv) prev_optc = optc; } - 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 (nfiles != 2) |