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

hlinnaka · hlinnaka · commit aecefffc3f80 · 2020-08-18T13:13:28.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
@@ -801,7 +801,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
@@ -165,7 +165,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
@@ -505,7 +505,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
`@@ -801,7 +801,7 @@ progress_report(int tablespacenum, const char *filename,`
`801`	`801`	`* Stay on the same line if reporting to a terminal and we're not done`
`802`	`802`	`* yet.`
`803`	`803`	`*/`
`804`		`- fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");`
	`804`	`+ fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);`
`805`	`805`	`}`
`806`	`806`
`807`	`807`	`static int32`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ progress_report(bool finished)`
`165`	`165`	`* Stay on the same line if reporting to a terminal and we're not done`
`166`	`166`	`* yet.`
`167`	`167`	`*/`
`168`		`- fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");`
	`168`	`+ fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`static bool`
Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ progress_report(bool finished)`
`505`	`505`	`* Stay on the same line if reporting to a terminal and we're not done`
`506`	`506`	`* yet.`
`507`	`507`	`*/`
`508`		`- fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");`
	`508`	`+ fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);`
`509`	`509`	`}`
`510`	`510`
`511`	`511`	`/*`