merge with 1.8a

1 files changed, 8 insertions, 8 deletions

diff --git a/src/comm.c b/src/comm.c
index c5f4c39ca..d79ca7bbf 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -39,15 +39,15 @@ static int only_file_2;
 static int both;
 
 /* 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 long_options[] =
 {
-  {"help", no_argument, &flag_help, 1},
-  {"version", no_argument, &flag_version, 1},
+  {"help", no_argument, &show_help, 1},
+  {"version", no_argument, &show_version, 1},
   {0, 0, 0, 0}
 };
 
@@ -91,13 +91,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 (optind + 2 != argc)