From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 20 Sep 2005 18:59:02 +0000 (+0000)
Subject: Return proper value for psql -f filename failure if filename open fails.
X-Git-Tag: REL8_1_0BETA3~155
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7159824e610ad5ab71c2e8fb1cbad3946e2d2b2;p=postgresql

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

Backpatch to 8.0.X.
---

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index b46c0f9574..c9a9e966d2 100644
--- 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,7 +1325,7 @@ process_file(char *filename)
 	char	   *oldfilename;
 
 	if (!filename)
-		return false;
+		return EXIT_FAILURE;
 
 	canonicalize_path(filename);
 	fd = fopen(filename, PG_BINARY_R);
@@ -1332,7 +1333,7 @@ process_file(char *filename)
 	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
index 673e988745..d1c90d2b95 100644
--- 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);
 }