d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strtok -> strsep (no strtok allowed in libraries)

Browse Source 
add unsigned char cast to ctype macro
This commit is contained in:
ache 2000-08-29 21:34:55 +00:00
parent 1572ff1cf5
commit b2ea98ff9e
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libalias/alias_proxy.c
View File

@ -520,6 +520,7 @@ PacketAliasProxyRule(const char *cmd)
char buffer[256];
char str_port[sizeof(buffer)];
char str_server_port[sizeof(buffer)];
char *res = buffer;
int rule_index;
int proto;
@ -540,7 +541,7 @@ PacketAliasProxyRule(const char *cmd)
/* Convert to lower case */
len = strlen(buffer);
for (i=0; i<len; i++)
buffer[i] = tolower(buffer[i]);
buffer[i] = tolower((unsigned char)buffer[i]);
/* Set default proxy type */
@ -570,7 +571,7 @@ PacketAliasProxyRule(const char *cmd)
#define STATE_READ_SRC 7
#define STATE_READ_DST 8
state = STATE_READ_KEYWORD;
token = strtok(buffer, " \t");
token = strsep(&res, " \t");
token_count = 0;
while (token != NULL)
{
@ -739,7 +740,9 @@ PacketAliasProxyRule(const char *cmd)
break;
}
token = strtok(NULL, " \t");
do {
token = strsep(&res, " \t");
} while (token != NULL && !*token);
}
#undef STATE_READ_KEYWORD
#undef STATE_READ_TYPE

9
sys/netinet/libalias/alias_proxy.c
View File

@ -520,6 +520,7 @@ PacketAliasProxyRule(const char *cmd)
char buffer[256];
char str_port[sizeof(buffer)];
char str_server_port[sizeof(buffer)];
char *res = buffer;
int rule_index;
int proto;
@ -540,7 +541,7 @@ PacketAliasProxyRule(const char *cmd)
/* Convert to lower case */
len = strlen(buffer);
for (i=0; i<len; i++)
buffer[i] = tolower(buffer[i]);
buffer[i] = tolower((unsigned char)buffer[i]);
/* Set default proxy type */
@ -570,7 +571,7 @@ PacketAliasProxyRule(const char *cmd)
#define STATE_READ_SRC 7
#define STATE_READ_DST 8
state = STATE_READ_KEYWORD;
token = strtok(buffer, " \t");
token = strsep(&res, " \t");
token_count = 0;
while (token != NULL)
{
@ -739,7 +740,9 @@ PacketAliasProxyRule(const char *cmd)
break;
}
token = strtok(NULL, " \t");
do {
token = strsep(&res, " \t");
} while (token != NULL && !*token);
}
#undef STATE_READ_KEYWORD
#undef STATE_READ_TYPE