Changeset 1797:b480812893b2 in roaraudio

Timestamp:

05/21/09 04:24:47 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

test for strtok_r()

Files:

• configure (modified) (1 diff)
• roarclients/roarmonhttp.c (modified) (2 diffs)

configure

@@ -920 +920 @@
 test_func_defmake ROAR_HAVE_SETENV    setenv    'setenv("", "", 0)'          -- stdlib.h
 test_func_defmake ROAR_HAVE_PUTENV    putenv    'putenv("")'                 -- stdlib.h
+test_func_defmake ROAR_HAVE_STRTOK_R  strtok_r  'strtok_r("","",(char**)0)'  -- string.h
 test_func_defmake ROAR_HAVE_NICE      nice      'nice(0)'                    -- unistd.h
 test_func_defmake ROAR_HAVE_GETGID    getgid    'getgid()'                   -- sys/types.h unistd.h

roarclients/roarmonhttp.c

@@ -232 +232 @@
 #endif
 
+#ifdef ROAR_HAVE_STRTOK_R
  c = strtok_r(getenv("QUERY_STRING"), "&", &sp0);
+#else
+ c = strtok(getenv("QUERY_STRING"), "&");
+#endif
 
  while (c != NULL) {
+#ifdef ROAR_HAVE_STRTOK_R
   k = strtok_r(c,    "=", &sp1);
   v = strtok_r(NULL, "=", &sp1);
+#else
+  k = c;
+  if ( (v = strstr(c, "=")) != NULL ) {
+   *v = 0;
+   v++;
+  }
+#endif
 
   if ( !strcmp(k, "codec") ) {
@@ -251 +263 @@
   }
 
+#ifdef ROAR_HAVE_STRTOK_R
   c = strtok_r(NULL, "&", &sp0);
+#else
+  c = strtok(NULL, "&");
+#endif
  }