Accept "\r\n" terminated lines in restore files

diff --git a/src/ipset.c b/src/ipset.c
index b3569ed63eac8ec1eccb52f9db662ebae1623591..1f2dbcc0303d7c4038db7e65dd83e0ca8609341b 100644 (file)
--- a/src/ipset.c
+++ b/src/ipset.c
@@ -148,9 +148,9 @@ build_argv(char *buffer)
                newargv[i] = NULL;
        newargc = 1;
 
-       ptr = strtok(buffer, " \t\n");
+       ptr = strtok(buffer, " \t\r\n");
        newargv[newargc++] = ptr;
-       while ((ptr = strtok(NULL, " \t\n")) != NULL) {
+       while ((ptr = strtok(NULL, " \t\r\n")) != NULL) {
                if ((newargc + 1) < (int)(sizeof(newargv)/sizeof(char *)))
                        newargv[newargc++] = ptr;
                else {