Oops, introduced a bug in EOF handling. Fix it.

bmomjian · bmomjian · commit febfe447a77c · 1997-01-13T02:35:32.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.48 1997/01/13 02:03:31 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.49 1997/01/13 02:35:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1285,8 +1285,9 @@ MainLoop(PsqlSettings * settings, FILE * source)
 
 	query_start = line;
 
-	if (line == NULL && !settings->quiet) {	/* No more input.  Time to quit */
-	    printf("EOF\n");	/* Goes on prompt line */
+	if (line == NULL) {	/* No more input.  Time to quit */
+	    if (!settings->quiet)
+		printf("EOF\n");	/* Goes on prompt line */
 	    eof = true;
 	} else {
 	    /* remove whitespaces on the right, incl. \n's */

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.48 1997/01/13 02:03:31 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.49 1997/01/13 02:35:32 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1285,8 +1285,9 @@ MainLoop(PsqlSettings * settings, FILE * source)`
`1285`	`1285`
`1286`	`1286`	`query_start = line;`
`1287`	`1287`
`1288`		`- if (line == NULL && !settings->quiet) { /* No more input. Time to quit */`
`1289`		`- printf("EOF\n"); /* Goes on prompt line */`
	`1288`	`+ if (line == NULL) { /* No more input. Time to quit */`
	`1289`	`+ if (!settings->quiet)`
	`1290`	`+ printf("EOF\n"); /* Goes on prompt line */`
`1290`	`1291`	`eof = true;`
`1291`	`1292`	`} else {`
`1292`	`1293`	`/* remove whitespaces on the right, incl. \n's */`