mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Backpatch to 8.0.X.
This commit is contained in:
Bruce Momjian 2005-09-20 18:59:02 +00:00
parent 408c140266
commit b7159824e6
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/psql/command.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2005, PostgreSQL Global Development Group * 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 "postgres_fe.h"
#include "command.h" #include "command.h"
@ -1314,7 +1314,8 @@ do_edit(const char *filename_arg, PQExpBuffer query_buf)
* process_file * process_file
* *
* Read commands from filename and then them to the main processing loop * 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 int
process_file(char *filename) process_file(char *filename)
@ -1324,7 +1325,7 @@ process_file(char *filename)
char *oldfilename; char *oldfilename;
if (!filename) if (!filename)
return false; return EXIT_FAILURE;
canonicalize_path(filename); canonicalize_path(filename);
fd = fopen(filename, PG_BINARY_R); fd = fopen(filename, PG_BINARY_R);
@ -1332,7 +1333,7 @@ process_file(char *filename)
if (!fd) if (!fd)
{ {
psql_error("%s: %s\n", filename, strerror(errno)); psql_error("%s: %s\n", filename, strerror(errno));
return false; return EXIT_FAILURE;
} }
oldfilename = pset.inputfile; oldfilename = pset.inputfile;

6
src/bin/psql/startup.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2005, PostgreSQL Global Development Group * 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" #include "postgres_fe.h"
@ -690,9 +690,9 @@ process_psqlrc_file(char *filename)
sprintf(psqlrc, "%s-%s", filename, PG_VERSION); sprintf(psqlrc, "%s-%s", filename, PG_VERSION);
if (access(psqlrc, R_OK) == 0) if (access(psqlrc, R_OK) == 0)
process_file(psqlrc); (void)process_file(psqlrc);
else if (access(filename, R_OK) == 0) else if (access(filename, R_OK) == 0)
process_file(filename); (void)process_file(filename);
free(psqlrc); free(psqlrc);
} }