psql: Improve error display for psql -f -

petere · petere · commit 89c2f573a392 · 2012-03-01T19:58:10.000+02:00
Running "psql -f -" used to print psql:<stdin>:1: ERROR: blah but that got broken between 8.4 and 9.0 (commit b291c0f), and now it printed psql:-:1: ERROR: blah This reverts to the old behavior and cleans up some code that was left dead or useless by the mentioned commit.
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
@@ -2062,14 +2062,17 @@ process_file(char *filename, bool single_txn, bool use_relative_path)
 		}
 
 		fd = fopen(filename, PG_BINARY_R);
+
+		if (!fd)
+		{
+			psql_error("%s: %s\n", filename, strerror(errno));
+			return EXIT_FAILURE;
+		}
 	}
 	else
-		fd = stdin;
-
-	if (!fd)
 	{
-		psql_error("%s: %s\n", filename, strerror(errno));
-		return EXIT_FAILURE;
+		fd = stdin;
+		filename = "<stdin>";	/* for future error messages */
 	}
 
 	oldfilename = pset.inputfile;
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
@@ -313,8 +313,6 @@ main(int argc, char *argv[])
 			printf(_("Type \"help\" for help.\n\n"));
 		if (!pset.notty)
 			initializeInput(options.no_readline ? 0 : 1);
-		if (options.action_string)		/* -f - was used */
-			pset.inputfile = "<stdin>";
 
 		successResult = MainLoop(stdin);
 	}

Original file line number	Diff line number	Diff line change
`@@ -2062,14 +2062,17 @@ process_file(char *filename, bool single_txn, bool use_relative_path)`
`2062`	`2062`	`}`
`2063`	`2063`
`2064`	`2064`	`fd = fopen(filename, PG_BINARY_R);`
	`2065`	`+`
	`2066`	`+ if (!fd)`
	`2067`	`+ {`
	`2068`	`+ psql_error("%s: %s\n", filename, strerror(errno));`
	`2069`	`+ return EXIT_FAILURE;`
	`2070`	`+ }`
`2065`	`2071`	`}`
`2066`	`2072`	`else`
`2067`		`- fd = stdin;`
`2068`		`-`
`2069`		`- if (!fd)`
`2070`	`2073`	`{`
`2071`		`- psql_error("%s: %s\n", filename, strerror(errno));`
`2072`		`- return EXIT_FAILURE;`
	`2074`	`+ fd = stdin;`
	`2075`	`+ filename = "<stdin>"; /* for future error messages */`
`2073`	`2076`	`}`
`2074`	`2077`
`2075`	`2078`	`oldfilename = pset.inputfile;`
Original file line number	Diff line number	Diff line change
`@@ -313,8 +313,6 @@ main(int argc, char *argv[])`
`313`	`313`	`printf(_("Type \"help\" for help.\n\n"));`
`314`	`314`	`if (!pset.notty)`
`315`	`315`	`initializeInput(options.no_readline ? 0 : 1);`
`316`		`- if (options.action_string) /* -f - was used */`
`317`		`- pset.inputfile = "<stdin>";`
`318`	`316`
`319`	`317`	`successResult = MainLoop(stdin);`
`320`	`318`	`}`