X-Git-Url: https://oss.titaniummirror.com/gitweb?p=msp430-binutils.git;a=blobdiff_plain;f=binutils%2Frclex.c;fp=binutils%2Frclex.c;h=07ae17988d4cae6054b3589f3d1c7d7bda8bd531;hp=5922106a0e453e859a30e0b35f3a597dc60eef6e;hb=d5da4f291af551c0b8b79e1d4a9b173d60e5c10e;hpb=7b5ea4fcdf2819e070665ab5610f8b48e3867c10

diff --git a/binutils/rclex.c b/binutils/rclex.c
index 5922106..07ae179 100644
--- a/binutils/rclex.c
+++ b/binutils/rclex.c
@@ -1,6 +1,6 @@
 /* rclex.c -- lexer for Windows rc files parser  */
 
-/* Copyright 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2006, 2007
+/* Copyright 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
    Written by Kai Tietz, Onevision.
@@ -390,9 +390,9 @@ handle_quotes (rc_uint_type *len)
 	}
       else
 	{
-	  rcparse_warning ("unexpected character after '\"'");
 	  ++t;
-	  assert (ISSPACE (*t));
+	  if (! ISSPACE (*t))
+	    rcparse_warning ("unexpected character after '\"'");
 	  while (ISSPACE (*t))
 	    {
 	      if ((*t) == '\n')
@@ -679,7 +679,7 @@ static void
 rclex_string (void)
 {
   int c;
-  
+
   while ((c = rclex_peekch ()) != -1)
     {
       if (c == '\n')
@@ -693,6 +693,18 @@ rclex_string (void)
         }
       else if (rclex_readch () == '"')
 	{
+	  /* PR 6714
+	     Skip any whitespace after the end of the double quotes.  */
+	  do
+	    {
+	      c = rclex_peekch ();
+	      if (ISSPACE (c))
+		rclex_readch ();
+	      else
+		c = -1;
+	    }
+	  while (c != -1);
+		
 	  if (rclex_peekch () == '"')
 	    rclex_readch ();
 	  else
@@ -844,7 +856,11 @@ yylex (void)
 	default:
 	  if (ISIDST (ch) || ch=='$')
 	    {
-	      while ((ch = rclex_peekch ()) != -1 && (ISIDNUM (ch) || ch == '$' || ch == '.'))
+	      while ((ch = rclex_peekch ()) != -1
+		     && (ISIDNUM (ch) || ch == '$' || ch == '.'
+		         || ch == ':' || ch == '\\' || ch == '/'
+		         || ch == '_' || ch == '-')
+		    )
 		rclex_readch ();
 	      ch = IGNORE_CPP (rclex_translatekeyword (rclex_tok));
 	      if (ch == STRING)