Return proper value for psql -f filename failure if filename open fails.

bmomjian · bmomjian · commit b7159824e610 · 2005-09-20T18:59:02.000Z
Backpatch to 8.0.X.
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.152 2005/08/14 18:49:30 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.153 2005/09/20 18:59:01 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "command.h"
@@ -1314,7 +1314,8 @@ do_edit(const char *filename_arg, PQExpBuffer query_buf)
  * process_file
  *
  * Read commands from filename and then them to the main processing loop
- * Handler for \i, but can be used for other things as well.
+ * Handler for \i, but can be used for other things as well.  Returns
+ * MainLoop() error code.
  */
 int
 process_file(char *filename)
@@ -1324,15 +1325,15 @@ process_file(char *filename)
 	char	   *oldfilename;
 
 	if (!filename)
-		return false;
+		return EXIT_FAILURE;
 
 	canonicalize_path(filename);
 	fd = fopen(filename, PG_BINARY_R);
 
 	if (!fd)
 	{
 		psql_error("%s: %s\n", filename, strerror(errno));
-		return false;
+		return EXIT_FAILURE;
 	}
 
 	oldfilename = pset.inputfile;
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.122 2005/09/05 18:05:13 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.123 2005/09/20 18:59:02 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -690,9 +690,9 @@ process_psqlrc_file(char *filename)
 	sprintf(psqlrc, "%s-%s", filename, PG_VERSION);
 
 	if (access(psqlrc, R_OK) == 0)
-		process_file(psqlrc);
+		(void)process_file(psqlrc);
 	else if (access(filename, R_OK) == 0)
-		process_file(filename);
+		(void)process_file(filename);
 	free(psqlrc);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2005, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.122 2005/09/05 18:05:13 tgl Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.123 2005/09/20 18:59:02 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`
`@@ -690,9 +690,9 @@ process_psqlrc_file(char *filename)`
`690`	`690`	`sprintf(psqlrc, "%s-%s", filename, PG_VERSION);`
`691`	`691`
`692`	`692`	`if (access(psqlrc, R_OK) == 0)`
`693`		`- process_file(psqlrc);`
	`693`	`+ (void)process_file(psqlrc);`
`694`	`694`	`else if (access(filename, R_OK) == 0)`
`695`		`- process_file(filename);`
	`695`	`+ (void)process_file(filename);`
`696`	`696`	`free(psqlrc);`
`697`	`697`	`}`
`698`	`698`