Avoid non-constant format string argument to fprintf().

hlinnaka · hlinnaka · commit bff41b2b8938 · 2020-08-18T13:13:44.000+03:00
As Tom Lane pointed out, it could defeat the compiler's printf() format string verification. Backpatch to v12, like that patch that introduced it. Discussion: https://www.postgresql.org/message-id/1069283.1597672779%40sss.pgh.pa.us
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -860,7 +860,7 @@ progress_report(int tablespacenum, const char *filename,
 	 * Stay on the same line if reporting to a terminal and we're not done
 	 * yet.
 	 */
-	fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");
+	fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);
 }
 
 static int32
diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c
@@ -166,7 +166,7 @@ progress_report(bool finished)
 	 * Stay on the same line if reporting to a terminal and we're not done
 	 * yet.
 	 */
-	fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");
+	fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);
 }
 
 static bool
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
@@ -572,7 +572,7 @@ progress_report(bool finished)
 	 * Stay on the same line if reporting to a terminal and we're not done
 	 * yet.
 	 */
-	fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");
+	fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -860,7 +860,7 @@ progress_report(int tablespacenum, const char *filename,`
`860`	`860`	`* Stay on the same line if reporting to a terminal and we're not done`
`861`	`861`	`* yet.`
`862`	`862`	`*/`
`863`		`- fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");`
	`863`	`+ fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);`
`864`	`864`	`}`
`865`	`865`
`866`	`866`	`static int32`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ progress_report(bool finished)`
`166`	`166`	`* Stay on the same line if reporting to a terminal and we're not done`
`167`	`167`	`* yet.`
`168`	`168`	`*/`
`169`		`- fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");`
	`169`	`+ fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`static bool`
Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@ progress_report(bool finished)`
`572`	`572`	`* Stay on the same line if reporting to a terminal and we're not done`
`573`	`573`	`* yet.`
`574`	`574`	`*/`
`575`		`- fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");`
	`575`	`+ fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);`
`576`	`576`	`}`
`577`	`577`
`578`	`578`	`/*`