Fix \e for empty file.

bmomjian · bmomjian · commit d0928a3af32a · 1997-11-17T17:54:24.000Z
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.109 1997/11/17 05:23:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.110 1997/11/17 17:54:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2099,7 +2099,7 @@ MainLoop(PsqlSettings *pset, char *query, FILE *source)
 		 * for next command
 		 */
 
-		if (line == NULL || *line == '\0')
+		if (line == NULL || (!interactive && *line == '\0'))
 		{		/* 	No more input.	Time to quit, or \i done */
 			if (!pset->quiet)
 				printf("EOF\n");/* Goes on prompt line */
@@ -2127,6 +2127,7 @@ MainLoop(PsqlSettings *pset, char *query, FILE *source)
 		if (!interactive && !pset->singleStep && !pset->quiet)
 			fprintf(stderr, "%s\n", line);
 
+		slashCmdStatus = CMD_UNKNOWN;
 		/* nothing on line after trimming? then ignore */
 		if (line[0] == '\0')
 		{
@@ -2265,7 +2266,6 @@ MainLoop(PsqlSettings *pset, char *query, FILE *source)
 			continue;
 		}
 
-		slashCmdStatus = CMD_UNKNOWN;
 		if (!in_quote && query_start[0] == '\\')
 		{
 			slashCmdStatus = HandleSlashCmds(pset,

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.109 1997/11/17 05:23:11 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.110 1997/11/17 17:54:24 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -2099,7 +2099,7 @@ MainLoop(PsqlSettings pset, char query, FILE *source)`
`2099`	`2099`	`* for next command`
`2100`	`2100`	`*/`
`2101`	`2101`
`2102`		`- if (line == NULL \|\| *line == '\0')`
	`2102`	`+ if (line == NULL \|\| (!interactive && *line == '\0'))`
`2103`	`2103`	`{ /* No more input. Time to quit, or \i done */`
`2104`	`2104`	`if (!pset->quiet)`
`2105`	`2105`	`printf("EOF\n");/* Goes on prompt line */`
`@@ -2127,6 +2127,7 @@ MainLoop(PsqlSettings pset, char query, FILE *source)`
`2127`	`2127`	`if (!interactive && !pset->singleStep && !pset->quiet)`
`2128`	`2128`	`fprintf(stderr, "%s\n", line);`
`2129`	`2129`
	`2130`	`+ slashCmdStatus = CMD_UNKNOWN;`
`2130`	`2131`	`/* nothing on line after trimming? then ignore */`
`2131`	`2132`	`if (line[0] == '\0')`
`2132`	`2133`	`{`
`@@ -2265,7 +2266,6 @@ MainLoop(PsqlSettings pset, char query, FILE *source)`
`2265`	`2266`	`continue;`
`2266`	`2267`	`}`
`2267`	`2268`
`2268`		`- slashCmdStatus = CMD_UNKNOWN;`
`2269`	`2269`	`if (!in_quote && query_start[0] == '\\')`
`2270`	`2270`	`{`
`2271`	`2271`	`slashCmdStatus = HandleSlashCmds(pset,`