improve parsing

1 files changed, 7 insertions, 19 deletions

diff --git a/util.c b/util.c
index 01fbe65..0084c19 100644
--- a/util.c
+++ b/util.c
@@ -90,17 +90,11 @@ int parse_local_port_forward(char *string, int *local_port, char **hostname, int
     char *host;
     char *rport;
 
-    /* First replace all @ with :, ':' is forbidden in some environments */
-    char *p = string;
-    while(*p)
-    {
-        if(*p == '@') *p = ':';
-        p++;
-    }
+    /* Alternative delimiter '@', as ':' is forbidden in some environments */
 
-    lport = strtok(string, ":");
-    host = strtok(NULL, ":");
-    rport = strtok(NULL, ":");
+    lport = strtok(string, ":@");
+    host = strtok(NULL, ":@");
+    rport = strtok(NULL, ":@");
 
     if(!lport || !host || !rport)
     {
@@ -121,16 +115,10 @@ int parse_pipe_port_forward(char *string, char **hostname, int *remote_port)
     char *host;
     char *rport;
 
-    /* First replace all @ with :, ':' is forbidden in some environments */
-    char *p = string;
-    while(*p)
-    {
-        if(*p == '@') *p = ':';
-        p++;
-    }
+    /* Alternative delimiter '@', as ':' is forbidden in some environments */
 
-    host = strtok(string, ":");
-    rport = strtok(NULL, ":");
+    host = strtok(string, ":@");
+    rport = strtok(NULL, ":@");
 
     if(!host || !rport)
     {