diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-02-18 05:57:41 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-02-18 05:57:41 +0000 |
| commit | fb8e3f15c095e00438c24e729dd4f4bfb56f35ca (patch) | |
| tree | 4d42c084517f194cec7d58c47193d9addefe7e55 /src | |
| parent | c03e7fbadc4526487c34b33c6cb796c9a42dc25e (diff) | |
| download | postgresql-fb8e3f15c095e00438c24e729dd4f4bfb56f35ca.tar.gz postgresql-fb8e3f15c095e00438c24e729dd4f4bfb56f35ca.zip | |
Add code to preserve paren level display after \g, as submitted months ago.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/psql/mainloop.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c index 253adb129ee..954b5752741 100644 --- a/src/bin/psql/mainloop.c +++ b/src/bin/psql/mainloop.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.45 2001/12/28 05:01:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.46 2002/02/18 05:57:41 momjian Exp $ */ #include "postgres_fe.h" #include "mainloop.h" @@ -447,7 +447,6 @@ MainLoop(FILE *source) { const char *end_of_cmd = NULL; - paren_level = 0; line[i - prevlen] = '\0'; /* overwrites backslash */ /* is there anything else on the line for the command? */ @@ -473,7 +472,7 @@ MainLoop(FILE *source) if ((slashCmdStatus == CMD_SEND || slashCmdStatus == CMD_NEWEDIT) && query_buf->len == 0) { - /* copy previous buffer to current for for handling */ + /* copy previous buffer to current for handling */ appendPQExpBufferStr(query_buf, previous_buf->data); } @@ -487,6 +486,9 @@ MainLoop(FILE *source) resetPQExpBuffer(query_buf); } + if (query_buf->len == 0 && previous_buf->len == 0) + paren_level = 0; + /* process anything left after the backslash command */ i += end_of_cmd - &line[i]; query_start = i; |