Minor fixups for psql's process_file() function.

robertmhaas · robertmhaas · commit 1fea0c05eb4a · 2010-10-26T19:35:33.000-04:00
- Avoid closing stdin, since we didn't open it.  Previously multiple
inclusions of stdin would be terminated with a single quit, now a separate
quit is needed for each invocation. Previous behavior also accessed stdin
after it was fclose()d, which is undefined behavior per ANSI C.

- Properly restore pset.inputfile, since the caller expects to be able
to free that memory.

Marti Raudsepp
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
@@ -1987,7 +1987,10 @@ process_file(char *filename, bool single_txn)
 		if ((res = PSQLexec("BEGIN", false)) == NULL)
 		{
 			if (pset.on_error_stop)
-				return EXIT_USER;
+			{
+				result = EXIT_USER;
+				goto error;
+			}
 		}
 		else
 			PQclear(res);
@@ -2000,13 +2003,19 @@ process_file(char *filename, bool single_txn)
 		if ((res = PSQLexec("COMMIT", false)) == NULL)
 		{
 			if (pset.on_error_stop)
-				return EXIT_USER;
+			{
+				result = EXIT_USER;
+				goto error;
+			}
 		}
 		else
 			PQclear(res);
 	}
 
-	fclose(fd);
+error:
+	if (fd != stdin)
+		fclose(fd);
+
 	pset.inputfile = oldfilename;
 	return result;
 }

Original file line number	Diff line number	Diff line change
`@@ -1987,7 +1987,10 @@ process_file(char *filename, bool single_txn)`
`1987`	`1987`	`if ((res = PSQLexec("BEGIN", false)) == NULL)`
`1988`	`1988`	`{`
`1989`	`1989`	`if (pset.on_error_stop)`
`1990`		`- return EXIT_USER;`
	`1990`	`+ {`
	`1991`	`+ result = EXIT_USER;`
	`1992`	`+ goto error;`
	`1993`	`+ }`
`1991`	`1994`	`}`
`1992`	`1995`	`else`
`1993`	`1996`	`PQclear(res);`
`@@ -2000,13 +2003,19 @@ process_file(char *filename, bool single_txn)`
`2000`	`2003`	`if ((res = PSQLexec("COMMIT", false)) == NULL)`
`2001`	`2004`	`{`
`2002`	`2005`	`if (pset.on_error_stop)`
`2003`		`- return EXIT_USER;`
	`2006`	`+ {`
	`2007`	`+ result = EXIT_USER;`
	`2008`	`+ goto error;`
	`2009`	`+ }`
`2004`	`2010`	`}`
`2005`	`2011`	`else`
`2006`	`2012`	`PQclear(res);`
`2007`	`2013`	`}`
`2008`	`2014`
`2009`		`- fclose(fd);`
	`2015`	`+error:`
	`2016`	`+ if (fd != stdin)`
	`2017`	`+ fclose(fd);`
	`2018`	`+`
`2010`	`2019`	`pset.inputfile = oldfilename;`
`2011`	`2020`	`return result;`
`2012`	`2021`	`}`