Awhile back we replaced all uses of strcasecmp and strncasecmp with

tglsfdc · tglsfdc · commit 4a2972d691ee · 2005-07-25T04:52:32.000Z
pg_strcasecmp and pg_strncasecmp ... but I see some of the former have
crept back in.
Eternal vigilance is the price of locale independence, apparently.
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.126 2005/06/27 02:04:24 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.127 2005/07/25 04:52:31 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -234,7 +234,7 @@ pg_krb5_recvauth(Port *port)
 
 	kusername = pg_an_to_ln(kusername);
 	if (pg_krb_caseins_users)
-		ret = strncasecmp(port->user_name, kusername, SM_DATABASE_USER);
+		ret = pg_strncasecmp(port->user_name, kusername, SM_DATABASE_USER);
 	else
 		ret = strncmp(port->user_name, kusername, SM_DATABASE_USER);
 	if (ret)
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.92 2005/07/10 16:13:12 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.93 2005/07/25 04:52:31 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -829,7 +829,7 @@ check_encodings_match(int pg_enc, const char *ctype)
 	for (i = 0; encoding_match_list[i].system_enc_name; i++)
 	{
 		if (pg_enc == encoding_match_list[i].pg_enc_code
-		 && strcasecmp(sys, encoding_match_list[i].system_enc_name) == 0)
+		 && pg_strcasecmp(sys, encoding_match_list[i].system_enc_name) == 0)
 		{
 			free(sys);
 			return;
@@ -860,7 +860,7 @@ find_matching_encoding(const char *ctype)
 
 	for (i = 0; encoding_match_list[i].system_enc_name; i++)
 	{
-		if (strcasecmp(sys, encoding_match_list[i].system_enc_name) == 0)
+		if (pg_strcasecmp(sys, encoding_match_list[i].system_enc_name) == 0)
 		{
 			free(sys);
 			return encoding_match_list[i].pg_enc_code;
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.59 2005/07/10 16:13:13 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.60 2005/07/25 04:52:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -911,7 +911,7 @@ pgwin32_CommandLine(bool registration)
 
 	if (registration)
 	{
-		if (strcasecmp(cmdLine + strlen(cmdLine) - 4, ".exe"))
+		if (pg_strcasecmp(cmdLine + strlen(cmdLine) - 4, ".exe"))
 		{
 			/* If commandline does not end in .exe, append it */
 			strcat(cmdLine, ".exe");
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.64 2005/07/18 19:12:09 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.65 2005/07/25 04:52:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -828,8 +828,8 @@ makeAlterConfigCommand(const char *arrayitem, const char *type, const char *name
 	 * Some GUC variable names are 'LIST' type and hence must not be
 	 * quoted.
 	 */
-	if (strcasecmp(mine, "DateStyle") == 0
-		|| strcasecmp(mine, "search_path") == 0)
+	if (pg_strcasecmp(mine, "DateStyle") == 0
+		|| pg_strcasecmp(mine, "search_path") == 0)
 		appendPQExpBuffer(buf, "%s", pos + 1);
 	else
 		appendStringLiteral(buf, pos + 1, false);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.126 2005/06/27 02:04:24 neilc Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.127 2005/07/25 04:52:31 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -234,7 +234,7 @@ pg_krb5_recvauth(Port *port)`
`234`	`234`
`235`	`235`	`kusername = pg_an_to_ln(kusername);`
`236`	`236`	`if (pg_krb_caseins_users)`
`237`		`- ret = strncasecmp(port->user_name, kusername, SM_DATABASE_USER);`
	`237`	`+ ret = pg_strncasecmp(port->user_name, kusername, SM_DATABASE_USER);`
`238`	`238`	`else`
`239`	`239`	`ret = strncmp(port->user_name, kusername, SM_DATABASE_USER);`
`240`	`240`	`if (ret)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`* Portions Copyright (c) 1994, Regents of the University of California`
`43`	`43`	`* Portions taken from FreeBSD.`
`44`	`44`	`*`
`45`		`- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.92 2005/07/10 16:13:12 momjian Exp $`
	`45`	`+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.93 2005/07/25 04:52:31 tgl Exp $`
`46`	`46`	`*`
`47`	`47`	`*-------------------------------------------------------------------------`
`48`	`48`	`*/`
`@@ -829,7 +829,7 @@ check_encodings_match(int pg_enc, const char *ctype)`
`829`	`829`	`for (i = 0; encoding_match_list[i].system_enc_name; i++)`
`830`	`830`	`{`
`831`	`831`	`if (pg_enc == encoding_match_list[i].pg_enc_code`
`832`		`- && strcasecmp(sys, encoding_match_list[i].system_enc_name) == 0)`
	`832`	`+ && pg_strcasecmp(sys, encoding_match_list[i].system_enc_name) == 0)`
`833`	`833`	`{`
`834`	`834`	`free(sys);`
`835`	`835`	`return;`
`@@ -860,7 +860,7 @@ find_matching_encoding(const char *ctype)`
`860`	`860`
`861`	`861`	`for (i = 0; encoding_match_list[i].system_enc_name; i++)`
`862`	`862`	`{`
`863`		`- if (strcasecmp(sys, encoding_match_list[i].system_enc_name) == 0)`
	`863`	`+ if (pg_strcasecmp(sys, encoding_match_list[i].system_enc_name) == 0)`
`864`	`864`	`{`
`865`	`865`	`free(sys);`
`866`	`866`	`return encoding_match_list[i].pg_enc_code;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.59 2005/07/10 16:13:13 momjian Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.60 2005/07/25 04:52:32 tgl Exp $`
`8`	`8`	`*`
`9`	`9`	`*-------------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -911,7 +911,7 @@ pgwin32_CommandLine(bool registration)`
`911`	`911`
`912`	`912`	`if (registration)`
`913`	`913`	`{`
`914`		`- if (strcasecmp(cmdLine + strlen(cmdLine) - 4, ".exe"))`
	`914`	`+ if (pg_strcasecmp(cmdLine + strlen(cmdLine) - 4, ".exe"))`
`915`	`915`	`{`
`916`	`916`	`/* If commandline does not end in .exe, append it */`
`917`	`917`	`strcat(cmdLine, ".exe");`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.64 2005/07/18 19:12:09 tgl Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.65 2005/07/25 04:52:32 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -828,8 +828,8 @@ makeAlterConfigCommand(const char arrayitem, const char type, const char *name`
`828`	`828`	`* Some GUC variable names are 'LIST' type and hence must not be`
`829`	`829`	`* quoted.`
`830`	`830`	`*/`
`831`		`- if (strcasecmp(mine, "DateStyle") == 0`
`832`		`- \|\| strcasecmp(mine, "search_path") == 0)`
	`831`	`+ if (pg_strcasecmp(mine, "DateStyle") == 0`
	`832`	`+ \|\| pg_strcasecmp(mine, "search_path") == 0)`
`833`	`833`	`appendPQExpBuffer(buf, "%s", pos + 1);`
`834`	`834`	`else`
`835`	`835`	`appendStringLiteral(buf, pos + 1, false);`