Fix portability bugs: char values passed to <ctype.h> functions must

tglsfdc · tglsfdc · commit 4351f8823df5 · 2004-01-04T04:17:01.000Z
be cast to unsigned char.  We have learned this the hard way before.
diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c
@@ -464,7 +464,7 @@ rstrdate(char *str, date * d)
 	for (i=0,j=0; i < 10; i++ )
 	{
 		/* ignore non-digits */
-		if ( isdigit(str[i]) )
+		if ( isdigit((unsigned char) str[i]) )
 		{
 			
 			/* j only increments if it is a digit */
@@ -910,8 +910,8 @@ void
 rupshift(char *str)
 {
 	for (; *str != '\0'; str++)
-		if (islower(*str))
-			*str = toupper(*str);
+		if (islower((unsigned char) *str))
+			*str = toupper((unsigned char) *str);
 	return;
 }
 
diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c
@@ -405,7 +405,7 @@ PGTYPESdate_defmt_asc(date * d, char *fmt, char *str)
 	reading_digit = 1;
 	for (i = 0; str[i]; i++)
 	{
-		if (!isdigit(str[i]))
+		if (!isdigit((unsigned char) str[i]))
 		{
 			reading_digit = 0;
 			break;
@@ -495,22 +495,22 @@ PGTYPESdate_defmt_asc(date * d, char *fmt, char *str)
 
 		/* convert the whole string to lower case */
 		for (i = 0; str_copy[i]; i++)
-			str_copy[i] = (char) tolower(str_copy[i]);
+			str_copy[i] = (char) tolower((unsigned char) str_copy[i]);
 	}
 
 	/* look for numerical tokens */
 	reading_digit = 0;
 	token_count = 0;
 	for (i = 0; i < strlen(str_copy); i++)
 	{
-		if (!isdigit(str_copy[i]) && reading_digit)
+		if (!isdigit((unsigned char) str_copy[i]) && reading_digit)
 		{
 			/* the token is finished */
 			token[token_count][1] = i - 1;
 			reading_digit = 0;
 			token_count++;
 		}
-		else if (isdigit(str_copy[i]) && !reading_digit)
+		else if (isdigit((unsigned char) str_copy[i]) && !reading_digit)
 		{
 			/* we have found a token */
 			token[token_count][0] = i;
@@ -565,7 +565,7 @@ PGTYPESdate_defmt_asc(date * d, char *fmt, char *str)
 		{
 			for (j = 0; j < PGTYPES_DATE_MONTH_MAXLENGTH; j++)
 			{
-				month_lower_tmp[j] = (char) tolower(list[i][j]);
+				month_lower_tmp[j] = (char) tolower((unsigned char) list[i][j]);
 				if (!month_lower_tmp[j])
 				{
 					/* properly terminated */

Original file line number	Diff line number	Diff line change
`@@ -464,7 +464,7 @@ rstrdate(char str, date d)`
`464`	`464`	`for (i=0,j=0; i < 10; i++ )`
`465`	`465`	`{`
`466`	`466`	`/* ignore non-digits */`
`467`		`- if ( isdigit(str[i]) )`
	`467`	`+ if ( isdigit((unsigned char) str[i]) )`
`468`	`468`	`{`
`469`	`469`
`470`	`470`	`/* j only increments if it is a digit */`
`@@ -910,8 +910,8 @@ void`
`910`	`910`	`rupshift(char *str)`
`911`	`911`	`{`
`912`	`912`	`for (; *str != '\0'; str++)`
`913`		`- if (islower(*str))`
`914`		`- str = toupper(str);`
	`913`	`+ if (islower((unsigned char) *str))`
	`914`	`+ str = toupper((unsigned char) str);`
`915`	`915`	`return;`
`916`	`916`	`}`
`917`	`917`
Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ PGTYPESdate_defmt_asc(date * d, char fmt, char str)`
`405`	`405`	`reading_digit = 1;`
`406`	`406`	`for (i = 0; str[i]; i++)`
`407`	`407`	`{`
`408`		`- if (!isdigit(str[i]))`
	`408`	`+ if (!isdigit((unsigned char) str[i]))`
`409`	`409`	`{`
`410`	`410`	`reading_digit = 0;`
`411`	`411`	`break;`
`@@ -495,22 +495,22 @@ PGTYPESdate_defmt_asc(date * d, char fmt, char str)`
`495`	`495`
`496`	`496`	`/* convert the whole string to lower case */`
`497`	`497`	`for (i = 0; str_copy[i]; i++)`
`498`		`- str_copy[i] = (char) tolower(str_copy[i]);`
	`498`	`+ str_copy[i] = (char) tolower((unsigned char) str_copy[i]);`
`499`	`499`	`}`
`500`	`500`
`501`	`501`	`/* look for numerical tokens */`
`502`	`502`	`reading_digit = 0;`
`503`	`503`	`token_count = 0;`
`504`	`504`	`for (i = 0; i < strlen(str_copy); i++)`
`505`	`505`	`{`
`506`		`- if (!isdigit(str_copy[i]) && reading_digit)`
	`506`	`+ if (!isdigit((unsigned char) str_copy[i]) && reading_digit)`
`507`	`507`	`{`
`508`	`508`	`/* the token is finished */`
`509`	`509`	`token[token_count][1] = i - 1;`
`510`	`510`	`reading_digit = 0;`
`511`	`511`	`token_count++;`
`512`	`512`	`}`
`513`		`- else if (isdigit(str_copy[i]) && !reading_digit)`
	`513`	`+ else if (isdigit((unsigned char) str_copy[i]) && !reading_digit)`
`514`	`514`	`{`
`515`	`515`	`/* we have found a token */`
`516`	`516`	`token[token_count][0] = i;`
`@@ -565,7 +565,7 @@ PGTYPESdate_defmt_asc(date * d, char fmt, char str)`
`565`	`565`	`{`
`566`	`566`	`for (j = 0; j < PGTYPES_DATE_MONTH_MAXLENGTH; j++)`
`567`	`567`	`{`
`568`		`- month_lower_tmp[j] = (char) tolower(list[i][j]);`
	`568`	`+ month_lower_tmp[j] = (char) tolower((unsigned char) list[i][j]);`
`569`	`569`	`if (!month_lower_tmp[j])`
`570`	`570`	`{`
`571`	`571`	`/* properly terminated */`