rw.rs ~charadon -- gnu-hello

gnu-hello

Info

Commit...:	a20e91aa69b73a77beb79ba36a5eb6f61d1f3c66
Author...:	karl <>
Committer:	karl <>
Date.....:	Sun Aug 20 23:45:00 2006 +0000
Parents..:	a72516b836e571e03b99e0651f1e9ba8ad980607

Message

[project @ 2006-08-20 23:45:00 by karl]
go through close_stdout

Changes

diff --git a/src/ChangeLog b/src/ChangeLog
line changes: +5/-2
index ace29c0..9213776
--- a/src/ChangeLog
+++ b/src/ChangeLog

@@ -1,7 +1,10 @@
 2006-08-20  Karl Berry  <karl@gnu.org>
-
+	
 	* hello.c (main): try a new style for the --version output.
-
+	
+	* hello.c (main): do not exit(0) prematurely with --help or
+	--version, we need to go through close_stdout.
+	
 2006-07-16  Karl Berry  <karl@gnu.org>
 
 	* system.h: #include "closeout.h".

diff --git a/src/hello.c b/src/hello.c
line changes: +2/-5
index 9cec51c..60851f4
--- a/src/hello.c
+++ b/src/hello.c

@@ -127,11 +127,9 @@ Usage: %s [OPTION]...\n"), progname);
          no-wrap */
       printf (_("\
 Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
-
-      exit (0);
     }
 
-  if (v)
+  else if (v)
     {
       /* Print version number.  */
       printf ("hello (GNU %s) %s\n", PACKAGE, VERSION);

@@ -139,10 +137,9 @@ Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
       puts ("");
       printf (_("\
 Copyright (C) %s Free Software Foundation, Inc.\n\
-License: GNU GPL v2+ (see http://www.gnu.org/licenses/gpl.html)\n\
+License: GNU GPL v2+ <http://www.gnu.org/licenses/gpl.html>\n\
 This is free software.  There is NO WARRANTY, to the extent permitted by law.\n"),
               "2006", PACKAGE);
-      exit (0);
     }
 
   else