remove cr and lf at each line of config files

shadowsocks · Sep 14, 2014 · dec51ca · dec51ca
1 parent 886a6f4
commit dec51ca
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/chinadns.c b/src/chinadns.c
@@ -340,6 +340,11 @@ static int parse_ip_list() {
     return -1;
   }
   while ((line = fgets(line_buf, len, fp))) {
+    char *sp_pos;
+    sp_pos = strchr(line, '\r');
+    if (sp_pos) *sp_pos = 0;
+    sp_pos = strchr(line, '\n');
+    if (sp_pos) *sp_pos = 0;
     inet_aton(line, &ip_list.ips[i]);
     i++;
   }
@@ -391,7 +396,12 @@ static int parse_chnroute() {
     return -1;
   }
   while ((line = fgets(line_buf, len, fp))) {
-    char *sp_pos = strchr(line, '/');
+    char *sp_pos;
+    sp_pos = strchr(line, '\r');
+    if (sp_pos) *sp_pos = 0;
+    sp_pos = strchr(line, '\n');
+    if (sp_pos) *sp_pos = 0;
+    sp_pos = strchr(line, '/');
     if (sp_pos) {
       *sp_pos = 0;
       chnroute_list.nets[i].mask = (1 << (32 - atoi(sp_pos + 1))) - 1;