pg_restore: Provide file name with one failure message

alvherre · alvherre · commit 4009571695a2 · 2020-05-08T19:38:46.000-04:00
Almost all error messages already include file name where relevant, but this one had been overlooked. Repair. Backpatch to 9.5. Author: Euler Taveira <euler.taveira@2ndquadrant.com> Discussion: https://postgr.es/m/CAH503wA_VOrcKL_43p9atRejCDYmOZ8MzfK9S6TJrQqBqNeAXA@mail.gmail.com Reviewed-by: Álvaro Herrera <alvherre@alvh.no-ip.org>
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
@@ -411,8 +411,8 @@ _PrintFileData(ArchiveHandle *AH, char *filename)
 
 	free(buf);
 	if (cfclose(cfp) !=0)
-		exit_horribly(modulename, "could not close data file: %s\n",
-					  strerror(errno));
+		exit_horribly(modulename, "could not close data file \"%s\": %s\n",
+					  filename, strerror(errno));
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -411,8 +411,8 @@ _PrintFileData(ArchiveHandle AH, char filename)`
`411`	`411`
`412`	`412`	`free(buf);`
`413`	`413`	`if (cfclose(cfp) !=0)`
`414`		`- exit_horribly(modulename, "could not close data file: %s\n",`
`415`		`- strerror(errno));`
	`414`	`+ exit_horribly(modulename, "could not close data file \"%s\": %s\n",`
	`415`	`+ filename, strerror(errno));`
`416`	`416`	`}`
`417`	`417`
`418`	`418`	`/*`