#line should have quoted strings.

Ideally, this should be done by m4_quotearg.
* src/scan-skel.l: Include quotearg.h.
Quote __ofile__.
* src/output.c (symbol_printers_output)
(symbol_destructors_output): Quote the file name.

diff --git a/ChangeLog b/ChangeLog
index ee1fa169c1aec5dd720502315d9c3ace06bf9b71..536a06cc95b652dfc45914b42f1b494c9716682e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-06  Akim Demaille  <akim@epita.fr>
+
+       #line should have quoted strings.
+       Ideally, this should be done by m4_quotearg.
+
+       * src/scan-skel.l: Include quotearg.h.
+       Quote __ofile__.
+       * src/output.c (symbol_printers_output)
+       (symbol_destructors_output): Quote the file name.
+
 2002-11-06  Akim Demaille  <akim@epita.fr>
 
        * tests/regression.at (Invalid inputs): Adjust to the recent

diff --git a/NEWS b/NEWS
index 08bc9575bb592fa5defa9a442fc6d2500d41ca0c..022aa47fd3b9b922f7637188640a230dd4d5374a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,13 +8,6 @@ Changes in version 1.75b:
 
 * --no-line works properly.
 
-Changes in version 1.75a, 2002-10-24:
-
-* Bison can no longer be built by a K&R C compiler; it requires C89 or
-  later to be built.  This change originally took place a few versions
-  ago, but nobody noticed until we recently asked someone to try
-  building Bison with a K&R C compiler.
-
 * %error-verbose
   This new directive is preferred over YYERROR_VERBOSE.
 
@@ -26,6 +19,16 @@ Changes in version 1.75a, 2002-10-24:
 * #line
   Bison now recognizes #line in its input, and forwards them.
 
+* #line
+  File names are properly escaped. E.g. foo\bar.y give #line 123 "foo\\bar.y".
+
+Changes in version 1.75a, 2002-10-24:
+
+* Bison can no longer be built by a K&R C compiler; it requires C89 or
+  later to be built.  This change originally took place a few versions
+  ago, but nobody noticed until we recently asked someone to try
+  building Bison with a K&R C compiler.
+
 Changes in version 1.75, 2002-10-14:
 
 * Bison should now work on 64-bit hosts.

diff --git a/src/output.c b/src/output.c
index f115bd2f8c0d898744324969a5c03d0bc48db410..c2e1d2ba7dee713f63e352e715c82fc9aa7bbe65 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -380,7 +380,8 @@ symbol_destructors_output (FILE *out)
           destructor, typename. */
        fprintf (out, "%s[[[%s]], [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]",
                 first ? "" : ",\n",
-                symbol->destructor_location.file,
+                quotearg_style (escape_quoting_style,
+                                symbol->destructor_location.file),
                 symbol->destructor_location.first_line,
                 symbol->tag,
                 symbol->number,
@@ -414,7 +415,8 @@ symbol_printers_output (FILE *out)
           printer, typename. */
        fprintf (out, "%s[[[%s]], [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]",
                 first ? "" : ",\n",
-                symbol->printer_location.file,
+                quotearg_style (escape_quoting_style,
+                                symbol->printer_location.file),
                 symbol->printer_location.first_line,
                 symbol->tag,
                 symbol->number,

diff --git a/src/scan-skel.l b/src/scan-skel.l
index e56d37230c26ff6b9b8460e170b6888ce8a23d35..aa71ac8c865bd563e50b001c07cb691655438f55 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -23,12 +23,16 @@
 
 %{
 #include "system.h"
+#include "quotearg.h"
 #include "error.h"
 #include "getargs.h"
 #include "files.h"
+
 int skel_lex (void);
+
 static int yylineno = 1;
 static char *yyoutname = NULL;
+
 %}
 %%
   /* This is an approximation, but we don't need more. */
@@ -44,7 +48,7 @@ static char *yyoutname = NULL;
 "@:>@"           fputc (']', yyout);
 
 "__oline__"      fprintf (yyout, "%d", yylineno+1);
-"__ofile__"      fprintf (yyout, "%s", yyoutname);
+"__ofile__"      fprintf (yyout, "%s", quotearg_style (escape_quoting_style, yyoutname));
 [^@_\n]+         ECHO;
 \n+              yylineno += yyleng; ECHO;
 .                ECHO;