Don't require *saveptr == NULL on first strtok_r invocation

diff --git a/util.c b/util.c
index e8e8687a3a5e761d0fd4a761eed29a04327a2aa1..814a83877465effbdceabc6e56aec7ebd6ad07f0 100644 (file)
--- a/util.c
+++ b/util.c
@@ -176,7 +176,7 @@ strtok_r(char *str, const char *delim, char **saveptr)
 {
        int len;
        char *ret;
-       if (*saveptr)
+       if (!str)
                str = *saveptr;
        len = strlen(str);
        ret = strtok(str, delim);