some bugfixes

[svn/Prometheus-QoS/.git] / parsehosts.c

diff --git a/parsehosts.c b/parsehosts.c
index 18418eddb6b9c587d6ec23925a71c6f8ed011c48..ecb956a3a53edbf2bd1c3d2d7586d4324d9bc246 100644 (file)
--- a/parsehosts.c
+++ b/parsehosts.c
@@ -1,4 +1,4 @@
-/* Modified by: xChaos, 20131029 */\r
+/* Modified by: xChaos, 20131220 */\r
 \r
 #include "cll1-0.6.2.h"\r
 #include "ipstruct.h"\r
@@ -163,23 +163,30 @@ void parse_hosts(char *hosts)
    /* any line starting with non-number is comment ...*/\r
    continue;\r
   }\r
-  \r
+\r
+  ptr = strchr(str,'\r'); /* fore unix-style end of line */\r
+  if(ptr)\r
+  {\r
+   *ptr = 0;\r
+  }\r
+ \r
   /* first, expand (rewrite) any predefined macros, if found*/\r
   for_each(macro, macros)\r
   {\r
    substring = strstr(str, macro->rewrite_from);\r
-   if(substring);\r
+   if(substring)\r
    {\r
     int l1, l3;\r
     *substring = 0;\r
     substring += strlen(macro->rewrite_from);\r
     l1 = strlen(str);\r
     l3 = strlen(substring);\r
-    string(ptr, l1 + strlen(macro->rewrite_to) + l3);\r
+    string(ptr, l1 + strlen(macro->rewrite_to) + l3 + 1);\r
     strcpy(ptr, str);\r
     strcat(ptr, macro->rewrite_to);\r
     strcat(ptr, substring);\r
     str = ptr;\r
+    /*  printf("REWRITE: %s -> %s\n",_,str); */\r
    }\r
   }\r
 \r
@@ -329,4 +336,4 @@ void parse_hosts(char *hosts)
 // TheIP("0.0.0.0", TRUE);\r
 // ip->name = "TOTAL";\r
 // ip->mask = 0;\r
-}
\ No newline at end of file
+}\r