Gisle Vanem's djgpp/MS-DOS updates

This commit is contained in:
Daniel Stenberg 2004-03-29 12:29:25 +00:00
parent 712d0374f7
commit 126ed14313
7 changed files with 202 additions and 135 deletions

View File

@ -25,10 +25,12 @@
#define HAVE_IO_H 1 #define HAVE_IO_H 1
#define HAVE_IOCTLSOCKET 1 #define HAVE_IOCTLSOCKET 1
#define HAVE_INET_PTON 1 #define HAVE_INET_PTON 1
#define HAVE_LONGLONG 1
#define HAVE_MALLOC_H 1 #define HAVE_MALLOC_H 1
#define HAVE_MEMORY_H 1 #define HAVE_MEMORY_H 1
#define HAVE_NETDB_H 1 #define HAVE_NETDB_H 1
#define HAVE_NETINET_IN_H 1 #define HAVE_NETINET_IN_H 1
#define HAVE_NETINET_TCP_H 1
#define HAVE_NET_IF_H 1 #define HAVE_NET_IF_H 1
#define HAVE_PERROR 1 #define HAVE_PERROR 1
#define HAVE_SELECT 1 #define HAVE_SELECT 1
@ -38,12 +40,14 @@
#define HAVE_SIGACTION 1 #define HAVE_SIGACTION 1
#define HAVE_SIGSETJMP 1 #define HAVE_SIGSETJMP 1
#define HAVE_SOCKET 1 #define HAVE_SOCKET 1
#define HAVE_SPNEGO 1
#define HAVE_STRCASECMP 1 #define HAVE_STRCASECMP 1
#define HAVE_STRDUP 1 #define HAVE_STRDUP 1
#define HAVE_STRFTIME 1 #define HAVE_STRFTIME 1
#define HAVE_STRICMP 1 #define HAVE_STRICMP 1
#define HAVE_STRSTR 1 #define HAVE_STRSTR 1
#define HAVE_STRTOLL 1 #define HAVE_STRTOLL 1
#define HAVE_SYS_IOCTL_H 1
#define HAVE_SYS_SOCKET_H 1 #define HAVE_SYS_SOCKET_H 1
#define HAVE_SYS_STAT_H 1 #define HAVE_SYS_STAT_H 1
#define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_TYPES_H 1
@ -53,9 +57,13 @@
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
#define HAVE_VPRINTF 1 #define HAVE_VPRINTF 1
#if (DJGPP_MINOR >= 4)
#define HAVE_STRLCAT 1
#endif
#define RETSIGTYPE void #define RETSIGTYPE void
#define SIZEOF_LONG_DOUBLE 16 #define SIZEOF_LONG_DOUBLE 16
#define SIZEOF_LONG_LONG 8 #define SIZEOF_CURL_OFF_T 4 /* no huge file support */
#define STDC_HEADERS 1 #define STDC_HEADERS 1
#define TIME_WITH_SYS_TIME 1 #define TIME_WITH_SYS_TIME 1

View File

