Commit 6e2341a4 authored by Bruce Momjian's avatar Bruce Momjian

psql paren. with \r fix.

parent 1a395b72
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.43 1996/12/28 02:12:31 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.44 1997/01/02 06:45:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1263,6 +1263,7 @@ MainLoop(PsqlSettings * settings, FILE * source) ...@@ -1263,6 +1263,7 @@ MainLoop(PsqlSettings * settings, FILE * source)
/* main loop for getting queries and executing them */ /* main loop for getting queries and executing them */
while (!eof) { while (!eof) {
if (slashCmdStatus == 3) { if (slashCmdStatus == 3) {
paren_level = 0;
line = strdup(query); line = strdup(query);
query[0] = '\0'; query[0] = '\0';
} else { } else {
...@@ -1376,9 +1377,13 @@ MainLoop(PsqlSettings * settings, FILE * source) ...@@ -1376,9 +1377,13 @@ MainLoop(PsqlSettings * settings, FILE * source)
query_start, query_start,
query); query);
if (slashCmdStatus == 1) { if (slashCmdStatus == 1) {
if (query[0] == '\0')
{
paren_level = 0;
free(line); free(line);
continue; continue;
} }
}
if (slashCmdStatus == 2) { if (slashCmdStatus == 2) {
free(line); free(line);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment