Rename base64 routines to avoid conflict with Solaris built-in functions.

tglsfdc · tglsfdc · commit d07f79a9cc7b · 2018-02-28T18:33:45.000-05:00
Solaris 11.4 has built-in functions named b64_encode and b64_decode. Rename ours to something else to avoid the conflict (fortunately, ours are static so the impact is limited). One could wish for less duplication of code in this area, but that would be a larger patch and not very suitable for back-patching. Since this is a portability fix, we want to put it into all supported branches. Report and initial patch by Rainer Orth, reviewed and adjusted a bit by Michael Paquier Discussion: https://postgr.es/m/ydd372wk28h.fsf@CeBiTec.Uni-Bielefeld.DE
diff --git a/contrib/pgcrypto/pgp-armor.c b/contrib/pgcrypto/pgp-armor.c
@@ -42,7 +42,7 @@ static const unsigned char _base64[] =
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 static int
-b64_encode(const uint8 *src, unsigned len, uint8 *dst)
+pg_base64_encode(const uint8 *src, unsigned len, uint8 *dst)
 {
 	uint8	   *p,
 			   *lend = dst + 76;
@@ -92,7 +92,7 @@ b64_encode(const uint8 *src, unsigned len, uint8 *dst)
 
 /* probably should use lookup table */
 static int
-b64_decode(const uint8 *src, unsigned len, uint8 *dst)
+pg_base64_decode(const uint8 *src, unsigned len, uint8 *dst)
 {
 	const uint8 *srcend = src + len,
 			   *s = src;
@@ -160,7 +160,7 @@ b64_decode(const uint8 *src, unsigned len, uint8 *dst)
 }
 
 static unsigned
-b64_enc_len(unsigned srclen)
+pg_base64_enc_len(unsigned srclen)
 {
 	/*
 	 * 3 bytes will be converted to 4, linefeed after 76 chars
@@ -169,7 +169,7 @@ b64_enc_len(unsigned srclen)
 }
 
 static unsigned
-b64_dec_len(unsigned srclen)
+pg_base64_dec_len(unsigned srclen)
 {
 	return (srclen * 3) >> 2;
 }
@@ -214,7 +214,7 @@ pgp_armor_encode(const uint8 *src, unsigned len, uint8 *dst)
 	memcpy(pos, armor_header, n);
 	pos += n;
 
-	n = b64_encode(src, len, pos);
+	n = pg_base64_encode(src, len, pos);
 	pos += n;
 
 	if (*(pos - 1) != '\n')
@@ -355,12 +355,12 @@ pgp_armor_decode(const uint8 *src, unsigned len, uint8 *dst)
 		goto out;
 
 	/* decode crc */
-	if (b64_decode(p + 1, 4, buf) != 3)
+	if (pg_base64_decode(p + 1, 4, buf) != 3)
 		goto out;
 	crc = (((long) buf[0]) << 16) + (((long) buf[1]) << 8) + (long) buf[2];
 
 	/* decode data */
-	res = b64_decode(base64_start, base64_end - base64_start, dst);
+	res = pg_base64_decode(base64_start, base64_end - base64_start, dst);
 
 	/* check crc */
 	if (res >= 0 && crc24(dst, res) != crc)
@@ -372,11 +372,11 @@ pgp_armor_decode(const uint8 *src, unsigned len, uint8 *dst)
 unsigned
 pgp_armor_enc_len(unsigned len)
 {
-	return b64_enc_len(len) + strlen(armor_header) + strlen(armor_footer) + 16;
+	return pg_base64_enc_len(len) + strlen(armor_header) + strlen(armor_footer) + 16;
 }
 
 unsigned
 pgp_armor_dec_len(unsigned len)
 {
-	return b64_dec_len(len);
+	return pg_base64_dec_len(len);
 }
diff --git a/src/backend/utils/adt/encode.c b/src/backend/utils/adt/encode.c
@@ -215,7 +215,7 @@ static const int8 b64lookup[128] = {
 };
 
 static unsigned
-b64_encode(const char *src, unsigned len, char *dst)
+pg_base64_encode(const char *src, unsigned len, char *dst)
 {
 	char	   *p,
 			   *lend = dst + 76;
@@ -262,7 +262,7 @@ b64_encode(const char *src, unsigned len, char *dst)
 }
 
 static unsigned
-b64_decode(const char *src, unsigned len, char *dst)
+pg_base64_decode(const char *src, unsigned len, char *dst)
 {
 	const char *srcend = src + len,
 			   *s = src;
@@ -331,14 +331,14 @@ b64_decode(const char *src, unsigned len, char *dst)
 
 
 static unsigned
-b64_enc_len(const char *src, unsigned srclen)
+pg_base64_enc_len(const char *src, unsigned srclen)
 {
 	/* 3 bytes will be converted to 4, linefeed after 76 chars */
 	return (srclen + 2) * 4 / 3 + srclen / (76 * 3 / 4);
 }
 
 static unsigned
-b64_dec_len(const char *src, unsigned srclen)
+pg_base64_dec_len(const char *src, unsigned srclen)
 {
 	return (srclen * 3) >> 2;
 }
@@ -531,7 +531,7 @@ static const struct
 	{
 		"base64",
 		{
-			b64_enc_len, b64_dec_len, b64_encode, b64_decode
+			pg_base64_enc_len, pg_base64_dec_len, pg_base64_encode, pg_base64_decode
 		}
 	},
 	{

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ static const unsigned char _base64[] =`
`42`	`42`	`"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";`
`43`	`43`
`44`	`44`	`static int`
`45`		`-b64_encode(const uint8 src, unsigned len, uint8 dst)`
	`45`	`+pg_base64_encode(const uint8 src, unsigned len, uint8 dst)`
`46`	`46`	`{`
`47`	`47`	`uint8 *p,`
`48`	`48`	`*lend = dst + 76;`
`@@ -92,7 +92,7 @@ b64_encode(const uint8 src, unsigned len, uint8 dst)`
`92`	`92`
`93`	`93`	`/* probably should use lookup table */`
`94`	`94`	`static int`
`95`		`-b64_decode(const uint8 src, unsigned len, uint8 dst)`
	`95`	`+pg_base64_decode(const uint8 src, unsigned len, uint8 dst)`
`96`	`96`	`{`
`97`	`97`	`const uint8 *srcend = src + len,`
`98`	`98`	`*s = src;`
`@@ -160,7 +160,7 @@ b64_decode(const uint8 src, unsigned len, uint8 dst)`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`static unsigned`
`163`		`-b64_enc_len(unsigned srclen)`
	`163`	`+pg_base64_enc_len(unsigned srclen)`
`164`	`164`	`{`
`165`	`165`	`/*`
`166`	`166`	`* 3 bytes will be converted to 4, linefeed after 76 chars`
`@@ -169,7 +169,7 @@ b64_enc_len(unsigned srclen)`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`static unsigned`
`172`		`-b64_dec_len(unsigned srclen)`
	`172`	`+pg_base64_dec_len(unsigned srclen)`
`173`	`173`	`{`
`174`	`174`	`return (srclen * 3) >> 2;`
`175`	`175`	`}`
`@@ -214,7 +214,7 @@ pgp_armor_encode(const uint8 src, unsigned len, uint8 dst)`
`214`	`214`	`memcpy(pos, armor_header, n);`
`215`	`215`	`pos += n;`
`216`	`216`
`217`		`- n = b64_encode(src, len, pos);`
	`217`	`+ n = pg_base64_encode(src, len, pos);`
`218`	`218`	`pos += n;`
`219`	`219`
`220`	`220`	`if (*(pos - 1) != '\n')`
`@@ -355,12 +355,12 @@ pgp_armor_decode(const uint8 src, unsigned len, uint8 dst)`
`355`	`355`	`goto out;`
`356`	`356`
`357`	`357`	`/* decode crc */`
`358`		`- if (b64_decode(p + 1, 4, buf) != 3)`
	`358`	`+ if (pg_base64_decode(p + 1, 4, buf) != 3)`
`359`	`359`	`goto out;`
`360`	`360`	`crc = (((long) buf[0]) << 16) + (((long) buf[1]) << 8) + (long) buf[2];`
`361`	`361`
`362`	`362`	`/* decode data */`
`363`		`- res = b64_decode(base64_start, base64_end - base64_start, dst);`
	`363`	`+ res = pg_base64_decode(base64_start, base64_end - base64_start, dst);`
`364`	`364`
`365`	`365`	`/* check crc */`
`366`	`366`	`if (res >= 0 && crc24(dst, res) != crc)`
`@@ -372,11 +372,11 @@ pgp_armor_decode(const uint8 src, unsigned len, uint8 dst)`
`372`	`372`	`unsigned`
`373`	`373`	`pgp_armor_enc_len(unsigned len)`
`374`	`374`	`{`
`375`		`- return b64_enc_len(len) + strlen(armor_header) + strlen(armor_footer) + 16;`
	`375`	`+ return pg_base64_enc_len(len) + strlen(armor_header) + strlen(armor_footer) + 16;`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`unsigned`
`379`	`379`	`pgp_armor_dec_len(unsigned len)`
`380`	`380`	`{`
`381`		`- return b64_dec_len(len);`
	`381`	`+ return pg_base64_dec_len(len);`
`382`	`382`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ static const int8 b64lookup[128] = {`
`215`	`215`	`};`
`216`	`216`
`217`	`217`	`static unsigned`
`218`		`-b64_encode(const char src, unsigned len, char dst)`
	`218`	`+pg_base64_encode(const char src, unsigned len, char dst)`
`219`	`219`	`{`
`220`	`220`	`char *p,`
`221`	`221`	`*lend = dst + 76;`
`@@ -262,7 +262,7 @@ b64_encode(const char src, unsigned len, char dst)`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`static unsigned`
`265`		`-b64_decode(const char src, unsigned len, char dst)`
	`265`	`+pg_base64_decode(const char src, unsigned len, char dst)`
`266`	`266`	`{`
`267`	`267`	`const char *srcend = src + len,`
`268`	`268`	`*s = src;`
`@@ -331,14 +331,14 @@ b64_decode(const char src, unsigned len, char dst)`
`331`	`331`
`332`	`332`
`333`	`333`	`static unsigned`
`334`		`-b64_enc_len(const char *src, unsigned srclen)`
	`334`	`+pg_base64_enc_len(const char *src, unsigned srclen)`
`335`	`335`	`{`
`336`	`336`	`/* 3 bytes will be converted to 4, linefeed after 76 chars */`
`337`	`337`	`return (srclen + 2) * 4 / 3 + srclen / (76 * 3 / 4);`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`static unsigned`
`341`		`-b64_dec_len(const char *src, unsigned srclen)`
	`341`	`+pg_base64_dec_len(const char *src, unsigned srclen)`
`342`	`342`	`{`
`343`	`343`	`return (srclen * 3) >> 2;`
`344`	`344`	`}`
`@@ -531,7 +531,7 @@ static const struct`
`531`	`531`	`{`
`532`	`532`	`"base64",`
`533`	`533`	`{`
`534`		`- b64_enc_len, b64_dec_len, b64_encode, b64_decode`
	`534`	`+ pg_base64_enc_len, pg_base64_dec_len, pg_base64_encode, pg_base64_decode`
`535`	`535`	`}`
`536`	`536`	`},`
`537`	`537`	`{`