@ -14,13 +14,14 @@ endif
SOURCES = base64.c connect.c content_.c cookie.c dict.c \ SOURCES = base64.c connect.c content_.c cookie.c dict.c \
easy.c escape.c file.c formdata.c ftp.c \ easy.c escape.c file.c formdata.c ftp.c \
getdate.c getenv.c getinfo.c hash.c hostip.c \ getdate.c getenv.c getinfo.c hash.c hostip.c \
http.c http_chu.c http_dig.c http_neg.c http_ntl.c \
if2ip.c krb4.c md5.c ldap.c llist.c \ if2ip.c krb4.c md5.c ldap.c llist.c \
memdebug.c mprintf.c multi.c netrc.c progress.c \ memdebug.c mprintf.c multi.c netrc.c progress.c \
security.c sendf.c share.c speedche.c ssluse.c \ security.c sendf.c share.c speedche.c ssluse.c \
strequal.c strtok.c telnet.c timeval.c transfer.c \ strequal.c strtok.c telnet.c timeval.c transfer.c \
url.c version.c strerror.c strtoofft.c url.c version.c http.c \
http_chunks.c http_digest.c http_negotiate.c http_ntlm.c
SOURCES := $(strip $(SOURCES))
OBJECTS = $(SOURCES:.c=.o) OBJECTS = $(SOURCES:.c=.o)
CURL_LIB = libcurl.a CURL_LIB = libcurl.a
@ -46,130 +47,155 @@ realclean vclean: clean
base64.o: base64.c setup.h config.h config.dj ../include/curl/mprintf.h \ base64.o: base64.c setup.h config.h config.dj ../include/curl/mprintf.h \
base64.h base64.h
connect.o: connect.c setup.h config.h config.dj urldata.h cookie.h \ connect.o: connect.c setup.h config.h config.dj urldata.h cookie.h \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \ ../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \ ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
hash.h llist.h sendf.h if2ip.h formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
if2ip.h strerror.h connect.h
content_.o: content_.c setup.h config.h config.dj content_.o: content_.c setup.h config.h config.dj
cookie.o: cookie.c setup.h config.h config.dj urldata.h cookie.h \ cookie.o: cookie.c setup.h config.h config.dj urldata.h cookie.h \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \ ../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \ ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
hash.h llist.h getdate.h strequal.h strtok.h sendf.h formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h getdate.h \
strequal.h strtok.h sendf.h
dict.o: dict.c setup.h config.h config.dj urldata.h cookie.h \ dict.o: dict.c setup.h config.h config.dj urldata.h cookie.h \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \ ../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \ ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
hash.h llist.h transfer.h sendf.h progress.h strequal.h \ formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h transfer.h \
../include/curl/mprintf.h sendf.h progress.h strequal.h dict.h ../include/curl/mprintf.h
easy.o: easy.c setup.h config.h config.dj strequal.h urldata.h cookie.h \ easy.o: easy.c setup.h config.h config.dj strequal.h urldata.h cookie.h \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \ ../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \ ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
hash.h llist.h transfer.h ssluse.h url.h getinfo.h share.h \ formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h transfer.h \
../include/curl/mprintf.h ssluse.h url.h getinfo.h share.h ../include/curl/mprintf.h
escape.o: escape.c setup.h config.h config.dj ../include/curl/curl.h \ escape.o: escape.c setup.h config.h config.dj ../include/curl/curl.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h ../include/curl/curlver.h ../include/curl/types.h \
../include/curl/easy.h ../include/curl/multi.h
file.o: file.c setup.h config.h config.dj urldata.h cookie.h \ file.o: file.c setup.h config.h config.dj urldata.h cookie.h \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \ ../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \ ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
hash.h llist.h progress.h sendf.h escape.h ../include/curl/mprintf.h formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h progress.h \
sendf.h escape.h file.h speedcheck.h getinfo.h transfer.h \
../include/curl/mprintf.h
formdata.o: formdata.c setup.h config.h config.dj ../include/curl/curl.h \ formdata.o: formdata.c setup.h config.h config.dj ../include/curl/curl.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \ ../include/curl/curlver.h ../include/curl/types.h \
formdata.h strequal.h ../include/curl/easy.h ../include/curl/multi.h formdata.h strequal.h
ftp.o: ftp.c setup.h config.h config.dj ../include/curl/curl.h \ ftp.o: ftp.c setup.h config.h config.dj ../include/curl/curl.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \ ../include/curl/curlver.h ../include/curl/types.h \
urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \ ../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
llist.h sendf.h if2ip.h progress.h transfer.h escape.h http.h ftp.h \ formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
strequal.h ssluse.h connect.h ../include/curl/mprintf.h if2ip.h progress.h transfer.h escape.h http.h ftp.h strtoofft.h \
strequal.h ssluse.h connect.h strerror.h ../include/curl/mprintf.h
getdate.o: getdate.c setup.h config.h config.dj getdate.h getdate.o: getdate.c setup.h config.h config.dj getdate.h
getenv.o: getenv.c setup.h config.h config.dj getenv.o: getenv.c setup.h config.h config.dj ../include/curl/curl.h \
../include/curl/curlver.h ../include/curl/types.h \
../include/curl/easy.h ../include/curl/multi.h
getinfo.o: getinfo.c setup.h config.h config.dj ../include/curl/curl.h \ getinfo.o: getinfo.c setup.h config.h config.dj ../include/curl/curl.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \ ../include/curl/curlver.h ../include/curl/types.h \
urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \ ../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
llist.h formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h getinfo.h
hash.o: hash.c setup.h config.h config.dj hash.h llist.h hash.o: hash.c setup.h config.h config.dj hash.h llist.h
hostip.o: hostip.c setup.h config.h config.dj urldata.h cookie.h \ hostip.o: hostip.c setup.h config.h config.dj urldata.h cookie.h \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \ ../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \ ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
hash.h llist.h sendf.h share.h url.h ../include/curl/mprintf.h formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
http.o: http.c setup.h config.h config.dj urldata.h cookie.h \ share.h url.h ../include/curl/mprintf.h
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \ if2ip.o: if2ip.c setup.h config.h config.dj if2ip.h
../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
hash.h llist.h transfer.h sendf.h progress.h base64.h strequal.h \
ssluse.h http_digest.h http_ntlm.h http_negotiate.h url.h share.h \
http.h ../include/curl/mprintf.h
http_chu.o: http_chu.c setup.h config.h config.dj urldata.h cookie.h \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \
../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
hash.h llist.h sendf.h content_encoding.h ../include/curl/mprintf.h
http_dig.o: http_dig.c setup.h config.h config.dj urldata.h cookie.h \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \
../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
hash.h llist.h sendf.h strequal.h md5.h http_digest.h \
../include/curl/mprintf.h
http_neg.o: http_neg.c setup.h config.h config.dj
http_ntl.o: http_ntl.c setup.h config.h config.dj
if2ip.o: if2ip.c setup.h config.h config.dj
krb4.o: krb4.c setup.h config.h config.dj krb4.o: krb4.c setup.h config.h config.dj
md5.o: md5.c setup.h config.h config.dj md5.o: md5.c setup.h config.h config.dj md5.h
ldap.o: ldap.c setup.h config.h config.dj urldata.h cookie.h \ ldap.o: ldap.c setup.h config.h config.dj urldata.h cookie.h \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \ ../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \ ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
hash.h llist.h sendf.h escape.h transfer.h ../include/curl/mprintf.h formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
escape.h transfer.h ldap.h ../include/curl/mprintf.h
llist.o: llist.c setup.h config.h config.dj llist.h llist.o: llist.c setup.h config.h config.dj llist.h
memdebug.o: memdebug.c setup.h config.h config.dj ../include/curl/curl.h \ memdebug.o: memdebug.c
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \ mprintf.o: mprintf.c setup.h config.h config.dj ../include/curl/mprintf.h
../include/curl/mprintf.h urldata.h cookie.h formdata.h timeval.h \
http_chunks.h hostip.h hash.h llist.h
mprintf.o: mprintf.c setup.h config.h config.dj
multi.o: multi.c setup.h config.h config.dj ../include/curl/curl.h \ multi.o: multi.c setup.h config.h config.dj ../include/curl/curl.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \ ../include/curl/curlver.h ../include/curl/types.h \
urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \ ../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
llist.h transfer.h url.h connect.h progress.h formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h transfer.h \
url.h connect.h progress.h
netrc.o: netrc.c setup.h config.h config.dj ../include/curl/curl.h \ netrc.o: netrc.c setup.h config.h config.dj ../include/curl/curl.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \ ../include/curl/curlver.h ../include/curl/types.h \
strequal.h strtok.h ../include/curl/mprintf.h ../include/curl/easy.h ../include/curl/multi.h netrc.h strequal.h \
strtok.h ../include/curl/mprintf.h
progress.o: progress.c setup.h config.h config.dj ../include/curl/curl.h \ progress.o: progress.c setup.h config.h config.dj ../include/curl/curl.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \ ../include/curl/curlver.h ../include/curl/types.h \
urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \ ../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
llist.h sendf.h progress.h ../include/curl/mprintf.h formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
progress.h ../include/curl/mprintf.h
security.o: security.c setup.h config.h config.dj security.o: security.c setup.h config.h config.dj
sendf.o: sendf.c setup.h config.h config.dj ../include/curl/curl.h \ sendf.o: sendf.c setup.h config.h config.dj ../include/curl/curl.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \ ../include/curl/curlver.h ../include/curl/types.h \
urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \ ../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
llist.h sendf.h connect.h ../include/curl/mprintf.h formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
connect.h ../include/curl/mprintf.h
share.o: share.c setup.h config.h config.dj ../include/curl/curl.h \ share.o: share.c setup.h config.h config.dj ../include/curl/curl.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \ ../include/curl/curlver.h ../include/curl/types.h \
urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \ ../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
llist.h share.h formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h share.h
speedche.o: speedche.c setup.h config.h config.dj ../include/curl/curl.h \ speedche.o: speedche.c setup.h config.h config.dj ../include/curl/curl.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \ ../include/curl/curlver.h ../include/curl/types.h \
urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \ ../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
llist.h sendf.h speedcheck.h formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
speedcheck.h
ssluse.o: ssluse.c setup.h config.h config.dj urldata.h cookie.h \ ssluse.o: ssluse.c setup.h config.h config.dj urldata.h cookie.h \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \ ../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
hash.h llist.h sendf.h url.h inet_pton.h
strequal.o: strequal.c setup.h config.h config.dj
strtok.o: strtok.c setup.h config.h config.dj
telnet.o: telnet.c setup.h config.h config.dj urldata.h cookie.h \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \
../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
hash.h llist.h transfer.h sendf.h ../include/curl/mprintf.h \
arpa_telnet.h
timeval.o: timeval.c timeval.h setup.h config.h config.dj
transfer.o: transfer.c setup.h config.h config.dj strequal.h urldata.h \
cookie.h ../include/curl/curl.h ../include/curl/types.h \
../include/curl/easy.h ../include/curl/multi.h formdata.h timeval.h \
http_chunks.h hostip.h hash.h llist.h netrc.h content_encoding.h \
transfer.h sendf.h speedcheck.h progress.h getdate.h http.h url.h \
getinfo.h ssluse.h http_digest.h http_ntlm.h http_negotiate.h share.h \
../include/curl/mprintf.h
url.o: url.c setup.h config.h config.dj urldata.h cookie.h \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \
../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
hash.h llist.h netrc.h base64.h ssluse.h if2ip.h transfer.h sendf.h \
progress.h strequal.h escape.h strtok.h share.h content_encoding.h \
http_digest.h http_negotiate.h ftp.h dict.h telnet.h http.h file.h \
ldap.h url.h connect.h ca-bundle.h ../include/curl/mprintf.h
version.o: version.c setup.h config.h config.dj ../include/curl/curl.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \ ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \ formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
llist.h url.h inet_pton.h ssluse.h connect.h
strequal.o: strequal.c setup.h config.h config.dj strequal.h
strtok.o: strtok.c setup.h config.h config.dj strtok.h
telnet.o: telnet.c setup.h config.h config.dj urldata.h cookie.h \
../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h transfer.h \
sendf.h telnet.h ../include/curl/mprintf.h arpa_telnet.h
timeval.o: timeval.c timeval.h setup.h config.h config.dj
transfer.o: transfer.c setup.h config.h config.dj strtoofft.h \
../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
strequal.h urldata.h cookie.h formdata.h timeval.h http_chunks.h \
hostip.h hash.h llist.h netrc.h content_encoding.h transfer.h sendf.h \
speedcheck.h progress.h getdate.h http.h url.h getinfo.h ssluse.h \
http_digest.h http_ntlm.h http_negotiate.h share.h \
../include/curl/mprintf.h
strerror.o: strerror.c setup.h config.h config.dj ../include/curl/curl.h \
../include/curl/curlver.h ../include/curl/types.h \
../include/curl/easy.h ../include/curl/multi.h strerror.h urldata.h \
cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h \
../include/curl/mprintf.h
strtoofft.o: strtoofft.c setup.h config.h config.dj strtoofft.h \
../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h
url.o: url.c setup.h config.h config.dj urldata.h cookie.h \
../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h netrc.h \
base64.h ssluse.h if2ip.h transfer.h sendf.h progress.h strequal.h \
escape.h strtok.h share.h content_encoding.h http_digest.h \
http_negotiate.h ftp.h dict.h telnet.h http.h file.h ldap.h url.h \
connect.h ca-bundle.h ../include/curl/mprintf.h
version.o: version.c setup.h config.h config.dj ../include/curl/curl.h \
../include/curl/curlver.h ../include/curl/types.h \
../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h
http.o: http.c setup.h config.h config.dj urldata.h cookie.h \
../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h transfer.h \
sendf.h progress.h base64.h strequal.h ssluse.h http_digest.h \
http_ntlm.h http_negotiate.h url.h share.h http.h \
../include/curl/mprintf.h
http_chunks.o: http_chunks.c setup.h config.h config.dj urldata.h \
cookie.h ../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
content_encoding.h http.h ../include/curl/mprintf.h
http_digest.o: http_digest.c setup.h config.h config.dj urldata.h \
cookie.h ../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
strequal.h md5.h http_digest.h ../include/curl/mprintf.h
http_negotiate.o: http_negotiate.c setup.h config.h config.dj
http_ntlm.o: http_ntlm.c setup.h config.h config.dj

