diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2000-08-29 21:34:55 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2000-08-29 21:34:55 +0000 |
| commit | d9e630b5920d738f2b4385c88ff3f17b899b1dd1 (patch) | |
| tree | 8a94d1a2500e5f76b44796d07e6783d1408b853d | |
| parent | 67ab6e9844b6c9f8c483a3bb24860bcb45b6701c (diff) | |
| download | src-d9e630b5920d738f2b4385c88ff3f17b899b1dd1.tar.gz src-d9e630b5920d738f2b4385c88ff3f17b899b1dd1.zip | |
strtok -> strsep (no strtok allowed in libraries)
add unsigned char cast to ctype macro
Notes
Notes:
svn path=/head/; revision=65221
| -rw-r--r-- | lib/libalias/alias_proxy.c | 9 | ||||
| -rw-r--r-- | sys/netinet/libalias/alias_proxy.c | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/lib/libalias/alias_proxy.c b/lib/libalias/alias_proxy.c index 02e176532232..08627fa13425 100644 --- a/lib/libalias/alias_proxy.c +++ b/lib/libalias/alias_proxy.c @@ -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 diff --git a/sys/netinet/libalias/alias_proxy.c b/sys/netinet/libalias/alias_proxy.c index 02e176532232..08627fa13425 100644 --- a/sys/netinet/libalias/alias_proxy.c +++ b/sys/netinet/libalias/alias_proxy.c @@ -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 |