diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-04-14 23:43:44 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-04-14 23:43:44 +0000 |
| commit | ffc9812451c67293ea2ff4cf60ba8c195ca9616b (patch) | |
| tree | 2e3fa85f0f580355f6b0e6b3417413cd943b03d8 /src/bin/psql/mainloop.c | |
| parent | ade95052f859c4024af415a09cf2b1fdfa95f764 (diff) | |
fixed another psql \e bug (handle newlines as whitespace)
repaired psql option scanning bug (special treatment to \g |pipe)
fixed ipcclean makefile
made configure look for Perl to handle psql help build gracefully
Diffstat (limited to 'src/bin/psql/mainloop.c')
| -rw-r--r-- | src/bin/psql/mainloop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c index a6f9d90c842..3e746a037f5 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.28 2000/04/12 17:16:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.29 2000/04/14 23:43:44 petere Exp $ */ #include "postgres.h" #include "mainloop.h" @@ -397,7 +397,7 @@ MainLoop(FILE *source) { line[i] = '\0'; /* is there anything else on the line? */ - if (line[query_start + strspn(line + query_start, " \t")] != '\0') + if (line[query_start + strspn(line + query_start, " \t\n\r")] != '\0') { /* @@ -441,7 +441,7 @@ MainLoop(FILE *source) line[i - prevlen] = '\0'; /* overwrites backslash */ /* is there anything else on the line for the command? */ - if (line[query_start + strspn(line + query_start, " \t")] != '\0') + if (line[query_start + strspn(line + query_start, " \t\n\r")] != '\0') { /* @@ -499,7 +499,7 @@ MainLoop(FILE *source) /* Put the rest of the line in the query buffer. */ - if (line[query_start + strspn(line + query_start, " \t\n")] != '\0') + if (line[query_start + strspn(line + query_start, " \t\n\r")] != '\0') { if (query_buf->len > 0) appendPQExpBufferChar(query_buf, '\n'); |