From d9e630b5920d738f2b4385c88ff3f17b899b1dd1 Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Tue, 29 Aug 2000 21:34:55 +0000
Subject: strtok -> strsep (no strtok allowed in libraries) add unsigned char
 cast to ctype macro

---
 lib/libalias/alias_proxy.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'lib')

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
-- 
cgit v1.3