Commitb715982

committed

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

Backpatch to 8.0.X.

1 parent408c140 commitb715982Copy full SHA for b715982

File tree

-7

lines changed

-7

lines changed

Lines changed: 5 additions & 4 deletions

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/command.c,v 1.152 2005/08/14 18:49:30 tgl Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.153 2005/09/20 18:59:01 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"command.h"`
`@@ -1314,7 +1314,8 @@ do_edit(const char *filename_arg, PQExpBuffer query_buf)`
`1314`	`1314`	`* process_file`
`1315`	`1315`	`*`
`1316`	`1316`	`* Read commands from filename and then them to the main processing loop`
`1317`		`- * Handler for \i, but can be used for other things as well.`
	`1317`	`+ * Handler for \i, but can be used for other things as well. Returns`
	`1318`	`+ * MainLoop() error code.`
`1318`	`1319`	`*/`
`1319`	`1320`	`int`
`1320`	`1321`	`process_file(char*filename)`
`@@ -1324,15 +1325,15 @@ process_file(char *filename)`
`1324`	`1325`	`char*oldfilename;`
`1325`	`1326`
`1326`	`1327`	`if (!filename)`
`1327`		`-returnfalse;`
	`1328`	`+returnEXIT_FAILURE;`
`1328`	`1329`
`1329`	`1330`	`canonicalize_path(filename);`
`1330`	`1331`	`fd=fopen(filename,PG_BINARY_R);`
`1331`	`1332`
`1332`	`1333`	`if (!fd)`
`1333`	`1334`	`{`
`1334`	`1335`	`psql_error("%s: %s\n",filename,strerror(errno));`
`1335`		`-returnfalse;`
	`1336`	`+returnEXIT_FAILURE;`
`1336`	`1337`	`}`
`1337`	`1338`
`1338`	`1339`	`oldfilename=pset.inputfile;`

Lines changed: 3 additions & 3 deletions

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`	`elseif (access(filename,R_OK)==0)`
`695`		`-process_file(filename);`
	`695`	`+(void)process_file(filename);`
`696`	`696`	`free(psqlrc);`
`697`	`697`	`}`
`698`	`698`

Comments

(0)