From: Elliot Lee <sopwith@redhat.com>
Date: Mon, 16 Aug 2004 11:49:22 +0000 (+0000)
Subject: re PR java/9677 (File not found if spaces in file name)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f699e4541433ca9c8af8a4cad64d7a859b9fc782;p=gcc.git

re PR java/9677 (File not found if spaces in file name)

2004-08-16  Elliot Lee <sopwith@redhat.com>

        PR java/9677
        * jcf-parse.c (java_parse_file): Handle filenames with embedded
        spaces, and quoted filelists.

From-SVN: r86051
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 493a5f3c2f7..4e0dc7e3de3 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-16  Elliot Lee <sopwith@redhat.com>
+
+	PR java/9677
+	* jcf-parse.c (java_parse_file): Handle filenames with embedded
+	spaces, and quoted filelists.
+
 2004-08-15  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* boehm.c (get_boehm_type_descriptor): Use build_int_cst.
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index d62b1b8f325..cb4853f4128 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -897,7 +897,8 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
   char *list, *next;
   tree node;
   FILE *finput = NULL;
-
+  int in_quotes = 0;
+ 
   if (flag_filelist_file)
     {
       int avail = 2000;
@@ -940,8 +941,9 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
       for (next = list; ; )
 	{
 	  char ch = *next;
-	  if (ch == '\n' || ch == '\r' || ch == '\t' || ch == ' '
-	      || ch == '&' /* FIXME */)
+	  if (flag_filelist_file && ! in_quotes
+	      && (ch == '\n' || ch == '\r' || ch == '\t' || ch == ' '
+		  || ch == '&') /* FIXME */)
 	    {
 	      if (next == list)
 		{
@@ -955,6 +957,15 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
 		  break;
 		}
 	    }
+	  if (flag_filelist_file && ch == '"')
+	    {
+	      in_quotes = ! in_quotes;
+	      *next++ = '\0';
+	      if (in_quotes) 
+		list = next;
+	      else 
+		break;
+	    }
 	  if (ch == '\0')
 	    {
 	      next = NULL;