View File

@ -2,3 +2,10 @@ Gisle Vanem made curl build fine on DOS (and MingW) with djgpp, OpenSSL and his
Watt-32 stack. Watt-32 stack.
'make djgpp' in the root curl dir should build it fine. 'make djgpp' in the root curl dir should build it fine.
Note 1: djgpp 2.04 beta has a sscanf() bug so the URL parsing isn't
done proberly. Use djgpp 2.03 until they fix it.
Note 2: Compile Watt-32 (and OpenSSL) with the same version of djgpp.
Otherwise things go wrong because things like FS-extensions and
errnos have been changed between releases.

View File

@ -25,7 +25,12 @@ USE_ZLIB = 0
# #
# Use Watt-32 IPv6 stack (only IPv6 name resolution working at the moment) # Use Watt-32 IPv6 stack (only IPv6 name resolution working at the moment)
# #
USE_IPV6 = 1 USE_IPV6 = 0
#
# Enable debug code in libcurl/curl
#
USE_DEBUG = 0
default: all default: all
@ -35,12 +40,12 @@ default: all
# #
WATT32_ROOT = $(subst \,/,$(WATT_ROOT)) WATT32_ROOT = $(subst \,/,$(WATT_ROOT))
OPENSSL_ROOT = /net/openssl.098 OPENSSL_ROOT = /net/openssl.098
ZLIB_ROOT = /djgpp/contrib/zlib.121 ZLIB_ROOT = /djgpp/contrib/zlib
CC = gcc CC = gcc
YACC = bison -y YACC = bison -y
CFLAGS = -g -O2 -I. -I../include -Wall -DHAVE_CONFIG_H -DHAVE_SPNEGO CFLAGS = -g -O2 -I. -I../include -I../lib -Wall -DHAVE_CONFIG_H
ifeq ($(USE_SSL),1) ifeq ($(USE_SSL),1)
CFLAGS += -DUSE_SSLEAY CFLAGS += -DUSE_SSLEAY
@ -54,6 +59,10 @@ ifeq ($(USE_IPV6),1)
CFLAGS += -DENABLE_IPV6 CFLAGS += -DENABLE_IPV6
endif endif
ifeq ($(USE_DEBUG),1)
CFLAGS += -DDEBUG=1 -DCURLDEBUG #-DMALLOCDEBUG=1 -DDPRINTF_DEBUG2=1
endif
# #
# Generated dependencies; Due to some hacks in gcc 2.95+ and djgpp 2.03 # Generated dependencies; Due to some hacks in gcc 2.95+ and djgpp 2.03
# we must prevent "$(DJDIR)/bin/../include/sys/version.h" from beeing # we must prevent "$(DJDIR)/bin/../include/sys/version.h" from beeing

