Make failure to open psql's --log-file fatal.

tglsfdc · tglsfdc · commit 521f0458dcd7 · 2015-12-08T17:14:46.000-05:00
Commit 344cdff made failure to open the target of --output fatal. For consistency, the --log-file switch should behave similarly. Like the previous commit, back-patch to 9.5 but no further. Daniel Verite
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
@@ -287,8 +287,11 @@ main(int argc, char *argv[])
 	{
 		pset.logfile = fopen(options.logfilename, "a");
 		if (!pset.logfile)
+		{
 			fprintf(stderr, _("%s: could not open log file \"%s\": %s\n"),
 					pset.progname, options.logfilename, strerror(errno));
+			exit(EXIT_FAILURE);
+		}
 	}
 
 	if (!options.no_psqlrc)

Original file line number	Diff line number	Diff line change
`@@ -287,8 +287,11 @@ main(int argc, char *argv[])`
`287`	`287`	`{`
`288`	`288`	`pset.logfile = fopen(options.logfilename, "a");`
`289`	`289`	`if (!pset.logfile)`
	`290`	`+ {`
`290`	`291`	`fprintf(stderr, _("%s: could not open log file \"%s\": %s\n"),`
`291`	`292`	`pset.progname, options.logfilename, strerror(errno));`
	`293`	`+ exit(EXIT_FAILURE);`
	`294`	`+ }`
`292`	`295`	`}`
`293`	`296`
`294`	`297`	`if (!options.no_psqlrc)`