S. Moonesamy updates, strtok.[ch] issues

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 081a9da901d56615ca7a39767f79ee38198d76bf..69fecc27c0f23a9e701564c75c2ffa3e3bdd026d 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -60,7 +60,8 @@ RELEASE_OBJS= \
        getinfor.obj \\r
        versionr.obj \\r
        easyr.obj \\r
-       strequalr.obj\r
+       strequalr.obj \\r
+       strtokr.obj\r
 \r
 DEBUG_OBJS= \\r
        base64d.obj \\r
@@ -91,7 +92,8 @@ DEBUG_OBJS= \
        getinfod.obj \\r
        versiond.obj  \\r
        easyd.obj \\r
-       strequald.obj\r
+       strequald.obj \\r
+       strtokd.obj\r
 \r
 RELEASE_SSL_OBJS= \\r
        base64rs.obj \\r
@@ -122,7 +124,8 @@ RELEASE_SSL_OBJS= \
        getinfors.obj \\r
        versionrs.obj \\r
        easyrs.obj \\r
-       strequalrs.obj\r
+       strequalrs.obj \\r
+       strtokd.obj\r
 \r
 LINK_OBJS= \\r
        base64.obj \\r
@@ -153,7 +156,8 @@ LINK_OBJS= \
        getinfo.obj \\r
        version.obj \\r
        easy.obj \\r
-       strequal.obj\r
+       strequal.obj \\r
+       strtok.obj\r
 \r
 all : release\r
 \r
@@ -225,6 +229,8 @@ easyr.obj: easy.c
        $(CCR) $(CFLAGS) easy.c\r
 strequalr.obj: strequal.c\r
        $(CCR) $(CFLAGS) strequal.c\r
+strtokr.obj:strtok.c\r
+       $(CCR) $(CFLAGS) strtok.c\r
 \r
 ## Debug\r
 base64d.obj: base64.c\r
@@ -285,7 +291,8 @@ easyd.obj: easy.c
        $(CCD) $(CFLAGS) easy.c\r
 strequald.obj: strequal.c\r
        $(CCD) $(CFLAGS) strequal.c\r
-\r
+strtokd.obj:strtok.c\r
+       $(CCR) $(CFLAGS) strtok.c\r
 \r
 ## Release SSL\r
 base64rs.obj: base64.c\r
@@ -346,6 +353,8 @@ easyrs.obj: easy.c
        $(CCRS) $(CFLAGS) easy.c\r
 strequalrs.obj: strequal.c\r
        $(CCRS) $(CFLAGS) strequal.c\r
+strtokrs.obj:strtok.c\r
+       $(CCR) $(CFLAGS) strtok.c\r
 \r
 \r
 clean:\r

diff --git a/lib/curllib.dsp b/lib/curllib.dsp
index cf94268edc5740f29d55a0c4624025ef226e8790..07dff917e7b353fea322f2e3bcc5dccfb5302c82 100644 (file)
--- a/lib/curllib.dsp
+++ b/lib/curllib.dsp
@@ -209,6 +209,10 @@ SOURCE=.\strequal.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\strtok.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\telnet.c\r
 # End Source File\r
 # Begin Source File\r
@@ -341,6 +345,10 @@ SOURCE=.\strequal.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\strtok.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\telnet.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/lib/libcurl.def b/lib/libcurl.def
index dd0a8760e60ea452718fef1b093c899d9b450803..bba526aacd386a0ad2390732813b55863a79a015 100644 (file)
--- a/lib/libcurl.def
+++ b/lib/libcurl.def
@@ -7,26 +7,29 @@ LIBRARY               LIBCURL
 DESCRIPTION    'curl libcurl - http://curl.haxx.se'\r
 \r
 EXPORTS\r
-       curl_easy_cleanup @ 1 ; \r
-       curl_easy_getinfo @ 2 ; \r
-       curl_easy_init @ 3 ; \r
-       curl_easy_perform @ 4 ; \r
-       curl_easy_setopt @ 5 ; \r
-       curl_escape @ 6 ; \r
-       curl_formparse @ 7 ; \r
-       curl_formfree @ 8 ; \r
-       curl_getdate @ 9 ; \r
-       curl_getenv @ 10 ; \r
-       curl_slist_append @ 11 ; \r
-       curl_slist_free_all @ 12 ; \r
-       curl_unescape @ 13 ; \r
-       curl_version @ 14 ; \r
-       curl_maprintf @ 15 ; \r
-       curl_mfprintf @ 16 ;\r
-       curl_mprintf @ 17 ;\r
-       curl_msprintf @ 18 ;\r
-       curl_msnprintf @ 19 ;\r
-       curl_mvfprintf @ 20 ;\r
-       curl_strequal @ 21 ; \r
-       curl_strnequal @ 22 ; \r
+       curl_easy_cleanup @ 1 ;\r
+       curl_easy_getinfo @ 2 ;\r
+       curl_easy_init @ 3 ;\r
+       curl_easy_perform @ 4 ;\r
+       curl_easy_setopt @ 5 ;\r
+       curl_escape @ 6 ;
+       curl_unescape @ 7;\r
+       curl_formparse @ 8 ;\r
+       curl_formfree @ 9 ;\r
+       curl_getdate @ 10 ;\r
+       curl_getenv @ 11 ;
+       curl_global_cleanup @ 12 ;
+       curl_global_init @ 13 ;\r
+       curl_slist_append @ 14 ;\r
+       curl_slist_free_all @ 15 ;\r
+       curl_unescape @ 16 ;\r
+       curl_version @ 17 ;\r
+       curl_maprintf @ 18 ;\r
+       curl_mfprintf @ 19 ;\r
+       curl_mprintf @ 20 ;\r
+       curl_msprintf @ 21 ;\r
+       curl_msnprintf @ 22 ;\r
+       curl_mvfprintf @ 23 ;\r
+       curl_strequal @ 24 ;\r
+       curl_strnequal @ 25 ;\r
 \r