View File

@ -116,16 +116,17 @@
#define DEFAULT_MAXREDIRS 50L #define DEFAULT_MAXREDIRS 50L
#ifdef __DJGPP__ #ifdef __DJGPP__
void *xmalloc(size_t); #include <dos.h>
char *msdosify(char *); char *msdosify(char *);
char *rename_if_dos_device_name(char *); char *rename_if_dos_device_name(char *);
void xfree(void *);
struct pollfd { /* we want to glob our own argv[] */
int fd; char **__crt0_glob_function (char *arg)
int events; /* in param: what to poll for */ {
int revents; /* out param: what events occured */ (void)arg;
}; return (char**)0;
int poll (struct pollfd *, int, int); }
#endif /* __DJGPP__ */ #endif /* __DJGPP__ */
#ifndef __cplusplus #ifndef __cplusplus
@ -367,7 +368,7 @@ static void help(void)
" -v/--verbose Make the operation more talkative", " -v/--verbose Make the operation more talkative",
" -V/--version Show version number and quit", " -V/--version Show version number and quit",
#ifdef __DJGPP__ #ifdef __DJGPP__
" --wdebug Turn on WATT-32 debugging under DJGPP", " --wdebug Turn on Watt-32 debugging under DJGPP",
#endif #endif
" -w/--write-out [format] What to output after completion", " -w/--write-out [format] What to output after completion",
" -x/--proxy <host[:port]> Use HTTP proxy on given port", " -x/--proxy <host[:port]> Use HTTP proxy on given port",
@ -2209,6 +2210,8 @@ static void go_sleep(long ms)
#ifdef WIN32 #ifdef WIN32
/* Windows offers a millisecond sleep */ /* Windows offers a millisecond sleep */
Sleep(ms); Sleep(ms);
#elif defined(__MSDOS__)
delay(ms);
#else #else
/* Other systems must use select() for this */ /* Other systems must use select() for this */
struct timeval timeout; struct timeval timeout;
@ -2920,10 +2923,11 @@ operate(struct Configurable *config, int argc, char *argv[])
{ {
/* This is for DOS, and then we do some major replacing of /* This is for DOS, and then we do some major replacing of
bad characters in the file name before using it */ bad characters in the file name before using it */
char *file1=xmalloc(PATH_MAX); char file1 [PATH_MAX];
strcpy(file1, msdosify(outfile)); strcpy(file1, msdosify(outfile));
strcpy(outfile, rename_if_dos_device_name(file1)); free (outfile);
xfree(file1); outfile = strdup (rename_if_dos_device_name(file1));
} }
#endif /* __DJGPP__ */ #endif /* __DJGPP__ */
} }
@ -3688,7 +3692,6 @@ rename_if_dos_device_name (char *file_name)
/* We could have a file whose name is a device on MS-DOS. Trying to /* We could have a file whose name is a device on MS-DOS. Trying to
* retrieve such a file would fail at best and wedge us at worst. We need * retrieve such a file would fail at best and wedge us at worst. We need
* to rename such files. */ * to rename such files. */
extern char *basename (const char *);
char *base; char *base;
struct stat st_buf; struct stat st_buf;
char fname[PATH_MAX]; char fname[PATH_MAX];

