Gisle Vanem's djgpp/MS-DOS updates (126ed143) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/config.dj

+9 −1

Original line number	Diff line number	Diff line
		@@ -25,10 +25,12 @@
		#define HAVE_IO_H 1
		#define HAVE_IOCTLSOCKET 1
		#define HAVE_INET_PTON 1
		#define HAVE_LONGLONG 1
		#define HAVE_MALLOC_H 1
		#define HAVE_MEMORY_H 1
		#define HAVE_NETDB_H 1
		#define HAVE_NETINET_IN_H 1
		#define HAVE_NETINET_TCP_H 1
		#define HAVE_NET_IF_H 1
		#define HAVE_PERROR 1
		#define HAVE_SELECT 1
		@@ -38,12 +40,14 @@
		#define HAVE_SIGACTION 1
		#define HAVE_SIGSETJMP 1
		#define HAVE_SOCKET 1
		#define HAVE_SPNEGO 1
		#define HAVE_STRCASECMP 1
		#define HAVE_STRDUP 1
		#define HAVE_STRFTIME 1
		#define HAVE_STRICMP 1
		#define HAVE_STRSTR 1
		#define HAVE_STRTOLL 1
		#define HAVE_SYS_IOCTL_H 1
		#define HAVE_SYS_SOCKET_H 1
		#define HAVE_SYS_STAT_H 1
		#define HAVE_SYS_TYPES_H 1
		@@ -53,9 +57,13 @@
		#define HAVE_UNISTD_H 1
		#define HAVE_VPRINTF 1

		#if (DJGPP_MINOR >= 4)
		#define HAVE_STRLCAT 1
		#endif

		#define RETSIGTYPE void
		#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 TIME_WITH_SYS_TIME 1

lib/makefile.dj

+126 −100

Original line number	Diff line number	Diff line
		@@ -14,13 +14,14 @@ endif
		SOURCES = base64.c connect.c content_.c cookie.c dict.c \
		easy.c escape.c file.c formdata.c ftp.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 \
		memdebug.c mprintf.c multi.c netrc.c progress.c \
		security.c sendf.c share.c speedche.c ssluse.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)
		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.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/multi.h formdata.h timeval.h http_chunks.h hostip.h \
		hash.h llist.h sendf.h if2ip.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 \
		if2ip.h strerror.h connect.h
		content_.o: content_.c setup.h config.h config.dj
		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/multi.h formdata.h timeval.h http_chunks.h hostip.h \
		hash.h llist.h getdate.h strequal.h strtok.h sendf.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 getdate.h \
		strequal.h strtok.h sendf.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/multi.h formdata.h timeval.h http_chunks.h hostip.h \
		hash.h llist.h transfer.h sendf.h progress.h strequal.h \
		../include/curl/mprintf.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 strequal.h dict.h ../include/curl/mprintf.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/multi.h formdata.h timeval.h http_chunks.h hostip.h \
		hash.h llist.h transfer.h ssluse.h url.h getinfo.h share.h \
		../include/curl/mprintf.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 \
		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 \
		../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 \
		../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 progress.h sendf.h escape.h ../include/curl/mprintf.h
		formdata.o: formdata.c setup.h config.h config.dj ../include/curl/curl.h \
		../include/curl/curl.h ../include/curl/curlver.h \
		../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
		formdata.h strequal.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 \
		../include/curl/curlver.h ../include/curl/types.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 \
		../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 sendf.h if2ip.h progress.h transfer.h escape.h http.h ftp.h \
		strequal.h ssluse.h connect.h ../include/curl/mprintf.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 sendf.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
		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 \
		../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
		../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 getinfo.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 \
		../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 share.h url.h ../include/curl/mprintf.h
		http.o: http.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 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
		../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 \
		share.h url.h ../include/curl/mprintf.h
		if2ip.o: if2ip.c setup.h config.h config.dj if2ip.h
		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 \
		../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 escape.h transfer.h ../include/curl/mprintf.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 \
		../include/curl/curl.h ../include/curl/curlver.h \
		../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.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
		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
		memdebug.o: memdebug.c
		mprintf.o: mprintf.c setup.h config.h config.dj ../include/curl/mprintf.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 \
		urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \
		llist.h transfer.h url.h connect.h progress.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 transfer.h \
		url.h connect.h progress.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 \
		strequal.h strtok.h ../include/curl/mprintf.h
		../include/curl/curlver.h ../include/curl/types.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 \
		../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 sendf.h progress.h ../include/curl/mprintf.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 sendf.h \
		progress.h ../include/curl/mprintf.h
		security.o: security.c setup.h config.h config.dj
		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 \
		urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \
		llist.h sendf.h connect.h ../include/curl/mprintf.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 sendf.h \
		connect.h ../include/curl/mprintf.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 \
		urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \
		llist.h share.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 share.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 \
		urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \
		llist.h sendf.h speedcheck.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 sendf.h \
		speedcheck.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/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
		../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 \
		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/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
		../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 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 \
		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/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
		../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 \
		urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \
		llist.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

