Fix unportable uses of <ctype.h> functions. Per Sergey Koposov.

tglsfdc · tglsfdc · commit 14720f7c5709 · 2005-09-01T15:34:31.000Z
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
@@ -8,12 +8,13 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.248 2005/08/06 20:41:58 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.249 2005/09/01 15:34:31 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
+#include <ctype.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <netinet/in.h>
@@ -2657,10 +2658,10 @@ CopyReadLineCSV(CopyState cstate)
 static int
 GetDecimalFromHex(char hex)
 {
-	if (isdigit(hex))
+	if (isdigit((unsigned char) hex))
 		return hex - '0';
 	else
-		return tolower(hex) - 'a' + 10;
+		return tolower((unsigned char) hex) - 'a' + 10;
 }
 
 /*
@@ -2802,15 +2803,15 @@ CopyReadAttributesText(CopyState cstate, int maxfields, char **fieldvals)
 						{
 							char hexchar = *cur_ptr;
 
-							if (isxdigit(hexchar))
+							if (isxdigit((unsigned char) hexchar))
 							{
 								int val = GetDecimalFromHex(hexchar);
 
 								cur_ptr++;
 								if (cur_ptr < line_end_ptr)
 								{
 									hexchar = *cur_ptr;
-									if (isxdigit(hexchar))
+									if (isxdigit((unsigned char) hexchar))
 									{
 										cur_ptr++;
 										val = (val << 4) + GetDecimalFromHex(hexchar);

Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,13 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.248 2005/08/06 20:41:58 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.249 2005/09/01 15:34:31 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`15`	`15`	`#include "postgres.h"`
`16`	`16`
	`17`	`+#include <ctype.h>`
`17`	`18`	`#include <unistd.h>`
`18`	`19`	`#include <sys/stat.h>`
`19`	`20`	`#include <netinet/in.h>`
`@@ -2657,10 +2658,10 @@ CopyReadLineCSV(CopyState cstate)`
`2657`	`2658`	`static int`
`2658`	`2659`	`GetDecimalFromHex(char hex)`
`2659`	`2660`	`{`
`2660`		`- if (isdigit(hex))`
	`2661`	`+ if (isdigit((unsigned char) hex))`
`2661`	`2662`	`return hex - '0';`
`2662`	`2663`	`else`
`2663`		`- return tolower(hex) - 'a' + 10;`
	`2664`	`+ return tolower((unsigned char) hex) - 'a' + 10;`
`2664`	`2665`	`}`
`2665`	`2666`
`2666`	`2667`	`/*`
`@@ -2802,15 +2803,15 @@ CopyReadAttributesText(CopyState cstate, int maxfields, char **fieldvals)`
`2802`	`2803`	`{`
`2803`	`2804`	`char hexchar = *cur_ptr;`
`2804`	`2805`
`2805`		`- if (isxdigit(hexchar))`
	`2806`	`+ if (isxdigit((unsigned char) hexchar))`
`2806`	`2807`	`{`
`2807`	`2808`	`int val = GetDecimalFromHex(hexchar);`
`2808`	`2809`
`2809`	`2810`	`cur_ptr++;`
`2810`	`2811`	`if (cur_ptr < line_end_ptr)`
`2811`	`2812`	`{`
`2812`	`2813`	`hexchar = *cur_ptr;`
`2813`		`- if (isxdigit(hexchar))`
	`2814`	`+ if (isxdigit((unsigned char) hexchar))`
`2814`	`2815`	`{`
`2815`	`2816`	`cur_ptr++;`
`2816`	`2817`	`val = (val << 4) + GetDecimalFromHex(hexchar);`