From 712109716a7b75dda2d34751202d210acd879f6b Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 5 Oct 1993 18:29:39 +0000 Subject: merge with 1.8a --- src/uniq.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/uniq.c') diff --git a/src/uniq.c b/src/uniq.c index aab70db43..501735654 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -70,10 +70,10 @@ enum output_mode static enum output_mode mode; /* 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; static struct option const longopts[] = { @@ -83,8 +83,8 @@ static struct option const longopts[] = {"skip-fields", required_argument, NULL, 'f'}, {"skip-chars", required_argument, NULL, 's'}, {"check-chars", required_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} }; @@ -153,13 +153,13 @@ main (argc, argv) } } - 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 (optind >= 2 && strcmp (argv[optind - 1], "--") != 0) -- cgit v1.2.3-54-g00ecf