cvs: gd /libgd/src gdft.c

tabe		Sat Aug  2 14:43:34 2008 UTC

  Modified files:              
    /gd/libgd/src	gdft.c 
  Log:
  fixed FS#174: use gd_strtok_r instead of strtok.
  
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gdft.c?r1=1.37&r2=1.38&diff_format=u
Index: gd/libgd/src/gdft.c
diff -u gd/libgd/src/gdft.c:1.37 gd/libgd/src/gdft.c:1.38
--- gd/libgd/src/gdft.c:1.37	Thu Jul 31 11:35:30 2008
+++ gd/libgd/src/gdft.c	Sat Aug  2 14:43:33 2008
@@ -1579,6 +1579,7 @@
   for (name = gd_strtok_r (fontlist, LISTSEPARATOR, &strtok_ptr); name;
        name = gd_strtok_r (0, LISTSEPARATOR, &strtok_ptr))
     {
+      char *path_ptr;
 
       /* make a fresh copy each time - strtok corrupts it. */
       path = strdup (fontsearchpath);
@@ -1613,8 +1614,8 @@
 	      break;
 	    }
 	}
-      for (dir = strtok (path, PATHSEPARATOR); dir;
-	   dir = strtok (0, PATHSEPARATOR))
+      for (dir = gd_strtok_r (path, PATHSEPARATOR, &path_ptr); dir;
+           dir = gd_strtok_r (0, PATHSEPARATOR, &path_ptr))
 	{
           if (strchr (name, '.'))
 	    {