Do not strip whitespace within quotes.

petere · petere · commit bd6f02e7e6d5 · 2001-02-28T20:39:42.000Z
diff --git 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.35 2001/02/10 02:31:28 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.36 2001/02/28 20:39:42 petere Exp $
  */
 #include "postgres_fe.h"
 #include "mainloop.h"
@@ -249,7 +249,7 @@ MainLoop(FILE *source)
 		pset.lineno++;
 
 		/* nothing left on line? then ignore */
-		if (line[0] == '\0')
+		if (line[0] == '\0' && !in_quote)
 		{
 			free(line);
 			continue;
@@ -510,7 +510,7 @@ MainLoop(FILE *source)
 
 
 		/* Put the rest of the line in the query buffer. */
-		if (line[query_start + strspn(line + query_start, " \t\n\r")] != '\0')
+		if (in_quote || line[query_start + strspn(line + query_start, " \t\n\r")] != '\0')
 		{
 			if (query_buf->len > 0)
 				appendPQExpBufferChar(query_buf, '\n');

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.35 2001/02/10 02:31:28 tgl Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.36 2001/02/28 20:39:42 petere Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "mainloop.h"`
`@@ -249,7 +249,7 @@ MainLoop(FILE *source)`
`249`	`249`	`pset.lineno++;`
`250`	`250`
`251`	`251`	`/* nothing left on line? then ignore */`
`252`		`- if (line[0] == '\0')`
	`252`	`+ if (line[0] == '\0' && !in_quote)`
`253`	`253`	`{`
`254`	`254`	`free(line);`
`255`	`255`	`continue;`
`@@ -510,7 +510,7 @@ MainLoop(FILE *source)`
`510`	`510`
`511`	`511`
`512`	`512`	`/* Put the rest of the line in the query buffer. */`
`513`		`- if (line[query_start + strspn(line + query_start, " \t\n\r")] != '\0')`
	`513`	`+ if (in_quote \|\| line[query_start + strspn(line + query_start, " \t\n\r")] != '\0')`
`514`	`514`	`{`
`515`	`515`	`if (query_buf->len > 0)`
`516`	`516`	`appendPQExpBufferChar(query_buf, '\n');`