Commit: bc03c176d28c38725ebca9a47b53417fd4d92d80 - mingw-catgets (git)

POSIX.1 National Language Support API for MinGW

Commit MetaInfo

• Revisión: bc03c176d28c38725ebca9a47b53417fd4d92d80 (tree)
• Tiempo: 2007-05-12 04:56:17
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Avoid attempt to read input again, after EOF detected.

Cambiar Resumen

• modified: ChangeLog
• modified: mcsource.c

Diferencia incremental

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2007-05-11  Keith Marshall  <[e-mail]>
 
+	Avoid attempt to read input again, after EOF detected; this caused
+	strange behaviour if processing an interactive input stream.
+
+	* mcsource.c (mc_source): New local variable `input_fd'; assign it as
+	a duplicate of `fd'.  Set `fd' to -1, when EOF detected; don't do any
+	more reads, after `fd' set to this invalid value.  Call `close' on
+	`input_fd', before return.
+
[phone]  Keith Marshall  <[e-mail]>
+
 	Avoid calling `iconv' with unintialised codeset converter.
 
 	* mcsource.c (mc_default_codeset): New static function.

--- a/mcsource.c
+++ b/mcsource.c
@@ -204,8 +204,8 @@ struct msgdict *mc_source( const char *input )
 {
 # define CODESET_DECLARED       codeset_decl_src, codeset_decl_lineno
 
-  int fd, count;
   long accumulator;
+  int fd, input_fd, count;
   char buf[BUFSIZ], keyword[64];
   char *id;
 
@@ -230,11 +230,11 @@ struct msgdict *mc_source( const char *input )
   const char *dev_stdin = "/dev/stdin";
   if( (strcmp( input, "-") == 0) || (strcmp( input, dev_stdin ) == 0) )
   {
-    fd = STDIN_FILENO;
+    input_fd = fd = STDIN_FILENO;
     input = dev_stdin;
   }
 
-  else if( (fd = open( input, O_RDONLY | O_BINARY )) < 0 )
+  else if( (input_fd = fd = open( input, O_RDONLY | O_BINARY )) < 0 )
     return NULL;
 
   dfprintf(( stderr, "\n%s:new source file\n%s:", input, input ));
@@ -242,7 +242,7 @@ struct msgdict *mc_source( const char *input )
     return NULL;
 
   msgloc = (off_t)(0);
-  while( (count = read( fd, buf, sizeof( buf ) )) > 0 )
+  while( (fd >= 0) && ((count = read( fd, buf, sizeof( buf ) )) > 0) )
   {
     char *p = buf;
     int high_water_mark = count - ( count >> 2 );
@@ -795,12 +795,15 @@ struct msgdict *mc_source( const char *input )
 	 */
 	if( (p - buf) > high_water_mark )
 	{
+	  int ref;
 	  char *copyptr;
 	  for( copyptr = buf; count; count-- )
 	    *copyptr++ = *p++;
-	  p = buf; count = copyptr - p;
+	  p = buf; ref = count = copyptr - p;
 	  dfprintf(( stderr, "\n%s:%u:input count depleted: %u byte%s remaining", input, linenum, count, count == 1 ? "" : "s" ));
-	  count += read( fd, copyptr, sizeof( buf ) - count );
+	  if( (fd >= 0)
+	  &&  (ref == (count += read( fd, copyptr, sizeof( buf ) - count )))  )
+	    fd = -1;
 	  dfprintf(( stderr, "; read new input: count adjusted to %u byte%s", count, count == 1 ? "" : "s" ));
 	  high_water_mark = count - ( count >> 2 );
 	}
@@ -872,7 +875,11 @@ struct msgdict *mc_source( const char *input )
   }
   dfputc(( L'\n', stderr ));
 
+  /* We are done with the current input source;
+   * close its file descriptor, and return the message list.
+   */
+  close( input_fd );
   return head;
 }
 
-/* $RCSfile$Revision: 1.2 $: end of file */
+/* $RCSfile$Revision: 1.3 $: end of file */