packages/DOS/README

+7 −0

Original line number	Diff line number	Diff line
		@@ -2,3 +2,10 @@ Gisle Vanem made curl build fine on DOS (and MingW) with djgpp, OpenSSL and his
		Watt-32 stack.

		'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.

packages/DOS/common.dj

+12 −3

Original line number	Diff line number	Diff line
		@@ -25,7 +25,12 @@ USE_ZLIB = 0
		#
		# 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

		@@ -35,12 +40,12 @@ default: all
		#
		WATT32_ROOT = $(subst \,/,$(WATT_ROOT))
		OPENSSL_ROOT = /net/openssl.098
		ZLIB_ROOT = /djgpp/contrib/zlib.121
		ZLIB_ROOT = /djgpp/contrib/zlib

		CC = gcc
		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)
		CFLAGS += -DUSE_SSLEAY
		@@ -54,6 +59,10 @@ ifeq ($(USE_IPV6),1)
		CFLAGS += -DENABLE_IPV6
		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
		# we must prevent "$(DJDIR)/bin/../include/sys/version.h" from beeing

src/main.c

+16 −13

Original line number	Diff line number	Diff line
		@@ -116,16 +116,17 @@
		#define DEFAULT_MAXREDIRS 50L

		#ifdef __DJGPP__
		void *xmalloc(size_t);
		#include <dos.h>

		char msdosify(char );
		char rename_if_dos_device_name(char );
		void xfree(void *);
		struct pollfd {
		int fd;
		int events; /* in param: what to poll for */
		int revents; /* out param: what events occured */
		};
		int poll (struct pollfd *, int, int);

		/* we want to glob our own argv[] */
		char *__crt0_glob_function (char arg)
		{
		(void)arg;
		return (char**)0;
		}
		#endif /* __DJGPP__ */

		#ifndef __cplusplus
		@@ -367,7 +368,7 @@ static void help(void)
		" -v/--verbose Make the operation more talkative",
		" -V/--version Show version number and quit",
		#ifdef __DJGPP__
		" --wdebug Turn on WATT-32 debugging under DJGPP",
		" --wdebug Turn on Watt-32 debugging under DJGPP",
		#endif
		" -w/--write-out [format] What to output after completion",
		" -x/--proxy <host[:port]> Use HTTP proxy on given port",
		@@ -2209,6 +2210,8 @@ static void go_sleep(long ms)
		#ifdef WIN32
		/* Windows offers a millisecond sleep */
		Sleep(ms);
		#elif defined(__MSDOS__)
		delay(ms);
		#else
		/* Other systems must use select() for this */
		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
		bad characters in the file name before using it */
		char *file1=xmalloc(PATH_MAX);
		char file1 [PATH_MAX];

		strcpy(file1, msdosify(outfile));
		strcpy(outfile, rename_if_dos_device_name(file1));
		xfree(file1);
		free (outfile);
		outfile = strdup (rename_if_dos_device_name(file1));
		}
		#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
		* retrieve such a file would fail at best and wedge us at worst. We need
		* to rename such files. */
		extern char basename (const char );
		char *base;
		struct stat st_buf;
		char fname[PATH_MAX];