summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meskes2013-07-05 09:07:16 +0000
committerMichael Meskes2013-07-05 09:15:42 +0000
commit434943d57608c0d51490c7400363ede8c6a278f2 (patch)
tree2ba9f0b6fc5caac46357849f6057390d933d08ab
parente9ac1b8775c49a41374d85463f56aed73d512f25 (diff)
Applied patch by MauMau <maumau307@gmail.com> to escape filenames in #line statements.
-rw-r--r--src/interfaces/ecpg/preproc/output.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/src/interfaces/ecpg/preproc/output.c b/src/interfaces/ecpg/preproc/output.c
index 09486c66d00..6aacee52923 100644
--- a/src/interfaces/ecpg/preproc/output.c
+++ b/src/interfaces/ecpg/preproc/output.c
@@ -95,9 +95,22 @@ hashline_number(void)
#endif
)
{
- char *line = mm_alloc(strlen("\n#line %d \"%s\"\n") + sizeof(int) * CHAR_BIT * 10 / 3 + strlen(input_filename));
-
- sprintf(line, "\n#line %d \"%s\"\n", yylineno, input_filename);
+ /* "* 2" here is for escaping \s below */
+ char *line = mm_alloc(strlen("\n#line %d \"%s\"\n") + sizeof(int) * CHAR_BIT * 10 / 3 + strlen(input_filename) * 2);
+ char *src,
+ *dest;
+
+ sprintf(line, "\n#line %d \"", yylineno);
+ src = input_filename;
+ dest = line + strlen(line);
+ while (*src)
+ {
+ if (*src == '\\')
+ *dest++ = '\\';
+ *dest++ = *src++;
+ }
+ *dest = '\0';
+ strcat(dest, "\"\n");
return line;
}