View File

@ -17,6 +17,8 @@ endif
EX_LIBS += $(WATT32_ROOT)/lib/libwatt.a EX_LIBS += $(WATT32_ROOT)/lib/libwatt.a
CFLAGS += -DUSE_MANUAL -DUSE_ENVIRONMENT
PROGRAM = ../curl.exe PROGRAM = ../curl.exe
SOURCES = getpass.c homedir.c hugehelp.c main.c urlglob.c writeenv.c writeout.c SOURCES = getpass.c homedir.c hugehelp.c main.c urlglob.c writeenv.c writeout.c
OBJECTS = $(SOURCES:.c=.o) OBJECTS = $(SOURCES:.c=.o)
@ -34,7 +36,7 @@ config.h:
# #
hugehelp.c: ../docs/MANUAL ../docs/curl.1 mkhelp.pl hugehelp.c: ../docs/MANUAL ../docs/curl.1 mkhelp.pl
groff -Tascii -man ../docs/curl.1 | \ groff -Tascii -man ../docs/curl.1 | \
perl -w mkhelp.pl ../docs/MANUAL ../readme > $@ perl -w mkhelp.pl ../docs/MANUAL > $@
clean: clean:
- rm -f $(OBJECTS) Makefile.bak config.h - rm -f $(OBJECTS) Makefile.bak config.h
@ -43,17 +45,23 @@ realclean vclean: clean
- rm -f $(PROGRAM) hugehelp.c - rm -f $(PROGRAM) hugehelp.c
# DO NOT DELETE THIS LINE # DO NOT DELETE THIS LINE
getpass.o: getpass.c setup.h config.h ../lib/config.dj getpass.o: getpass.c setup.h config.h ../lib/config.dj ../lib/setup.h \
homedir.o: homedir.c setup.h config.h ../lib/config.dj ../lib/config.h getpass.h ../lib/memdebug.h
hugehelp.o: hugehelp.c homedir.o: homedir.c setup.h config.h ../lib/config.dj ../lib/setup.h \
main.o: main.c setup.h config.h ../lib/config.dj ../include/curl/curl.h \ ../lib/config.h homedir.h ../lib/memdebug.h
hugehelp.o: hugehelp.c hugehelp.h
main.o: main.c setup.h config.h ../lib/config.dj ../lib/setup.h \
../lib/config.h ../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \ ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
../include/curl/mprintf.h urlglob.h writeout.h getpass.h homedir.h \ ../include/curl/mprintf.h urlglob.h writeout.h getpass.h homedir.h \
version.h hugehelp.h version.h ../lib/strtoofft.h ../lib/memdebug.h
urlglob.o: urlglob.c setup.h config.h ../lib/config.dj \ urlglob.o: urlglob.c setup.h config.h ../lib/config.dj ../lib/setup.h \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \ ../lib/config.h ../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/multi.h ../include/curl/mprintf.h urlglob.h ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
writeenv.o: writeenv.c setup.h config.h ../lib/config.dj ../include/curl/mprintf.h urlglob.h ../lib/memdebug.h
writeout.o: writeout.c setup.h config.h ../lib/config.dj \ writeenv.o: writeenv.c setup.h config.h ../lib/config.dj ../lib/setup.h \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \ ../lib/config.h
../include/curl/multi.h ../include/curl/mprintf.h writeout.h writeout.o: writeout.c setup.h config.h ../lib/config.dj ../lib/setup.h \
../lib/config.h ../include/curl/curl.h ../include/curl/curlver.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
../include/curl/mprintf.h writeout.h

View File

@ -64,6 +64,10 @@ static void internalSetEnv(const char * name, char * value)
/* Add your OS-specific code here. */ /* Add your OS-specific code here. */
#ifdef __riscos__ #ifdef __riscos__
_kernel_setenv(name, value); _kernel_setenv(name, value);
#elif defined (CURLDEBUG)
extern FILE *curl_debuglogfile;
if (curl_debuglogfile)
fprintf (curl_debuglogfile, "ENV %s = %s\n", name, value);
#endif #endif
return; return;
} }
@ -100,6 +104,8 @@ void ourWriteEnv(CURL *curl)
else else
internalSetEnv(variables[i].name, NULL); internalSetEnv(variables[i].name, NULL);
break; break;
default:
break;
} }
} }