database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-01 01:04:50 +03:00
Code

psql thought that backslash is an escape character inside double quotes.

Browse Source 
It isn't.
This commit is contained in:
Tom Lane 2002-10-12 23:09:34 +00:00
parent 5bb46e7cd0
commit f94e5bde60
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin/psql/mainloop.c
View File

@ -3,7 +3,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Group * Copyright 2000 by PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.50 2002/09/04 20:31:36 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.51 2002/10/12 23:09:34 tgl Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "mainloop.h" #include "mainloop.h"
@ -300,9 +300,13 @@ MainLoop(FILE *source)
/* in quote? */ /* in quote? */
if (in_quote) if (in_quote)
{ {
/* end of quote */ /*
if (line[i] == in_quote && bslash_count % 2 == 0) * end of quote if matching non-backslashed character.
in_quote = '\0'; * backslashes don't count for double quotes, though.
*/
if (line[i] == in_quote &&
(bslash_count % 2 == 0 || in_quote == '"'))
in_quote = 0;
} }
/* in extended comment? */ /* in extended comment? */
@ -330,12 +334,10 @@ MainLoop(FILE *source)
ADVANCE_1; ADVANCE_1;
} }
/* start of quote */ /* start of quote? */
else if (!was_bslash && else if (line[i] == '\'' || line[i] == '"')
(line[i] == '\'' || line[i] == '"'))
in_quote = line[i]; in_quote = line[i];
/* single-line comment? truncate line */ /* single-line comment? truncate line */
else if (line[i] == '-' && line[i + thislen] == '-') else if (line[i] == '-' && line[i + thislen] == '-')
{ {
@ -446,6 +448,7 @@ MainLoop(FILE *source)
/* remove the backslash */ /* remove the backslash */
memmove(line + i - prevlen, line + i, len - i + 1); memmove(line + i - prevlen, line + i, len - i + 1);
len--; len--;
i--;
} }
/* backslash command */ /* backslash command */