S. Moonesamy updates, strtok.[ch] issues

3 files changed, 47 insertions, 27 deletions

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 081a9da90..69fecc27c 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -60,7 +60,8 @@ RELEASE_OBJS= \
 	getinfor.obj \

 	versionr.obj \

 	easyr.obj \

-	strequalr.obj

+	strequalr.obj \

+	strtokr.obj

 

 DEBUG_OBJS= \

 	base64d.obj \

@@ -91,7 +92,8 @@ DEBUG_OBJS= \
 	getinfod.obj \

 	versiond.obj  \

 	easyd.obj \

-	strequald.obj

+	strequald.obj \

+	strtokd.obj

 

 RELEASE_SSL_OBJS= \

 	base64rs.obj \

@@ -122,7 +124,8 @@ RELEASE_SSL_OBJS= \
 	getinfors.obj \

 	versionrs.obj \

 	easyrs.obj \

-	strequalrs.obj

+	strequalrs.obj \

+	strtokd.obj

 

 LINK_OBJS= \

 	base64.obj \

@@ -153,7 +156,8 @@ LINK_OBJS= \
 	getinfo.obj \

 	version.obj \

 	easy.obj \

-	strequal.obj

+	strequal.obj \

+	strtok.obj

 

 all : release

 

@@ -225,6 +229,8 @@ easyr.obj: easy.c
 	$(CCR) $(CFLAGS) easy.c

 strequalr.obj: strequal.c

 	$(CCR) $(CFLAGS) strequal.c

+strtokr.obj:strtok.c

+	$(CCR) $(CFLAGS) strtok.c

 

 ## Debug

 base64d.obj: base64.c

@@ -285,7 +291,8 @@ easyd.obj: easy.c
 	$(CCD) $(CFLAGS) easy.c

 strequald.obj: strequal.c

 	$(CCD) $(CFLAGS) strequal.c

-

+strtokd.obj:strtok.c

+	$(CCR) $(CFLAGS) strtok.c

 

 ## Release SSL

 base64rs.obj: base64.c

@@ -346,6 +353,8 @@ easyrs.obj: easy.c
 	$(CCRS) $(CFLAGS) easy.c

 strequalrs.obj: strequal.c

 	$(CCRS) $(CFLAGS) strequal.c

+strtokrs.obj:strtok.c

+	$(CCR) $(CFLAGS) strtok.c

 

 

 clean:

diff --git a/lib/curllib.dsp b/lib/curllib.dsp
index cf94268ed..07dff917e 100644
--- a/lib/curllib.dsp
+++ b/lib/curllib.dsp
@@ -209,6 +209,10 @@ SOURCE=.\strequal.c
 # End Source File

 # Begin Source File

 

+SOURCE=.\strtok.c

+# End Source File

+# Begin Source File

+

 SOURCE=.\telnet.c

 # End Source File

 # Begin Source File

@@ -341,6 +345,10 @@ SOURCE=.\strequal.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\strtok.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\telnet.h

 # End Source File

 # Begin Source File

diff --git a/lib/libcurl.def b/lib/libcurl.def
index dd0a8760e..bba526aac 100644
--- a/lib/libcurl.def
+++ b/lib/libcurl.def
@@ -7,26 +7,29 @@ LIBRARY		LIBCURL
 DESCRIPTION	'curl libcurl - http://curl.haxx.se'

 

 EXPORTS

-	curl_easy_cleanup @ 1 ; 

-	curl_easy_getinfo @ 2 ; 

-	curl_easy_init @ 3 ; 

-	curl_easy_perform @ 4 ; 

-	curl_easy_setopt @ 5 ; 

-	curl_escape @ 6 ; 

-	curl_formparse @ 7 ; 

-	curl_formfree @ 8 ; 

-	curl_getdate @ 9 ; 

-	curl_getenv @ 10 ; 

-	curl_slist_append @ 11 ; 

-	curl_slist_free_all @ 12 ; 

-	curl_unescape @ 13 ; 

-	curl_version @ 14 ; 

-	curl_maprintf @ 15 ; 

- 	curl_mfprintf @ 16 ;

-	curl_mprintf @ 17 ;

- 	curl_msprintf @ 18 ;

- 	curl_msnprintf @ 19 ;

- 	curl_mvfprintf @ 20 ;

-	curl_strequal @ 21 ; 

-	curl_strnequal @ 22 ; 

+	curl_easy_cleanup @ 1 ;

+	curl_easy_getinfo @ 2 ;

+	curl_easy_init @ 3 ;

+	curl_easy_perform @ 4 ;

+	curl_easy_setopt @ 5 ;

+	curl_escape @ 6 ;
+	curl_unescape @ 7;

+	curl_formparse @ 8 ;

+	curl_formfree @ 9 ;

+	curl_getdate @ 10 ;

+	curl_getenv @ 11 ;
+	curl_global_cleanup @ 12 ;
+	curl_global_init @ 13 ;

+	curl_slist_append @ 14 ;

+	curl_slist_free_all @ 15 ;

+	curl_unescape @ 16 ;

+	curl_version @ 17 ;

+	curl_maprintf @ 18 ;

+ 	curl_mfprintf @ 19 ;

+	curl_mprintf @ 20 ;

+ 	curl_msprintf @ 21 ;

+ 	curl_msnprintf @ 22 ;

+ 	curl_mvfprintf @ 23 ;

+	curl_strequal @ 24 ;

+	curl_strnequal @ 25 ;