* src/reader.c (copy_definition, parse_union_decl, copy_action)

(copy_guard): Quote the file names.
Reported by Laurent Mascherpa.

diff --git a/ChangeLog b/ChangeLog
index 49b30cc412900a6fe56f0ced269784923ea2ffae..b049043d3c9e224ab7d214123bf9da00f4f8aef2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-12  Akim Demaille  <akim@epita.fr>
+
+       * src/reader.c (copy_definition, parse_union_decl, copy_action)
+       (copy_guard): Quote the file names.
+       Reported by Laurent Mascherpa.
+

 2000-12-12  Akim Demaille  <akim@epita.fr>
 
        * src/output.c (output_headers, output_program, output): Be sure
 2000-12-12  Akim Demaille  <akim@epita.fr>
 
        * src/output.c (output_headers, output_program, output): Be sure

diff --git a/THANKS b/THANKS
index 0cfdeb88b08939e40bcba6f7394139de13213dcf..c0577e747ef836600fafc19bf586926fc7d5a8e2 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -2,22 +2,7 @@ Daniel Hagerty         hag@gnu.org
 David J. MacKenzie     djm@gnu.org
 Jesse Thilo            jthilo@gnu.org
 Jim Meyering           meyering@gnu.org
 David J. MacKenzie     djm@gnu.org
 Jesse Thilo            jthilo@gnu.org
 Jim Meyering           meyering@gnu.org

-Neil Booth             NeilB@earthling.net
-Noah Friedman                  friedman@gnu.org
-Paul Eggert            eggert@twinsun.com
-Piotr Gackiewicz       gacek@intertel.com.pl
-Richard Stallman       rms@gnu.org
-
-Many people are not named here because we lost track of them.  We
-thank them!  Please, help us keeping this list up to date.
-
-Local Variables:
-mode: text
-End:
-Daniel Hagerty         hag@gnu.org
-David J. MacKenzie     djm@gnu.org
-Jesse Thilo            jthilo@gnu.org
-Jim Meyering           meyering@gnu.org
+Laurent Mascherpa      laurent.mascherpa@epita.fr

 Neil Booth             NeilB@earthling.net
 Noah Friedman                  friedman@gnu.org
 Paul Eggert            eggert@twinsun.com
 Neil Booth             NeilB@earthling.net
 Noah Friedman                  friedman@gnu.org
 Paul Eggert            eggert@twinsun.com

diff --git a/src/reader.c b/src/reader.c
index fbe92c644fb1edcc45d7a0102c651ffa0a480d94..9fc627f1eda3a256f11c6f893200fa3895dbe189 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -22,6 +22,8 @@
 
 #include "system.h"
 #include "obstack.h"
 
 #include "system.h"
 #include "obstack.h"

+#include "quotearg.h"
+#include "quote.h"

 #include "getargs.h"
 #include "files.h"
 #include "xalloc.h"
 #include "getargs.h"
 #include "files.h"
 #include "xalloc.h"


@@ -32,7 +34,6 @@
 #include "output.h"
 #include "reader.h"
 #include "conflicts.h"
 #include "output.h"
 #include "reader.h"
 #include "conflicts.h"

-#include "quote.h"

 
 /* Number of slots allocated (but not necessarily used yet) in `rline'  */
 static int rline_allocated;
 
 /* Number of slots allocated (but not necessarily used yet) in `rline'  */
 static int rline_allocated;


@@ -461,7 +462,8 @@ copy_definition (void)
   int after_percent;
 
   if (!no_lines_flag)
   int after_percent;
 
   if (!no_lines_flag)

-    obstack_fgrow2 (&attrs_obstack, "#line %d \"%s\"\n", lineno, infile);
+    obstack_fgrow2 (&attrs_obstack, "#line %d %s\n",
+                   lineno, quotearg_style (c_quoting_style, infile));

 
   after_percent = 0;
 
 
   after_percent = 0;
 


@@ -779,7 +781,8 @@ parse_union_decl (void)
   typed = 1;
 
   if (!no_lines_flag)
   typed = 1;
 
   if (!no_lines_flag)

-    obstack_fgrow2 (&attrs_obstack, "\n#line %d \"%s\"\n", lineno, infile);
+    obstack_fgrow2 (&attrs_obstack, "\n#line %d %s\n",
+                   lineno, quotearg_style (c_quoting_style, infile));

   else
     obstack_1grow (&attrs_obstack, '\n');
 
   else
     obstack_1grow (&attrs_obstack, '\n');
 


@@ -1053,7 +1056,8 @@ copy_action (symbol_list *rule, int stack_offset)
 
   if (!no_lines_flag)
     {
 
   if (!no_lines_flag)
     {

-      sprintf (buf, "#line %d \"%s\"\n", lineno, infile);
+      sprintf (buf, "#line %d %s\n",
+              lineno, quotearg_style (c_quoting_style, infile));

       obstack_grow (&action_obstack, buf, strlen (buf));
     }
   obstack_1grow (&action_obstack, '{');
       obstack_grow (&action_obstack, buf, strlen (buf));
     }
   obstack_1grow (&action_obstack, '{');


@@ -1141,7 +1145,8 @@ copy_guard (symbol_list *rule, int stack_offset)
 
   fprintf (fguard, "\ncase %d:\n", nrules);
   if (!no_lines_flag)
 
   fprintf (fguard, "\ncase %d:\n", nrules);
   if (!no_lines_flag)

-    fprintf (fguard, "#line %d \"%s\"\n", lineno, infile);
+    fprintf (fguard, "#line %d %s\n",
+            lineno, quotearg_style (c_quoting_style, infile));

   putc ('{', fguard);
 
   count = 0;
   putc ('{', fguard);
 
   count = 0;