c8h4/postgresql
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Tom Lane 2005-09-01 15:34:31 +00:00
parent bc0650660a
commit 14720f7c57
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/backend/commands/copy.c
View file

@ -8,12 +8,13 @@
* *
* *
* IDENTIFICATION * 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 "postgres.h"
#include <ctype.h>
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -2657,10 +2658,10 @@ CopyReadLineCSV(CopyState cstate)
static int static int
GetDecimalFromHex(char hex) GetDecimalFromHex(char hex)
{ {
if (isdigit(hex)) if (isdigit((unsigned char) hex))
return hex - '0'; return hex - '0';
else else
return tolower(hex) - 'a' + 10; return tolower((unsigned char) hex) - 'a' + 10;
} }
/* /*
@ -2802,7 +2803,7 @@ CopyReadAttributesText(CopyState cstate, int maxfields, char **fieldvals)
{ {
char hexchar = *cur_ptr; char hexchar = *cur_ptr;
if (isxdigit(hexchar)) if (isxdigit((unsigned char) hexchar))
{ {
int val = GetDecimalFromHex(hexchar); int val = GetDecimalFromHex(hexchar);
@ -2810,7 +2811,7 @@ CopyReadAttributesText(CopyState cstate, int maxfields, char **fieldvals)
if (cur_ptr < line_end_ptr) if (cur_ptr < line_end_ptr)
{ {
hexchar = *cur_ptr; hexchar = *cur_ptr;
if (isxdigit(hexchar)) if (isxdigit((unsigned char) hexchar))
{ {
cur_ptr++; cur_ptr++;
val = (val << 4) + GetDecimalFromHex(hexchar); val = (val << 4) + GetDecimalFromHex(hexchar);