mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't strip trailing backslashes from a line. Treat them more reasonably.

Browse Source
This commit is contained in:
Peter Eisentraut 2000-07-17 18:24:33 +00:00
parent 4fa37381f1
commit 5da7e533f7
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/psql/command.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/command.c,v 1.34 2000/06/26 14:16:34 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.35 2000/07/17 18:24:32 petere Exp $
*/ */
#include "postgres.h" #include "postgres.h"
#include "command.h" #include "command.h"
@ -111,6 +111,9 @@ HandleSlashCmds(const char *line,
{ {
continue_parse = &my_line[blank_loc]; continue_parse = &my_line[blank_loc];
my_line[blank_loc] = '\0'; my_line[blank_loc] = '\0';
/* If it's a double backslash, we skip it. */
if (my_line[blank_loc + 1] == '\\')
continue_parse += 2;
} }
/* do we have an option string? */ /* do we have an option string? */
else if (my_line[blank_loc] != '\0') else if (my_line[blank_loc] != '\0')

13
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.33 2000/07/14 15:43:49 thomas Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.34 2000/07/17 18:24:33 petere Exp $
*/ */
#include "postgres.h" #include "postgres.h"
#include "mainloop.h" #include "mainloop.h"
@ -248,17 +248,6 @@ MainLoop(FILE *source)
pset.lineno++; pset.lineno++;
/* strip trailing backslashes, they don't have a clear meaning */
while (1)
{
char *cp = strrchr(line, '\\');
if (cp && (*(cp + 1) == '\0'))
*cp = '\0';
else
break;
}
/* nothing left on line? then ignore */ /* nothing left on line? then ignore */
if (line[0] == '\0') if (line[0] == '\0')
{ {