提交: b31c59a77f8eb3697a5ddb8614d9ec0dc9ecc0af - mingw-catgets (git)

POSIX.1 National Language Support API for MinGW

Commit MetaInfo

• 修訂: b31c59a77f8eb3697a5ddb8614d9ec0dc9ecc0af (tree)
• 時間: 2008-01-10 07:04:08
• 作者: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Retain .exe' file name extension, if present, in program identity banner displayed by -help' and -version' options.

Change Summary

• modified: ChangeLog
• modified: gencat.c

差異

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,21 @@
 2008-01-09  Keith Marshall  <[e-mail]>
 
+	Retain `.exe' file name extension, if present, in program identity
+	banner displayed by `-help' and `-version' options.
+
+	* gencat.c (progname): Delay reassignment to `*argv', with `.exe'
+	extension stripped, until after parsing option arguments.
+
[phone]  Keith Marshall  <[e-mail]>
+
 	Support `/dev/stdin' and '/dev/stdout', specified as command line
 	arguments, as case-insensitive aliases for `-', representing the
 	standard input and standard output streams respectively.
 
 	* gencat.c (msgcat): Assign from first non-option command line
-	argument; replace with "-", if strcasecmp matches "/dev/stdout".
+	argument; replace with "-", if strcasecmp() matches "/dev/stdout".
 
-	* mcsource.c (input): Use strcasecmp instead of strcmp, to check for
+	* mcsource.c (input): Use strcasecmp() instead of strcmp, to check for
 	match to "/dev/stdin".
 
 2008-01-08  Keith Marshall  <[e-mail]>

--- a/gencat.c
+++ b/gencat.c
@@ -8,7 +8,7 @@
  * This file implements the `main' function for the `gencat' program.
  *
  * Written by Keith Marshall  <[e-mail]>
- * Last modification: 08-Jan-2008
+ * Last modification: 09-Jan-2008
  *
  *
  * This is free software.  It is provided AS IS, in the hope that it may
@@ -149,7 +149,6 @@ int main( int argc, char **argv )
     int ext = strlen( *argv ) - 4;
     if( (ext > 0) && (strcasecmp( *argv + ext, ".exe" ) == 0) )
       *(*argv + ext) = '\0';
-    progname = *argv;
   }
   else
     /* Something went wrong...
@@ -178,6 +177,7 @@ int main( int argc, char **argv )
 	exit( EXIT_SUCCESS );
     }
 
+  progname = *argv;
   cat_index.id = tag;
 
   if( (argc -= optind) > 1 )
@@ -388,4 +388,4 @@ int main( int argc, char **argv )
   return EXIT_SUCCESS;
 }
 
-/* $RCSfile$Revision: 1.3 $: end of file */
+/* $RCSfile$Revision: 1.4 $: end of file */