Fix unportable code in pgbench.

tglsfdc · tglsfdc · commit 7e5569fdee0c · 2019-04-17T17:30:29.000-04:00
The buildfarm points out that UINT64_FORMAT might not work with sscanf; it's calibrated for our printf implementation, which might not agree with the platform-supplied sscanf. Fall back to just accepting an unsigned long, which is already more than the documentation promises. Oversight in e6c3ba7; back-patch to v11, as that was.
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
@@ -4742,16 +4742,19 @@ set_random_seed(const char *seed)
 	}
 	else
 	{
-		/* parse seed unsigned int value */
+		/* parse unsigned-int seed value */
+		unsigned long ulseed;
 		char		garbage;
 
-		if (sscanf(seed, UINT64_FORMAT "%c", &iseed, &garbage) != 1)
+		/* Don't try to use UINT64_FORMAT here; it might not work for sscanf */
+		if (sscanf(seed, "%lu%c", &ulseed, &garbage) != 1)
 		{
 			fprintf(stderr,
 					"unrecognized random seed option \"%s\": expecting an unsigned integer, \"time\" or \"rand\"\n",
 					seed);
 			return false;
 		}
+		iseed = (uint64) ulseed;
 	}
 
 	if (seed != NULL)

Original file line number	Diff line number	Diff line change
`@@ -4742,16 +4742,19 @@ set_random_seed(const char *seed)`
`4742`	`4742`	`}`
`4743`	`4743`	`else`
`4744`	`4744`	`{`
`4745`		`- /* parse seed unsigned int value */`
	`4745`	`+ /* parse unsigned-int seed value */`
	`4746`	`+ unsigned long ulseed;`
`4746`	`4747`	`char garbage;`
`4747`	`4748`
`4748`		`- if (sscanf(seed, UINT64_FORMAT "%c", &iseed, &garbage) != 1)`
	`4749`	`+ /* Don't try to use UINT64_FORMAT here; it might not work for sscanf */`
	`4750`	`+ if (sscanf(seed, "%lu%c", &ulseed, &garbage) != 1)`
`4749`	`4751`	`{`
`4750`	`4752`	`fprintf(stderr,`
`4751`	`4753`	`"unrecognized random seed option \"%s\": expecting an unsigned integer, \"time\" or \"rand\"\n",`
`4752`	`4754`	`seed);`
`4753`	`4755`	`return false;`
`4754`	`4756`	`}`
	`4757`	`+ iseed = (uint64) ulseed;`
`4755`	`4758`	`}`
`4756`	`4759`
`4757`	`4760`	`if (seed != NULL)`