コミット: 8ddd2a7ab587778affbd47ceb292b35c0db9f442 - mingw-catgets (git)

POSIX.1 National Language Support API for MinGW

コミットメタ情報

• リビジョン: 8ddd2a7ab587778affbd47ceb292b35c0db9f442 (tree)
• 日時: 2008-01-10 06:55:55
• 作者: Keith Marshall <keithmarshall@user...>
• コミッター: Keith Marshall

ログメッセージ

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.

変更サマリ

• modified: ChangeLog
• modified: gencat.c
• modified: mcsource.c

差分

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
[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".
+
+	* mcsource.c (input): Use strcasecmp instead of strcmp, to check for
+	match to "/dev/stdin".
+
 2008-01-08  Keith Marshall  <[e-mail]>
 
 	Add `-help' and `-version' options for `gencat'.

--- a/gencat.c
+++ b/gencat.c
@@ -182,10 +182,16 @@ int main( int argc, char **argv )
 
   if( (argc -= optind) > 1 )
   {
+    /* Establish the message catalogue name, recognising `/dev/stdout'
+     * as an alias for `-', representing the standard output stream.
+     */
+    if( strcasecmp( (msgcat = *(argv += optind)), "/dev/stdout" ) == 0 )
+      msgcat = "-";
+
     /* Initialise the message list, to incorporate any messages which
      * are already contained within the specified message catalogue.
      */
-    if( (cat = mc_load( msgcat = *(argv += optind) )) == NULL )
+    if( (cat = mc_load( msgcat )) == NULL )
       switch( errno )
       {
 	case ENOENT:
@@ -382,4 +388,4 @@ int main( int argc, char **argv )
   return EXIT_SUCCESS;
 }
 
-/* $RCSfile$Revision: 1.2 $: end of file */
+/* $RCSfile$Revision: 1.3 $: end of file */

--- a/mcsource.c
+++ b/mcsource.c
@@ -3,13 +3,13 @@
  *
  * $Id$
  *
- * Copyright (C) 2006, 2007, Keith Marshall
+ * Copyright (C) 2006, 2007, 2008, Keith Marshall
  *
  * This file implements the message catalogue source code parser, which is
  * used internally by `gencat', to compile message dictionaries.
  *
  * Written by Keith Marshall  <[e-mail]>
- * Last modification: 22-Sept-2007
+ * Last modification: 08-Jan-2008
  *
  *
  * This is free software.  It is provided AS IS, in the hope that it may
@@ -289,7 +289,7 @@ struct msgdict *mc_source( const char *input )
   /* Get a file descriptor for the input stream ...
    */
   const char *dev_stdin = "/dev/stdin";
-  if( (strcmp( input, "-") == 0) || (strcmp( input, dev_stdin ) == 0) )
+  if( (strcmp( input, "-") == 0) || (strcasecmp( input, dev_stdin ) == 0) )
   {
     /* ... reading from standard input ...
      */
@@ -1265,4 +1265,4 @@ struct msgdict *mc_source( const char *input )
   return head;
 }
 
-/* $RCSfile$Revision: 1.11 $: end of file */
+/* $RCSfile$Revision: 1.12 $: end of file */