[MinGW-cvs] mingw-get/src keyword.c,1.2,1.3

[Keith M. <kei...@us...>]

Update of /cvsroot/mingw/mingw-get/src
In directory vz-cvs-4.sog:/tmp/cvs-serv9796/src

Modified Files:
	keyword.c 
Log Message:
Fix MinGW-Bug 3212246.


Index: keyword.c
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/keyword.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** keyword.c	24 Jun 2010 20:49:39 -0000	1.2
--- keyword.c	15 Mar 2011 20:28:38 -0000	1.3
***************
*** 51,60 ****
         */
        const char *inspect = lookup;
!       while( *inspect && ! isspace( *in_list ) && (*inspect++ == *in_list++) )
! 	/*
! 	 * ...advancing pointers to both, with no further action,
  	 * until we find a mismatch.
  	 */
! 	;
  
        /* If the mismatch coincides with the terminating NUL for "lookup",
--- 51,61 ----
         */
        const char *inspect = lookup;
!       while( *inspect && ! isspace( *in_list ) && (*inspect == *in_list) )
!       {
! 	/* ...advancing pointers to both, with no further action,
  	 * until we find a mismatch.
  	 */
! 	++inspect; ++in_list;
!       }
  
        /* If the mismatch coincides with the terminating NUL for "lookup",
***************
*** 70,74 ****
        /* Otherwise, we have not yet found a match...
         * Step over any remaining non-white-space characters in the current
!        * "in_list" entry, and also the following space character if any...
         */
        while( *in_list && ! isspace( *in_list++ ) )
--- 71,78 ----
        /* Otherwise, we have not yet found a match...
         * Step over any remaining non-white-space characters in the current
!        * "in_list" entry, and also the first of any following space characters.
!        * (Note that we don't need to explicitly skip over any additional space
!        * characters preceding the next list entry, if any, since they will be
!        * implicitly skipped in the outer loop).
         */
        while( *in_list && ! isspace( *in_list++ ) )