Fix for \e on empty file.

bmomjian · bmomjian · commit 0f62b3024e8a · 1997-11-17T05:23:11.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.108 1997/11/16 05:32:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.109 1997/11/17 05:23:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2099,7 +2099,7 @@ MainLoop(PsqlSettings *pset, char *query, FILE *source)
 		 * for next command
 		 */
 
-		if (line == NULL)
+		if (line == NULL || *line == '\0')
 		{		/* 	No more input.	Time to quit, or \i done */
 			if (!pset->quiet)
 				printf("EOF\n");/* Goes on prompt line */

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.108 1997/11/16 05:32:16 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.109 1997/11/17 05:23:11 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)`
	`2102`	`+ if (line == NULL \|\| *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 */`