moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

whitespace fixes

Browse Source 
- replace tabs with spaces where possible
- remove line ending spaces
- remove double/triple newlines at EOF
- fix a non-UTF-8 character
- cleanup a few indentations/line continuations
  in manual examples

Closes https://github.com/curl/curl/pull/3037
This commit is contained in:
Viktor Szakats 2018-09-23 22:24:02 +00:00
parent e407e79c29
commit b801b453af
231 changed files with 770 additions and 981 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMake/CMakeConfigurableFile.in
View File

@ -1,2 +1 @@
@CMAKE_CONFIGURABLE_FILE_CONTENT@ @CMAKE_CONFIGURABLE_FILE_CONTENT@

28
Makefile.am
View File

@ -151,18 +151,18 @@ VC_DIST = projects/README \
projects/wolfssl_options.h \ projects/wolfssl_options.h \
projects/wolfssl_override.props projects/wolfssl_override.props
WINBUILD_DIST = winbuild/BUILD.WINDOWS.txt winbuild/gen_resp_file.bat \ WINBUILD_DIST = winbuild/BUILD.WINDOWS.txt winbuild/gen_resp_file.bat \
winbuild/MakefileBuild.vc winbuild/Makefile.vc winbuild/MakefileBuild.vc winbuild/Makefile.vc
EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \
RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework scripts/zsh.pl \ RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework scripts/zsh.pl \
scripts/updatemanpages.pl $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) \ scripts/updatemanpages.pl $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) \
lib/libcurl.vers.in buildconf.bat scripts/coverage.sh lib/libcurl.vers.in buildconf.bat scripts/coverage.sh
CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \
$(VC71_LIBVCPROJ) $(VC71_SRCVCPROJ) $(VC8_LIBVCPROJ) $(VC8_SRCVCPROJ) \ $(VC71_LIBVCPROJ) $(VC71_SRCVCPROJ) $(VC8_LIBVCPROJ) $(VC8_SRCVCPROJ) \
$(VC9_LIBVCPROJ) $(VC9_SRCVCPROJ) $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ) \ $(VC9_LIBVCPROJ) $(VC9_SRCVCPROJ) $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ) \
$(VC11_LIBVCXPROJ) $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ) \ $(VC11_LIBVCXPROJ) $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ) \
$(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) $(VC15_LIBVCXPROJ) $(VC15_SRCVCXPROJ) $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) $(VC15_LIBVCXPROJ) $(VC15_SRCVCXPROJ)
bin_SCRIPTS = curl-config bin_SCRIPTS = curl-config
@ -305,12 +305,12 @@ checksrc:
.PHONY: vc-ide .PHONY: vc-ide
vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \ vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \
$(VC7_SRCVCPROJ_DEPS) $(VC71_LIBVCPROJ_DEPS) $(VC71_SRCVCPROJ_DEPS) \ $(VC7_SRCVCPROJ_DEPS) $(VC71_LIBVCPROJ_DEPS) $(VC71_SRCVCPROJ_DEPS) \
$(VC8_LIBVCPROJ_DEPS) $(VC8_SRCVCPROJ_DEPS) $(VC9_LIBVCPROJ_DEPS) \ $(VC8_LIBVCPROJ_DEPS) $(VC8_SRCVCPROJ_DEPS) $(VC9_LIBVCPROJ_DEPS) \
$(VC9_SRCVCPROJ_DEPS) $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS) \ $(VC9_SRCVCPROJ_DEPS) $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS) \
$(VC11_LIBVCXPROJ_DEPS) $(VC11_SRCVCXPROJ_DEPS) $(VC12_LIBVCXPROJ_DEPS) \ $(VC11_LIBVCXPROJ_DEPS) $(VC11_SRCVCXPROJ_DEPS) $(VC12_LIBVCXPROJ_DEPS) \
$(VC12_SRCVCXPROJ_DEPS) $(VC14_LIBVCXPROJ_DEPS) $(VC14_SRCVCXPROJ_DEPS) \ $(VC12_SRCVCXPROJ_DEPS) $(VC14_LIBVCXPROJ_DEPS) $(VC14_SRCVCXPROJ_DEPS) \
$(VC15_LIBVCXPROJ_DEPS) $(VC15_SRCVCXPROJ_DEPS) $(VC15_LIBVCXPROJ_DEPS) $(VC15_SRCVCXPROJ_DEPS)
@(win32_lib_srcs='$(LIB_CFILES)'; \ @(win32_lib_srcs='$(LIB_CFILES)'; \
win32_lib_hdrs='$(LIB_HFILES) config-win32.h'; \ win32_lib_hdrs='$(LIB_HFILES) config-win32.h'; \

2
README.md
View File

@ -77,5 +77,3 @@ sponsor](https://opencollective.com/curl#sponsor)]
<a href="https://opencollective.com/curl/sponsor/7/website" target="_blank"><img src="https://opencollective.com/curl/sponsor/7/avatar.svg"></a> <a href="https://opencollective.com/curl/sponsor/7/website" target="_blank"><img src="https://opencollective.com/curl/sponsor/7/avatar.svg"></a>
<a href="https://opencollective.com/curl/sponsor/8/website" target="_blank"><img src="https://opencollective.com/curl/sponsor/8/avatar.svg"></a> <a href="https://opencollective.com/curl/sponsor/8/website" target="_blank"><img src="https://opencollective.com/curl/sponsor/8/avatar.svg"></a>
<a href="https://opencollective.com/curl/sponsor/9/website" target="_blank"><img src="https://opencollective.com/curl/sponsor/9/avatar.svg"></a> <a href="https://opencollective.com/curl/sponsor/9/website" target="_blank"><img src="https://opencollective.com/curl/sponsor/9/avatar.svg"></a>

1
docs/DEPRECATE.md
View File

@ -90,4 +90,3 @@ revert if need be.
Remove all global-cache related code from curl around April 2019 (might be Remove all global-cache related code from curl around April 2019 (might be
7.66.0). 7.66.0).

1
docs/INSTALL.cmake
View File

@ -88,4 +88,3 @@ cmake-gui
GUI. Once you have selected all the options you want, click the GUI. Once you have selected all the options you want, click the
"Generate" button. "Generate" button.
6. Run the native build tool that you used CMake to generate. 6. Run the native build tool that you used CMake to generate.

16
docs/MANUAL
View File

@ -178,8 +178,8 @@ PROXY
options: options:
curl -u "Remote-FTP-Username@remote.ftp.server Proxy-Username:Remote-Pass" \ curl -u "Remote-FTP-Username@remote.ftp.server Proxy-Username:Remote-Pass" \
--ftp-account Proxy-Password --upload-file local-file \ --ftp-account Proxy-Password --upload-file local-file \
ftp://my-ftp.proxy.server:21/remote/upload/path/ ftp://my-ftp.proxy.server:21/remote/upload/path/
See the manual for your FTP proxy to determine the form it expects to set up See the manual for your FTP proxy to determine the form it expects to set up
transfers, and curl's -v option to see exactly what curl is sending. transfers, and curl's -v option to see exactly what curl is sending.
@ -234,8 +234,8 @@ UPLOADING
SMB / SMBS SMB / SMBS
curl -T file.txt -u "domain\username:passwd" curl -T file.txt -u "domain\username:passwd" \
smb://server.example.com/share/ smb://server.example.com/share/
HTTP HTTP
@ -294,7 +294,7 @@ POST (HTTP)
Post a simple "name" and "phone" guestbook. Post a simple "name" and "phone" guestbook.
curl -d "name=Rafael%20Sagula&phone=3320780" \ curl -d "name=Rafael%20Sagula&phone=3320780" \
http://www.where.com/guest.cgi http://www.where.com/guest.cgi
How to post a form with curl, lesson #1: How to post a form with curl, lesson #1:
@ -326,8 +326,8 @@ POST (HTTP)
To post to this, you enter a curl command line like: To post to this, you enter a curl command line like:
curl -d "user=foobar&pass=12345&id=blablabla&ding=submit" (continues) curl -d "user=foobar&pass=12345&id=blablabla&ding=submit" \
http://www.formpost.com/getthis/post.cgi http://www.formpost.com/getthis/post.cgi
While -d uses the application/x-www-form-urlencoded mime-type, generally While -d uses the application/x-www-form-urlencoded mime-type, generally
@ -342,7 +342,7 @@ POST (HTTP)
with different content types using the following syntax: with different content types using the following syntax:
curl -F "coolfiles=@fil1.gif;type=image/gif,fil2.txt,fil3.html" \ curl -F "coolfiles=@fil1.gif;type=image/gif,fil2.txt,fil3.html" \
http://www.post.com/postit.cgi http://www.post.com/postit.cgi
If the content-type is not specified, curl will try to guess from the file If the content-type is not specified, curl will try to guess from the file
extension (it only knows a few), or use the previously specified type (from extension (it only knows a few), or use the previously specified type (from

1
docs/Makefile.am
View File

@ -116,4 +116,3 @@ pdf: $(PDFPAGES)
distclean: distclean:
rm -f $(CLEANFILES) rm -f $(CLEANFILES)

2
docs/README.netware
View File

@ -22,5 +22,3 @@ README.netware
curl -M >manual.txt curl -M >manual.txt
Read the INSTALL file for instructions on how to compile curl self. Read the INSTALL file for instructions on how to compile curl self.

2
docs/README.win32
View File

@ -21,5 +21,3 @@ README.win32
curl -M >manual.txt curl -M >manual.txt
Read the INSTALL file for instructions on how to compile curl self. Read the INSTALL file for instructions on how to compile curl self.

1
docs/cmdline-opts/gen.pl
View File

@ -388,4 +388,3 @@ sub getargs {
indexoptions(); indexoptions();
getargs(); getargs();

1
docs/cmdline-opts/metalink.d
View File

@ -24,4 +24,3 @@ Metalink file at the time of this writing. Also note that if --metalink and
including headers in the response will break Metalink parser and if the including headers in the response will break Metalink parser and if the
headers are included in the file described in Metalink file, hash check will headers are included in the file described in Metalink file, hash check will
fail. fail.

2
docs/examples/Makefile.am
View File

@ -23,7 +23,7 @@
AUTOMAKE_OPTIONS = foreign nostdinc AUTOMAKE_OPTIONS = foreign nostdinc
EXTRA_DIST = README Makefile.example Makefile.inc Makefile.m32 \ EXTRA_DIST = README Makefile.example Makefile.inc Makefile.m32 \
Makefile.netware makefile.dj $(COMPLICATED_EXAMPLES) Makefile.netware makefile.dj $(COMPLICATED_EXAMPLES)
# Specify our include paths here, and do it relative to $(top_srcdir) and # Specify our include paths here, and do it relative to $(top_srcdir) and
# $(top_builddir), to ensure that these paths which belong to the library # $(top_builddir), to ensure that these paths which belong to the library

220
docs/examples/Makefile.netware
View File

@ -9,7 +9,7 @@
# Edit the path below to point to the base of your Novell NDK. # Edit the path below to point to the base of your Novell NDK.
ifndef NDKBASE ifndef NDKBASE
NDKBASE = c:/novell NDKBASE = c:/novell
endif endif
# Edit the path below to point to the base of your Zlib sources. # Edit the path below to point to the base of your Zlib sources.
@ -53,17 +53,17 @@ LIBCARES_PATH = ../../ares
endif endif
ifndef INSTDIR ifndef INSTDIR
INSTDIR = ..$(DS)..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw INSTDIR = ..$(DS)..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
endif endif
# Edit the vars below to change NLM target settings. # Edit the vars below to change NLM target settings.
TARGET = examples TARGET = examples
VERSION = $(LIBCURL_VERSION) VERSION = $(LIBCURL_VERSION)
COPYR = Copyright (C) $(LIBCURL_COPYRIGHT_STR) COPYR = Copyright (C) $(LIBCURL_COPYRIGHT_STR)
DESCR = curl ($(LIBARCH)) DESCR = curl ($(LIBARCH))
MTSAFE = YES MTSAFE = YES
STACK = 8192 STACK = 8192
SCREEN = Example Program SCREEN = Example Program
# Comment the line below if you don't want to load protected automatically. # Comment the line below if you don't want to load protected automatically.
# LDRING = 3 # LDRING = 3
@ -77,39 +77,39 @@ endif
# must be equal to NDEBUG or DEBUG, CURLDEBUG # must be equal to NDEBUG or DEBUG, CURLDEBUG
ifndef DB ifndef DB
DB = NDEBUG DB = NDEBUG
endif endif
# Optimization: -O<n> or debugging: -g # Optimization: -O<n> or debugging: -g
ifeq ($(DB),NDEBUG) ifeq ($(DB),NDEBUG)
OPT = -O2 OPT = -O2
OBJDIR = release OBJDIR = release
else else
OPT = -g OPT = -g
OBJDIR = debug OBJDIR = debug
endif endif
# The following lines defines your compiler. # The following lines defines your compiler.
ifdef CWFolder ifdef CWFolder
METROWERKS = $(CWFolder) METROWERKS = $(CWFolder)
endif endif
ifdef METROWERKS ifdef METROWERKS
# MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support # MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support
MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support
CC = mwccnlm CC = mwccnlm
else else
CC = gcc CC = gcc
endif endif
PERL = perl PERL = perl
# Here you can find a native Win32 binary of the original awk: # Here you can find a native Win32 binary of the original awk:
# http://www.gknw.net/development/prgtools/awk-20100523.zip # http://www.gknw.net/development/prgtools/awk-20100523.zip
AWK = awk AWK = awk
CP = cp -afv CP = cp -afv
MKDIR = mkdir MKDIR = mkdir
# RM = rm -f # RM = rm -f
# If you want to mark the target as MTSAFE you will need a tool for # If you want to mark the target as MTSAFE you will need a tool for
# generating the xdc data for the linker; here's a minimal tool: # generating the xdc data for the linker; here's a minimal tool:
# http://www.gknw.net/development/prgtools/mkxdc.zip # http://www.gknw.net/development/prgtools/mkxdc.zip
MPKXDC = mkxdc MPKXDC = mkxdc
# LIBARCH_U = $(shell $(AWK) 'BEGIN {print toupper(ARGV[1])}' $(LIBARCH)) # LIBARCH_U = $(shell $(AWK) 'BEGIN {print toupper(ARGV[1])}' $(LIBARCH))
LIBARCH_L = $(shell $(AWK) 'BEGIN {print tolower(ARGV[1])}' $(LIBARCH)) LIBARCH_L = $(shell $(AWK) 'BEGIN {print tolower(ARGV[1])}' $(LIBARCH))
@ -118,52 +118,52 @@ LIBARCH_L = $(shell $(AWK) 'BEGIN {print tolower(ARGV[1])}' $(LIBARCH))
-include $(OBJDIR)/version.inc -include $(OBJDIR)/version.inc
# Global flags for all compilers # Global flags for all compilers
CFLAGS += $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc CFLAGS += $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
ifeq ($(CC),mwccnlm) ifeq ($(CC),mwccnlm)
LD = mwldnlm LD = mwldnlm
LDFLAGS = -nostdlib $< $(PRELUDE) $(LDLIBS) -o $@ -commandfile LDFLAGS = -nostdlib $< $(PRELUDE) $(LDLIBS) -o $@ -commandfile
LIBEXT = lib LIBEXT = lib
CFLAGS += -gccinc -inline off -opt nointrinsics -proc 586 CFLAGS += -gccinc -inline off -opt nointrinsics -proc 586
CFLAGS += -relax_pointers CFLAGS += -relax_pointers
#CFLAGS += -w on #CFLAGS += -w on
ifeq ($(LIBARCH),LIBC) ifeq ($(LIBARCH),LIBC)
ifeq ($(POSIXFL),1) ifeq ($(POSIXFL),1)
PRELUDE = $(NDK_LIBC)/imports/posixpre.o PRELUDE = $(NDK_LIBC)/imports/posixpre.o
else
PRELUDE = $(NDK_LIBC)/imports/libcpre.o
endif
CFLAGS += -align 4
else
# PRELUDE = $(NDK_CLIB)/imports/clibpre.o
# to avoid the __init_* / __deinit_* woes don't use prelude from NDK
PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj"
# CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h"
CFLAGS += -align 1
endif
else else
PRELUDE = $(NDK_LIBC)/imports/libcpre.o LD = nlmconv
endif LDFLAGS = -T
CFLAGS += -align 4 LIBEXT = a
else CFLAGS += -m32
# PRELUDE = $(NDK_CLIB)/imports/clibpre.o CFLAGS += -fno-builtin -fno-strict-aliasing
# to avoid the __init_* / __deinit_* woes don't use prelude from NDK ifeq ($(findstring gcc,$(CC)),gcc)
PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj" CFLAGS += -fpcc-struct-return
# CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h" endif
CFLAGS += -align 1 CFLAGS += -Wall # -pedantic
endif ifeq ($(LIBARCH),LIBC)
else ifeq ($(POSIXFL),1)
LD = nlmconv PRELUDE = $(NDK_LIBC)/imports/posixpre.gcc.o
LDFLAGS = -T else
LIBEXT = a PRELUDE = $(NDK_LIBC)/imports/libcpre.gcc.o
CFLAGS += -m32 endif
CFLAGS += -fno-builtin -fno-strict-aliasing else
ifeq ($(findstring gcc,$(CC)),gcc) # PRELUDE = $(NDK_CLIB)/imports/clibpre.gcc.o
CFLAGS += -fpcc-struct-return # to avoid the __init_* / __deinit_* woes don't use prelude from NDK
endif # http://www.gknw.net/development/mk_nlm/gcc_pre.zip
CFLAGS += -Wall # -pedantic PRELUDE = $(NDK_ROOT)/pre/prelude.o
ifeq ($(LIBARCH),LIBC) CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
ifeq ($(POSIXFL),1) endif
PRELUDE = $(NDK_LIBC)/imports/posixpre.gcc.o
else
PRELUDE = $(NDK_LIBC)/imports/libcpre.gcc.o
endif
else
# PRELUDE = $(NDK_CLIB)/imports/clibpre.gcc.o
# to avoid the __init_* / __deinit_* woes don't use prelude from NDK
# http://www.gknw.net/development/mk_nlm/gcc_pre.zip
PRELUDE = $(NDK_ROOT)/pre/prelude.o
CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
endif
endif endif
NDK_ROOT = $(NDKBASE)/ndk NDK_ROOT = $(NDKBASE)/ndk
@ -216,91 +216,91 @@ ENABLE_IPV6 = 1
endif endif
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS = $(CURL_LIB)/libcurl.$(LIBEXT) LDLIBS = $(CURL_LIB)/libcurl.$(LIBEXT)
ifdef WITH_ARES ifdef WITH_ARES
LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT) LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)
endif endif
else else
MODULES = libcurl.nlm MODULES = libcurl.nlm
IMPORTS = @$(CURL_LIB)/libcurl.imp IMPORTS = @$(CURL_LIB)/libcurl.imp
endif endif
ifdef WITH_SSH2 ifdef WITH_SSH2
# INCLUDES += -I$(LIBSSH2_PATH)/include # INCLUDES += -I$(LIBSSH2_PATH)/include
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT) LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)
else else
MODULES += libssh2.nlm MODULES += libssh2.nlm
IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp
endif endif
endif endif
ifdef WITH_RTMP ifdef WITH_RTMP
# INCLUDES += -I$(LIBRTMP_PATH) # INCLUDES += -I$(LIBRTMP_PATH)
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS += $(LIBRTMP_PATH)/librtmp/librtmp.$(LIBEXT) LDLIBS += $(LIBRTMP_PATH)/librtmp/librtmp.$(LIBEXT)
endif endif
endif endif
ifdef WITH_SSL ifdef WITH_SSL
INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L) INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT) LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT) LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
IMPORTS += GetProcessSwitchCount RunningProcess IMPORTS += GetProcessSwitchCount RunningProcess
else else
ifdef WITH_AXTLS ifdef WITH_AXTLS
INCLUDES += -I$(AXTLS_PATH)/inc INCLUDES += -I$(AXTLS_PATH)/inc
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT) LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT)
else else
MODULES += libaxtls.nlm MODULES += libaxtls.nlm
IMPORTS += $(AXTLS_PATH)/lib/libaxtls.imp IMPORTS += $(AXTLS_PATH)/lib/libaxtls.imp
endif endif
endif endif
endif endif
ifdef WITH_ZLIB ifdef WITH_ZLIB
# INCLUDES += -I$(ZLIB_PATH) # INCLUDES += -I$(ZLIB_PATH)
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT) LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)
else else
MODULES += libz.nlm MODULES += libz.nlm
IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
endif endif
endif endif
ifdef WITH_IDN ifdef WITH_IDN
# INCLUDES += -I$(LIBIDN_PATH)/include # INCLUDES += -I$(LIBIDN_PATH)/include
LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT) LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT)
endif endif
ifeq ($(LIBARCH),LIBC) ifeq ($(LIBARCH),LIBC)
INCLUDES += -I$(NDK_LIBC)/include INCLUDES += -I$(NDK_LIBC)/include
# INCLUDES += -I$(NDK_LIBC)/include/nks # INCLUDES += -I$(NDK_LIBC)/include/nks
# INCLUDES += -I$(NDK_LIBC)/include/winsock # INCLUDES += -I$(NDK_LIBC)/include/winsock
CFLAGS += -D_POSIX_SOURCE CFLAGS += -D_POSIX_SOURCE
else else
INCLUDES += -I$(NDK_CLIB)/include/nlm INCLUDES += -I$(NDK_CLIB)/include/nlm
# INCLUDES += -I$(NDK_CLIB)/include # INCLUDES += -I$(NDK_CLIB)/include
endif endif
ifndef DISABLE_LDAP ifndef DISABLE_LDAP
# INCLUDES += -I$(NDK_LDAP)/$(LIBARCH_L)/inc # INCLUDES += -I$(NDK_LDAP)/$(LIBARCH_L)/inc
endif endif
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)
ifeq ($(MTSAFE),YES) ifeq ($(MTSAFE),YES)
XDCOPT = -n XDCOPT = -n
endif endif
ifeq ($(MTSAFE),NO) ifeq ($(MTSAFE),NO)
XDCOPT = -u XDCOPT = -u
endif endif
ifdef XDCOPT ifdef XDCOPT
XDCDATA = $(OBJDIR)/$(TARGET).xdc XDCDATA = $(OBJDIR)/$(TARGET).xdc
endif endif
ifeq ($(findstring /sh,$(SHELL)),/sh) ifeq ($(findstring /sh,$(SHELL)),/sh)
DL = ' DL = '
DS = / DS = /
PCT = % PCT = %
#-include $(NDKBASE)/nlmconv/ncpfs.inc #-include $(NDKBASE)/nlmconv/ncpfs.inc
else else
DS = \\ DS = \\
PCT = %% PCT = %%
endif endif
# Makefile.inc provides the CSOURCES and HHEADERS defines # Makefile.inc provides the CSOURCES and HHEADERS defines

1
docs/examples/curlgtk.c
View File

@ -106,4 +106,3 @@ int main(int argc, char **argv)
gdk_threads_leave(); gdk_threads_leave();
return 0; return 0;
} }

1
docs/examples/makefile.dj
View File

@ -53,4 +53,3 @@ clean vclean realclean:
- rm -f $(PROGRAMS) depend.dj - rm -f $(PROGRAMS) depend.dj
-include depend.dj -include depend.dj

2
docs/examples/version-check.pl
View File

@ -101,5 +101,3 @@ for my $w (@recent) {
} }
last; last;
} }

160
docs/libcurl/Makefile.inc
View File

@ -1,83 +1,83 @@
# Shared between Makefile.am and CMakeLists.txt # Shared between Makefile.am and CMakeLists.txt
man_MANS = \ man_MANS = \
curl_easy_cleanup.3 \ curl_easy_cleanup.3 \
curl_easy_duphandle.3 \ curl_easy_duphandle.3 \
curl_easy_escape.3 \ curl_easy_escape.3 \
curl_easy_getinfo.3 \ curl_easy_getinfo.3 \
curl_easy_init.3 \ curl_easy_init.3 \
curl_easy_pause.3 \ curl_easy_pause.3 \
curl_easy_perform.3 \ curl_easy_perform.3 \
curl_easy_recv.3 \ curl_easy_recv.3 \
curl_easy_reset.3 \ curl_easy_reset.3 \
curl_easy_send.3 \ curl_easy_send.3 \
curl_easy_setopt.3 \ curl_easy_setopt.3 \
curl_easy_strerror.3 \ curl_easy_strerror.3 \
curl_easy_unescape.3 \ curl_easy_unescape.3 \
curl_easy_upkeep.3 \ curl_easy_upkeep.3 \
curl_escape.3 \ curl_escape.3 \
curl_formadd.3 \ curl_formadd.3 \
curl_formfree.3 \ curl_formfree.3 \
curl_formget.3 \ curl_formget.3 \
curl_free.3 \ curl_free.3 \
curl_getdate.3 \ curl_getdate.3 \
curl_getenv.3 \ curl_getenv.3 \
curl_global_cleanup.3 \ curl_global_cleanup.3 \
curl_global_init.3 \ curl_global_init.3 \
curl_global_init_mem.3 \ curl_global_init_mem.3 \
curl_global_sslset.3 \ curl_global_sslset.3 \
curl_mime_addpart.3 \ curl_mime_addpart.3 \
curl_mime_data.3 \ curl_mime_data.3 \
curl_mime_data_cb.3 \ curl_mime_data_cb.3 \
curl_mime_encoder.3 \ curl_mime_encoder.3 \
curl_mime_filedata.3 \ curl_mime_filedata.3 \
curl_mime_filename.3 \ curl_mime_filename.3 \
curl_mime_free.3 \ curl_mime_free.3 \
curl_mime_headers.3 \ curl_mime_headers.3 \
curl_mime_init.3 \ curl_mime_init.3 \
curl_mime_name.3 \ curl_mime_name.3 \
curl_mime_subparts.3 \ curl_mime_subparts.3 \
curl_mime_type.3 \ curl_mime_type.3 \
curl_mprintf.3 \ curl_mprintf.3 \
curl_multi_add_handle.3 \ curl_multi_add_handle.3 \
curl_multi_assign.3 \ curl_multi_assign.3 \
curl_multi_cleanup.3 \ curl_multi_cleanup.3 \
curl_multi_fdset.3 \ curl_multi_fdset.3 \
curl_multi_info_read.3 \ curl_multi_info_read.3 \
curl_multi_init.3 \ curl_multi_init.3 \
curl_multi_perform.3 \ curl_multi_perform.3 \
curl_multi_remove_handle.3 \ curl_multi_remove_handle.3 \
curl_multi_setopt.3 \ curl_multi_setopt.3 \
curl_multi_socket.3 \ curl_multi_socket.3 \
curl_multi_socket_action.3 \ curl_multi_socket_action.3 \
curl_multi_socket_all.3 \ curl_multi_socket_all.3 \
curl_multi_strerror.3 \ curl_multi_strerror.3 \
curl_multi_timeout.3 \ curl_multi_timeout.3 \
curl_multi_wait.3 \ curl_multi_wait.3 \
curl_share_cleanup.3 \ curl_share_cleanup.3 \
curl_share_init.3 \ curl_share_init.3 \
curl_share_setopt.3 \ curl_share_setopt.3 \
curl_share_strerror.3 \ curl_share_strerror.3 \
curl_slist_append.3 \ curl_slist_append.3 \
curl_slist_free_all.3 \ curl_slist_free_all.3 \
curl_strequal.3 \ curl_strequal.3 \
curl_strnequal.3 \ curl_strnequal.3 \
curl_unescape.3 \ curl_unescape.3 \
curl_url.3 \ curl_url.3 \
curl_url_cleanup.3 \ curl_url_cleanup.3 \
curl_url_dup.3 \ curl_url_dup.3 \
curl_url_get.3 \ curl_url_get.3 \
curl_url_set.3 \ curl_url_set.3 \
curl_version.3 \ curl_version.3 \
curl_version_info.3 \ curl_version_info.3 \
libcurl-easy.3 \ libcurl-easy.3 \
libcurl-env.3 \ libcurl-env.3 \
libcurl-errors.3 \ libcurl-errors.3 \
libcurl-multi.3 \ libcurl-multi.3 \
libcurl-security.3 \ libcurl-security.3 \
libcurl-share.3 \ libcurl-share.3 \
libcurl-symbols.3 \ libcurl-symbols.3 \
libcurl-thread.3 \ libcurl-thread.3 \
libcurl-tutorial.3 \ libcurl-tutorial.3 \
libcurl-url.3 \ libcurl-url.3 \
libcurl.3 libcurl.3

1
docs/libcurl/curl_easy_duphandle.3
View File

@ -49,4 +49,3 @@ returned.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR curl_easy_init "(3)," curl_easy_cleanup "(3)," curl_easy_reset "(3)," .BR curl_easy_init "(3)," curl_easy_cleanup "(3)," curl_easy_reset "(3),"
.BR curl_global_init "(3)" .BR curl_global_init "(3)"

1
docs/libcurl/curl_easy_perform.3
View File

@ -72,4 +72,3 @@ if(curl) {
.BR curl_easy_init "(3), " curl_easy_setopt "(3), " .BR curl_easy_init "(3), " curl_easy_setopt "(3), "
.BR curl_multi_add_handle "(3), " curl_multi_perform "(3), " .BR curl_multi_add_handle "(3), " curl_multi_perform "(3), "
.BR libcurl-errors "(3), " .BR libcurl-errors "(3), "

1
docs/libcurl/curl_easy_reset.3
View File

@ -41,4 +41,3 @@ Nothing
.SH "SEE ALSO" .SH "SEE ALSO"
.BR curl_easy_init "(3)," curl_easy_cleanup "(3)," curl_easy_setopt "(3)," .BR curl_easy_init "(3)," curl_easy_cleanup "(3)," curl_easy_setopt "(3),"
.BR curl_easy_duphandle "(3)" .BR curl_easy_duphandle "(3)"

1
docs/libcurl/curl_global_init_mem.3
View File

@ -62,4 +62,3 @@ screw things up for libcurl. Take care!
.SH "SEE ALSO" .SH "SEE ALSO"
.BR curl_global_init "(3), " .BR curl_global_init "(3), "
.BR curl_global_cleanup "(3), " .BR curl_global_cleanup "(3), "

1
docs/libcurl/curl_multi_init.3
View File

@ -37,4 +37,3 @@ If this function returns NULL, something went wrong and you cannot use the
other curl functions. other curl functions.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR curl_multi_cleanup "(3)," curl_global_init "(3)," curl_easy_init "(3)" .BR curl_multi_cleanup "(3)," curl_global_init "(3)," curl_easy_init "(3)"

1
docs/libcurl/curl_multi_timeout.3
View File

@ -76,4 +76,3 @@ This function was added in libcurl 7.15.4.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR curl_multi_fdset "(3), " curl_multi_info_read "(3), " .BR curl_multi_fdset "(3), " curl_multi_info_read "(3), "
.BR curl_multi_socket "(3), " curl_multi_setopt "(3) " .BR curl_multi_socket "(3), " curl_multi_setopt "(3) "

1
docs/libcurl/curl_share_init.3
View File

@ -41,4 +41,3 @@ If this function returns NULL, something went wrong (out of memory, etc.)
and therefore the share object was not created. and therefore the share object was not created.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR curl_share_cleanup "(3), " curl_share_setopt "(3)" .BR curl_share_cleanup "(3), " curl_share_setopt "(3)"

1
docs/libcurl/curl_slist_free_all.3
View File

@ -53,4 +53,3 @@ curl_slist_free_all(slist); /* free the list again */
.fi .fi
.SH "SEE ALSO" .SH "SEE ALSO"
.BR curl_slist_append "(3), " .BR curl_slist_append "(3), "

1
docs/libcurl/curl_version_info.3
View File

@ -186,4 +186,3 @@ entry.
A pointer to a curl_version_info_data struct. A pointer to a curl_version_info_data struct.
.SH "SEE ALSO" .SH "SEE ALSO"
\fIcurl_version(3)\fP \fIcurl_version(3)\fP

1
docs/libcurl/libcurl-security.3
View File

@ -339,4 +339,3 @@ sensitive data.
To avoid this problem, you must of course use your common sense. Often, you To avoid this problem, you must of course use your common sense. Often, you
can just edit out the sensitive data or just search/replace your true can just edit out the sensitive data or just search/replace your true
information with faked data. information with faked data.

1
docs/libcurl/opts/CURLMOPT_MAXCONNECTS.3
View File

@ -63,4 +63,3 @@ Returns CURLM_OK if the option is supported, and CURLM_UNKNOWN_OPTION if not.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR CURLMOPT_MAX_HOST_CONNECTIONS "(3), " .BR CURLMOPT_MAX_HOST_CONNECTIONS "(3), "
.BR CURLOPT_MAXCONNECTS "(3), " .BR CURLOPT_MAXCONNECTS "(3), "

1
docs/libcurl/opts/CURLMOPT_SOCKETFUNCTION.3
View File

@ -98,4 +98,3 @@ Returns CURLM_OK.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR CURLMOPT_SOCKETDATA "(3), " curl_multi_socket_action "(3), " .BR CURLMOPT_SOCKETDATA "(3), " curl_multi_socket_action "(3), "
.BR CURLMOPT_TIMERFUNCTION "(3) " .BR CURLMOPT_TIMERFUNCTION "(3) "

1
docs/libcurl/opts/CURLOPT_PASSWORD.3
View File

@ -61,4 +61,3 @@ CURLE_OUT_OF_MEMORY if there was insufficient heap space.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR CURLOPT_USERPWD "(3), " CURLOPT_USERNAME "(3), " .BR CURLOPT_USERPWD "(3), " CURLOPT_USERNAME "(3), "
.BR CURLOPT_HTTPAUTH "(3), " CURLOPT_PROXYAUTH "(3)" .BR CURLOPT_HTTPAUTH "(3), " CURLOPT_PROXYAUTH "(3)"

1
docs/libcurl/opts/CURLOPT_PATH_AS_IS.3
View File

@ -62,4 +62,3 @@ Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR CURLOPT_STDERR "(3), " CURLOPT_DEBUGFUNCTION "(3), " .BR CURLOPT_STDERR "(3), " CURLOPT_DEBUGFUNCTION "(3), "
.BR CURLOPT_URL "(3), " .BR CURLOPT_URL "(3), "

1
docs/libcurl/opts/CURLOPT_PRE_PROXY.3
View File

@ -77,4 +77,3 @@ Returns CURLE_OK if proxies are supported, CURLE_UNKNOWN_OPTION if not, or
CURLE_OUT_OF_MEMORY if there was insufficient heap space. CURLE_OUT_OF_MEMORY if there was insufficient heap space.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR CURLOPT_PROXY "(3), " CURLOPT_HTTPPROXYTUNNEL "(3), " .BR CURLOPT_PROXY "(3), " CURLOPT_HTTPPROXYTUNNEL "(3), "

1
docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.3
View File

@ -93,4 +93,3 @@ Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR CURLOPT_USE_SSL "(3), " CURLOPT_HTTP_VERSION "(3), " .BR CURLOPT_USE_SSL "(3), " CURLOPT_HTTP_VERSION "(3), "
.BR CURLOPT_IPRESOLVE "(3) " CURLOPT_SSLVERSION "(3), " .BR CURLOPT_IPRESOLVE "(3) " CURLOPT_SSLVERSION "(3), "

4
include/curl/Makefile.am
View File

@ -20,8 +20,8 @@
# #
########################################################################### ###########################################################################
pkginclude_HEADERS = \ pkginclude_HEADERS = \
curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \ curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \
typecheck-gcc.h system.h urlapi.h typecheck-gcc.h system.h urlapi.h
pkgincludedir= $(includedir)/curl pkgincludedir= $(includedir)/curl

1
lib/CMakeLists.txt
View File

@ -124,4 +124,3 @@ install(EXPORT libcurl-target
NAMESPACE CURL:: NAMESPACE CURL::
DESTINATION ${CURL_INSTALL_CMAKE_DIR} DESTINATION ${CURL_INSTALL_CMAKE_DIR}
) )

1
lib/Makefile.Watcom
View File

@ -272,4 +272,3 @@ $(RESOURCE): libcurl.rc
.c{$(OBJ_STAT)}.obj: .c{$(OBJ_STAT)}.obj:
$(CC) $(CFLAGS) -DCURL_STATICLIB $[@ -fo=$^@ $(CC) $(CFLAGS) -DCURL_STATICLIB $[@ -fo=$^@

14
lib/Makefile.am
View File

@ -23,13 +23,13 @@ AUTOMAKE_OPTIONS = foreign nostdinc
CMAKE_DIST = CMakeLists.txt curl_config.h.cmake CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
EXTRA_DIST = Makefile.m32 config-win32.h \ EXTRA_DIST = Makefile.m32 config-win32.h \
config-win32ce.h config-riscos.h config-mac.h curl_config.h.in \ config-win32ce.h config-riscos.h config-mac.h curl_config.h.in \
makefile.dj config-dos.h libcurl.plist libcurl.rc config-amigaos.h \ makefile.dj config-dos.h libcurl.plist libcurl.rc config-amigaos.h \
makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h \ makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h \
config-os400.h setup-os400.h config-symbian.h Makefile.Watcom \ config-os400.h setup-os400.h config-symbian.h Makefile.Watcom \
config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST) \ config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST) \
firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl \ firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl \
objnames-test08.sh objnames-test10.sh objnames.inc objnames-test08.sh objnames-test10.sh objnames.inc
lib_LTLIBRARIES = libcurl.la lib_LTLIBRARIES = libcurl.la

62
lib/Makefile.m32
View File

@ -91,23 +91,23 @@ ifeq ($(CURL_RANLIB),)
CURL_RANLIB := $(CROSSPREFIX)ranlib CURL_RANLIB := $(CROSSPREFIX)ranlib
endif endif
CC = $(CURL_CC) CC = $(CURL_CC)
CFLAGS = $(CURL_CFLAG_EXTRAS) -g -O2 -Wall -W CFLAGS = $(CURL_CFLAG_EXTRAS) -g -O2 -Wall -W
CFLAGS += -fno-strict-aliasing CFLAGS += -fno-strict-aliasing
# comment LDFLAGS below to keep debug info # comment LDFLAGS below to keep debug info
LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_DLL) -s LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_DLL) -s
AR = $(CURL_AR) AR = $(CURL_AR)
RANLIB = $(CURL_RANLIB) RANLIB = $(CURL_RANLIB)
RC = $(CROSSPREFIX)windres RC = $(CROSSPREFIX)windres
RCFLAGS = --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF RCFLAGS = --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF
STRIP = $(CROSSPREFIX)strip -g STRIP = $(CROSSPREFIX)strip -g
# Set environment var ARCH to your architecture to override autodetection. # Set environment var ARCH to your architecture to override autodetection.
ifndef ARCH ifndef ARCH
ifeq ($(findstring x86_64,$(shell $(CC) -dumpmachine)),x86_64) ifeq ($(findstring x86_64,$(shell $(CC) -dumpmachine)),x86_64)
ARCH = w64 ARCH = w64
else else
ARCH = w32 ARCH = w32
endif endif
endif endif
@ -123,30 +123,30 @@ endif
# Platform-dependent helper tool macros # Platform-dependent helper tool macros
ifeq ($(findstring /sh,$(SHELL)),/sh) ifeq ($(findstring /sh,$(SHELL)),/sh)
DEL = rm -f $1 DEL = rm -f $1
RMDIR = rm -fr $1 RMDIR = rm -fr $1
MKDIR = mkdir -p $1 MKDIR = mkdir -p $1
COPY = -cp -afv $1 $2 COPY = -cp -afv $1 $2
#COPYR = -cp -afr $1/* $2 #COPYR = -cp -afr $1/* $2
COPYR = -rsync -aC $1/* $2 COPYR = -rsync -aC $1/* $2
TOUCH = touch $1 TOUCH = touch $1
CAT = cat CAT = cat
ECHONL = echo "" ECHONL = echo ""
DL = ' DL = '
else else
ifeq "$(OS)" "Windows_NT" ifeq "$(OS)" "Windows_NT"
DEL = -del 2>NUL /q /f $(subst /,\,$1) DEL = -del 2>NUL /q /f $(subst /,\,$1)
RMDIR = -rd 2>NUL /q /s $(subst /,\,$1) RMDIR = -rd 2>NUL /q /s $(subst /,\,$1)
else else
DEL = -del 2>NUL $(subst /,\,$1) DEL = -del 2>NUL $(subst /,\,$1)
RMDIR = -deltree 2>NUL /y $(subst /,\,$1) RMDIR = -deltree 2>NUL /y $(subst /,\,$1)
endif endif
MKDIR = -md 2>NUL $(subst /,\,$1) MKDIR = -md 2>NUL $(subst /,\,$1)
COPY = -copy 2>NUL /y $(subst /,\,$1) $(subst /,\,$2) COPY = -copy 2>NUL /y $(subst /,\,$1) $(subst /,\,$2)
COPYR = -xcopy 2>NUL /q /y /e $(subst /,\,$1) $(subst /,\,$2) COPYR = -xcopy 2>NUL /q /y /e $(subst /,\,$1) $(subst /,\,$2)
TOUCH = copy 2>&1>NUL /b $(subst /,\,$1) +,, TOUCH = copy 2>&1>NUL /b $(subst /,\,$1) +,,
CAT = type CAT = type
ECHONL = $(ComSpec) /c echo. ECHONL = $(ComSpec) /c echo.
endif endif
######################################################## ########################################################

253
lib/Makefile.netware
View File

@ -31,7 +31,7 @@
# Edit the path below to point to the base of your Novell NDK. # Edit the path below to point to the base of your Novell NDK.
ifndef NDKBASE ifndef NDKBASE
NDKBASE = c:/novell NDKBASE = c:/novell
endif endif
# Edit the path below to point to the base of your Zlib sources. # Edit the path below to point to the base of your Zlib sources.
@ -80,19 +80,19 @@ LIBCARES_PATH = ../ares
endif endif
ifndef INSTDIR ifndef INSTDIR
INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
endif endif
# Edit the vars below to change NLM target settings. # Edit the vars below to change NLM target settings.
TARGET = libcurl TARGET = libcurl
VERSION = $(LIBCURL_VERSION) VERSION = $(LIBCURL_VERSION)
COPYR = Copyright (C) $(LIBCURL_COPYRIGHT_STR) COPYR = Copyright (C) $(LIBCURL_COPYRIGHT_STR)
DESCR = curl libcurl $(LIBCURL_VERSION_STR) ($(LIBARCH)) - https://curl.haxx.se DESCR = curl libcurl $(LIBCURL_VERSION_STR) ($(LIBARCH)) - https://curl.haxx.se
MTSAFE = YES MTSAFE = YES
STACK = 64000 STACK = 64000
SCREEN = none SCREEN = none
EXPORTF = $(TARGET).imp EXPORTF = $(TARGET).imp
EXPORTS = @$(EXPORTF) EXPORTS = @$(EXPORTF)
# Uncomment the next line to enable linking with POSIX semantics. # Uncomment the next line to enable linking with POSIX semantics.
# POSIXFL = 1 # POSIXFL = 1
@ -104,39 +104,39 @@ endif
# must be equal to NDEBUG or DEBUG, CURLDEBUG # must be equal to NDEBUG or DEBUG, CURLDEBUG
ifndef DB ifndef DB
DB = NDEBUG DB = NDEBUG
endif endif
# Optimization: -O<n> or debugging: -g # Optimization: -O<n> or debugging: -g
ifeq ($(DB),NDEBUG) ifeq ($(DB),NDEBUG)
OPT = -O2 OPT = -O2
OBJDIR = release OBJDIR = release
else else
OPT = -g OPT = -g
OBJDIR = debug OBJDIR = debug
endif endif
# The following lines defines your compiler. # The following lines defines your compiler.
ifdef CWFolder ifdef CWFolder
METROWERKS = $(CWFolder) METROWERKS = $(CWFolder)
endif endif
ifdef METROWERKS ifdef METROWERKS
# MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support # MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support
MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support
CC = mwccnlm CC = mwccnlm
else else
CC = gcc CC = gcc
endif endif
PERL = perl PERL = perl
# Here you can find a native Win32 binary of the original awk: # Here you can find a native Win32 binary of the original awk:
# http://www.gknw.net/development/prgtools/awk-20100523.zip # http://www.gknw.net/development/prgtools/awk-20100523.zip
AWK = awk AWK = awk
CP = cp -afv CP = cp -afv
MKDIR = mkdir MKDIR = mkdir
# RM = rm -f # RM = rm -f
# If you want to mark the target as MTSAFE you will need a tool for # If you want to mark the target as MTSAFE you will need a tool for
# generating the xdc data for the linker; here's a minimal tool: # generating the xdc data for the linker; here's a minimal tool:
# http://www.gknw.net/development/prgtools/mkxdc.zip # http://www.gknw.net/development/prgtools/mkxdc.zip
MPKXDC = mkxdc MPKXDC = mkxdc
# LIBARCH_U = $(shell $(AWK) 'BEGIN {print toupper(ARGV[1])}' $(LIBARCH)) # LIBARCH_U = $(shell $(AWK) 'BEGIN {print toupper(ARGV[1])}' $(LIBARCH))
LIBARCH_L = $(shell $(AWK) 'BEGIN {print tolower(ARGV[1])}' $(LIBARCH)) LIBARCH_L = $(shell $(AWK) 'BEGIN {print tolower(ARGV[1])}' $(LIBARCH))
@ -145,58 +145,58 @@ LIBARCH_L = $(shell $(AWK) 'BEGIN {print tolower(ARGV[1])}' $(LIBARCH))
-include $(OBJDIR)/version.inc -include $(OBJDIR)/version.inc
# Global flags for all compilers # Global flags for all compilers
CFLAGS += $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc CFLAGS += $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
ifeq ($(CC),mwccnlm) ifeq ($(CC),mwccnlm)
LD = mwldnlm LD = mwldnlm
LDFLAGS = -nostdlib $(PRELUDE) $(OBJL) -o $@ -commandfile LDFLAGS = -nostdlib $(PRELUDE) $(OBJL) -o $@ -commandfile
AR = mwldnlm AR = mwldnlm
ARFLAGS = -nostdlib -type library -o ARFLAGS = -nostdlib -type library -o
LIBEXT = lib LIBEXT = lib
#RANLIB = #RANLIB =
CFLAGS += -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586 CFLAGS += -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586
CFLAGS += -relax_pointers CFLAGS += -relax_pointers
#CFLAGS += -w on #CFLAGS += -w on
ifeq ($(LIBARCH),LIBC) ifeq ($(LIBARCH),LIBC)
ifeq ($(POSIXFL),1) ifeq ($(POSIXFL),1)
PRELUDE = $(NDK_LIBC)/imports/posixpre.o PRELUDE = $(NDK_LIBC)/imports/posixpre.o
else
PRELUDE = $(NDK_LIBC)/imports/libcpre.o
endif
CFLAGS += -align 4
else
# PRELUDE = $(NDK_CLIB)/imports/clibpre.o
# to avoid the __init_* / __deinit_* woes don't use prelude from NDK
PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj"
# CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h"
CFLAGS += -align 1
endif
else else
PRELUDE = $(NDK_LIBC)/imports/libcpre.o LD = nlmconv
endif LDFLAGS = -T
CFLAGS += -align 4 AR = ar
else ARFLAGS = -cq
# PRELUDE = $(NDK_CLIB)/imports/clibpre.o LIBEXT = a
# to avoid the __init_* / __deinit_* woes don't use prelude from NDK RANLIB = ranlib
PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj" CFLAGS += -m32
# CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h" CFLAGS += -fno-builtin -fno-strict-aliasing
CFLAGS += -align 1 ifeq ($(findstring gcc,$(CC)),gcc)
endif CFLAGS += -fpcc-struct-return
else endif
LD = nlmconv CFLAGS += -Wall # -pedantic
LDFLAGS = -T ifeq ($(LIBARCH),LIBC)
AR = ar ifeq ($(POSIXFL),1)
ARFLAGS = -cq PRELUDE = $(NDK_LIBC)/imports/posixpre.gcc.o
LIBEXT = a else
RANLIB = ranlib PRELUDE = $(NDK_LIBC)/imports/libcpre.gcc.o
CFLAGS += -m32 endif
CFLAGS += -fno-builtin -fno-strict-aliasing else
ifeq ($(findstring gcc,$(CC)),gcc) PRELUDE = $(NDK_CLIB)/imports/clibpre.gcc.o
CFLAGS += -fpcc-struct-return # to avoid the __init_* / __deinit_* woes don't use prelude from NDK
endif # http://www.gknw.net/development/mk_nlm/gcc_pre.zip
CFLAGS += -Wall # -pedantic # PRELUDE = $(NDK_ROOT)/pre/prelude.o
ifeq ($(LIBARCH),LIBC) CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
ifeq ($(POSIXFL),1) endif
PRELUDE = $(NDK_LIBC)/imports/posixpre.gcc.o
else
PRELUDE = $(NDK_LIBC)/imports/libcpre.gcc.o
endif
else
PRELUDE = $(NDK_CLIB)/imports/clibpre.gcc.o
# to avoid the __init_* / __deinit_* woes don't use prelude from NDK
# http://www.gknw.net/development/mk_nlm/gcc_pre.zip
# PRELUDE = $(NDK_ROOT)/pre/prelude.o
CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
endif
endif endif
NDK_ROOT = $(NDKBASE)/ndk NDK_ROOT = $(NDKBASE)/ndk
@ -257,99 +257,99 @@ ENABLE_IPV6 = 1
endif endif
ifdef WITH_ARES ifdef WITH_ARES
INCLUDES += -I$(LIBCARES_PATH) INCLUDES += -I$(LIBCARES_PATH)
LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT) LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)
endif endif
ifdef WITH_SSH2 ifdef WITH_SSH2
INCLUDES += -I$(LIBSSH2_PATH)/include INCLUDES += -I$(LIBSSH2_PATH)/include
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT) LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)
else else
MODULES += libssh2.nlm MODULES += libssh2.nlm
IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp
endif endif
endif endif
ifdef WITH_RTMP ifdef WITH_RTMP
INCLUDES += -I$(LIBRTMP_PATH) INCLUDES += -I$(LIBRTMP_PATH)
LDLIBS += $(LIBRTMP_PATH)/librtmp/librtmp.$(LIBEXT) LDLIBS += $(LIBRTMP_PATH)/librtmp/librtmp.$(LIBEXT)
endif endif
ifdef WITH_SSL ifdef WITH_SSL
INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L) INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT) LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT) LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
IMPORTS += GetProcessSwitchCount RunningProcess IMPORTS += GetProcessSwitchCount RunningProcess
INSTDEP += ca-bundle.crt INSTDEP += ca-bundle.crt
else else
ifdef WITH_AXTLS ifdef WITH_AXTLS
INCLUDES += -I$(AXTLS_PATH)/inc INCLUDES += -I$(AXTLS_PATH)/inc
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT) LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT)
else else
MODULES += libaxtls.nlm MODULES += libaxtls.nlm
IMPORTS += $(AXTLS_PATH)/lib/libaxtls.imp IMPORTS += $(AXTLS_PATH)/lib/libaxtls.imp
endif endif
INSTDEP += ca-bundle.crt INSTDEP += ca-bundle.crt
endif endif
endif endif
ifdef WITH_ZLIB ifdef WITH_ZLIB
INCLUDES += -I$(ZLIB_PATH) INCLUDES += -I$(ZLIB_PATH)
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT) LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)
else else
MODULES += libz.nlm MODULES += libz.nlm
IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
endif endif
endif endif
ifdef WITH_IDN ifdef WITH_IDN
INCLUDES += -I$(LIBIDN_PATH)/include INCLUDES += -I$(LIBIDN_PATH)/include
LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT) LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT)
endif endif
ifdef WITH_NGHTTP2 ifdef WITH_NGHTTP2
INCLUDES += -I$(NGHTTP2_PATH)/include INCLUDES += -I$(NGHTTP2_PATH)/include
LDLIBS += $(NGHTTP2_PATH)/lib/libnghttp2.$(LIBEXT) LDLIBS += $(NGHTTP2_PATH)/lib/libnghttp2.$(LIBEXT)
endif endif
ifeq ($(LIBARCH),LIBC) ifeq ($(LIBARCH),LIBC)
INCLUDES += -I$(NDK_LIBC)/include INCLUDES += -I$(NDK_LIBC)/include
# INCLUDES += -I$(NDK_LIBC)/include/nks # INCLUDES += -I$(NDK_LIBC)/include/nks
# INCLUDES += -I$(NDK_LIBC)/include/winsock # INCLUDES += -I$(NDK_LIBC)/include/winsock
CFLAGS += -D_POSIX_SOURCE CFLAGS += -D_POSIX_SOURCE
else else
INCLUDES += -I$(NDK_CLIB)/include/nlm INCLUDES += -I$(NDK_CLIB)/include/nlm
# INCLUDES += -I$(NDK_CLIB)/include/nlm/obsolete # INCLUDES += -I$(NDK_CLIB)/include/nlm/obsolete
# INCLUDES += -I$(NDK_CLIB)/include # INCLUDES += -I$(NDK_CLIB)/include
endif endif
ifndef DISABLE_LDAP ifndef DISABLE_LDAP
INCLUDES += -I$(NDK_LDAP)/$(LIBARCH_L)/inc INCLUDES += -I$(NDK_LDAP)/$(LIBARCH_L)/inc
endif endif
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)
ifeq ($(MTSAFE),YES) ifeq ($(MTSAFE),YES)
XDCOPT = -n XDCOPT = -n
endif endif
ifeq ($(MTSAFE),NO) ifeq ($(MTSAFE),NO)
XDCOPT = -u XDCOPT = -u
endif endif
ifdef XDCOPT ifdef XDCOPT
XDCDATA = $(OBJDIR)/$(TARGET).xdc XDCDATA = $(OBJDIR)/$(TARGET).xdc
endif endif
ifeq ($(findstring /sh,$(SHELL)),/sh) ifeq ($(findstring /sh,$(SHELL)),/sh)
DL = ' DL = '
DS = / DS = /
PCT = % PCT = %
#-include $(NDKBASE)/nlmconv/ncpfs.inc #-include $(NDKBASE)/nlmconv/ncpfs.inc
else else
DS = \\ DS = \\
PCT = %% PCT = %%
endif endif
# Makefile.inc provides the CSOURCES and HHEADERS defines # Makefile.inc provides the CSOURCES and HHEADERS defines
include Makefile.inc include Makefile.inc
OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(notdir $(CSOURCES)))) $(OBJDIR)/nwos.o OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(notdir $(CSOURCES)))) $(OBJDIR)/nwos.o
OBJL = $(OBJS) $(OBJDIR)/nwlib.o $(LDLIBS) OBJL = $(OBJS) $(OBJDIR)/nwlib.o $(LDLIBS)
vpath %.c . vauth vtls vpath %.c . vauth vtls
@ -757,4 +757,3 @@ $(LIBCARES_PATH)/libcares.$(LIBEXT):
ca-bundle.crt: mk-ca-bundle.pl ca-bundle.crt: mk-ca-bundle.pl
@echo Creating $@ @echo Creating $@
@-$(PERL) $< -b -n $@ @-$(PERL) $< -b -n $@

1
lib/amigaos.h
View File

@ -36,4 +36,3 @@ void Curl_amiga_cleanup();
#endif #endif
#endif /* HEADER_CURL_AMIGAOS_H */ #endif /* HEADER_CURL_AMIGAOS_H */

1
lib/config-dos.h
View File

@ -181,4 +181,3 @@
#undef byte #undef byte
#endif /* HEADER_CURL_CONFIG_DOS_H */ #endif /* HEADER_CURL_CONFIG_DOS_H */

1
lib/curl_ldap.h
View File

@ -32,4 +32,3 @@ extern const struct Curl_handler Curl_handler_ldaps;
#endif #endif
#endif /* HEADER_CURL_LDAP_H */ #endif /* HEADER_CURL_LDAP_H */

1
lib/curl_setup_once.h
View File

@ -515,4 +515,3 @@ typedef int sig_atomic_t;
#endif /* HEADER_CURL_SETUP_ONCE_H */ #endif /* HEADER_CURL_SETUP_ONCE_H */

1
lib/curlx.h
View File

@ -102,4 +102,3 @@
#endif /* ENABLE_CURLX_PRINTF */ #endif /* ENABLE_CURLX_PRINTF */
#endif /* HEADER_CURL_CURLX_H */ #endif /* HEADER_CURL_CURLX_H */

1
lib/easy.c
View File

@ -1212,4 +1212,3 @@ CURLcode curl_easy_upkeep(struct Curl_easy *data)
return CURLE_OK; return CURLE_OK;
} }
} }

1
lib/easyif.h
View File

@ -30,4 +30,3 @@ CURL_EXTERN CURLcode curl_easy_perform_ev(struct Curl_easy *easy);
#endif #endif
#endif /* HEADER_CURL_EASYIF_H */ #endif /* HEADER_CURL_EASYIF_H */

1
lib/escape.h
View File

@ -31,4 +31,3 @@ CURLcode Curl_urldecode(struct Curl_easy *data,
bool reject_crlf); bool reject_crlf);
#endif /* HEADER_CURL_ESCAPE_H */ #endif /* HEADER_CURL_ESCAPE_H */

1
lib/file.h
View File

@ -38,4 +38,3 @@ extern const struct Curl_handler Curl_handler_file;
#endif #endif
#endif /* HEADER_CURL_FILE_H */ #endif /* HEADER_CURL_FILE_H */

1
lib/firefox-db2pem.sh
View File

@ -51,4 +51,3 @@ while read nickname; \
do echo $nickname | sed -e "s/Builtin Object Token://g"; \ do echo $nickname | sed -e "s/Builtin Object Token://g"; \
eval certutil -d $db -L -n "$nickname" -a ; \ eval certutil -d $db -L -n "$nickname" -a ; \
done >> $out done >> $out

1
lib/hostcheck.h
View File

@ -29,4 +29,3 @@
int Curl_cert_hostcheck(const char *match_pattern, const char *hostname); int Curl_cert_hostcheck(const char *match_pattern, const char *hostname);
#endif /* HEADER_CURL_HOSTCHECK_H */ #endif /* HEADER_CURL_HOSTCHECK_H */

1
lib/hostip.c
View File

@ -1109,4 +1109,3 @@ CURLcode Curl_once_resolved(struct connectdata *conn,
return result; return result;
} }

1
lib/http.h
View File

@ -257,4 +257,3 @@ Curl_http_output_auth(struct connectdata *conn,
up the proxy tunnel */ up the proxy tunnel */
#endif /* HEADER_CURL_HTTP_H */ #endif /* HEADER_CURL_HTTP_H */

1
lib/http2.h
View File

@ -77,4 +77,3 @@ void Curl_http2_cleanup_dependencies(struct Curl_easy *data);
#endif #endif
#endif /* HEADER_CURL_HTTP2_H */ #endif /* HEADER_CURL_HTTP2_H */

1
lib/http_chunks.h
View File

@ -88,4 +88,3 @@ struct Curl_chunker {
}; };
#endif /* HEADER_CURL_HTTP_CHUNKS_H */ #endif /* HEADER_CURL_HTTP_CHUNKS_H */

1
lib/inet_ntop.h
View File

@ -35,4 +35,3 @@ char *Curl_inet_ntop(int af, const void *addr, char *buf, size_t size);
#endif #endif
#endif /* HEADER_CURL_INET_NTOP_H */ #endif /* HEADER_CURL_INET_NTOP_H */

1
lib/inet_pton.h
View File

@ -37,4 +37,3 @@ int Curl_inet_pton(int, const char *, void *);
#endif #endif
#endif /* HEADER_CURL_INET_PTON_H */ #endif /* HEADER_CURL_INET_PTON_H */

1
lib/llist.h
View File

@ -51,4 +51,3 @@ void Curl_llist_move(struct curl_llist *, struct curl_llist_element *,
struct curl_llist *, struct curl_llist_element *); struct curl_llist *, struct curl_llist_element *);
#endif /* HEADER_CURL_LLIST_H */ #endif /* HEADER_CURL_LLIST_H */

8
lib/makefile.amiga
View File

@ -4,16 +4,16 @@
# change the follow to where you have the AmiTCP SDK v4.3 includes: # change the follow to where you have the AmiTCP SDK v4.3 includes:
ATCPSDKI= /GG/netinclude ATCPSDKI= /GG/netinclude
CC = m68k-amigaos-gcc CC = m68k-amigaos-gcc
CFLAGS = -I$(ATCPSDKI) -m68020-60 -O2 -msoft-float -noixemul -g -I. -I../include -W -Wall CFLAGS = -I$(ATCPSDKI) -m68020-60 -O2 -msoft-float -noixemul -g -I. -I../include -W -Wall
include Makefile.inc include Makefile.inc
OBJS = $(CSOURCES:.c=.o) OBJS = $(CSOURCES:.c=.o)
all: $(OBJS) all: $(OBJS)
ar cru libcurl.a $(OBJS) ar cru libcurl.a $(OBJS)
ranlib libcurl.a ranlib libcurl.a

1
lib/makefile.dj
View File

@ -69,4 +69,3 @@ realclean vclean: clean
- $(DELETE) $(CURL_LIB) - $(DELETE) $(CURL_LIB)
-include depend.dj -include depend.dj

1
lib/nonblock.h
View File

@ -28,4 +28,3 @@ int curlx_nonblock(curl_socket_t sockfd, /* operate on this */
int nonblock /* TRUE or FALSE */); int nonblock /* TRUE or FALSE */);
#endif /* HEADER_CURL_NONBLOCK_H */ #endif /* HEADER_CURL_NONBLOCK_H */

1
lib/parsedate.h
View File

@ -28,4 +28,3 @@ extern const char * const Curl_month[12];
CURLcode Curl_gmtime(time_t intime, struct tm *store); CURLcode Curl_gmtime(time_t intime, struct tm *store);
#endif /* HEADER_CURL_PARSEDATE_H */ #endif /* HEADER_CURL_PARSEDATE_H */

1
lib/progress.h
View File

@ -62,4 +62,3 @@ timediff_t Curl_pgrsLimitWaitTime(curl_off_t cursize,
#define PGRS_HEADERS_OUT (1<<7) /* set when the headers have been written */ #define PGRS_HEADERS_OUT (1<<7) /* set when the headers have been written */
#endif /* HEADER_CURL_PROGRESS_H */ #endif /* HEADER_CURL_PROGRESS_H */

1
lib/rtsp.h
View File

@ -64,4 +64,3 @@ struct RTSP {
#endif /* HEADER_CURL_RTSP_H */ #endif /* HEADER_CURL_RTSP_H */

1
lib/select.h
View File

@ -113,4 +113,3 @@ int tpf_select_libcurl(int maxfds, fd_set* reads, fd_set* writes,
#endif #endif
#endif /* HEADER_CURL_SELECT_H */ #endif /* HEADER_CURL_SELECT_H */

1
lib/slist.c
View File

@ -142,4 +142,3 @@ void curl_slist_free_all(struct curl_slist *list)
item = next; item = next;
} while(next); } while(next);
} }

1
lib/slist.h
View File

@ -37,4 +37,3 @@ struct curl_slist *Curl_slist_append_nodup(struct curl_slist *list,
char *data); char *data);
#endif /* HEADER_CURL_SLIST_H */ #endif /* HEADER_CURL_SLIST_H */

1
lib/sockaddr.h
View File

@ -40,4 +40,3 @@ struct Curl_sockaddr_storage {
}; };
#endif /* HEADER_CURL_SOCKADDR_H */ #endif /* HEADER_CURL_SOCKADDR_H */

1
lib/socks.c
View File

@ -789,4 +789,3 @@ CURLcode Curl_SOCKS5(const char *proxy_user,
} }
#endif /* CURL_DISABLE_PROXY */ #endif /* CURL_DISABLE_PROXY */

1
lib/socks.h
View File

@ -73,4 +73,3 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
#endif /* CURL_DISABLE_PROXY */ #endif /* CURL_DISABLE_PROXY */
#endif /* HEADER_CURL_SOCKS_H */ #endif /* HEADER_CURL_SOCKS_H */

1
lib/splay.c
View File

@ -274,4 +274,3 @@ int Curl_splayremovebyaddr(struct Curl_tree *t,
return 0; return 0;
} }

1
lib/telnet.h
View File

@ -26,4 +26,3 @@ extern const struct Curl_handler Curl_handler_telnet;
#endif #endif
#endif /* HEADER_CURL_TELNET_H */ #endif /* HEADER_CURL_TELNET_H */

1
lib/tftp.h
View File

@ -26,4 +26,3 @@ extern const struct Curl_handler Curl_handler_tftp;
#endif #endif
#endif /* HEADER_CURL_TFTP_H */ #endif /* HEADER_CURL_TFTP_H */

1
lib/transfer.h
View File

@ -71,4 +71,3 @@ Curl_setup_transfer (struct connectdata *data,
); );
#endif /* HEADER_CURL_TRANSFER_H */ #endif /* HEADER_CURL_TRANSFER_H */

1
lib/vtls/axtls.h
View File

@ -31,4 +31,3 @@ extern const struct Curl_ssl Curl_ssl_axtls;
#endif /* USE_AXTLS */ #endif /* USE_AXTLS */
#endif /* HEADER_CURL_AXTLS_H */ #endif /* HEADER_CURL_AXTLS_H */

1
m4/curl-compilers.m4
View File

@ -1633,4 +1633,3 @@ AC_DEFUN([CURL_VAR_STRIP], [
[$1]="$ac_var_stripped" [$1]="$ac_var_stripped"
squeeze [$1] squeeze [$1]
]) ])

2
m4/curl-confopts.m4
View File

@ -351,7 +351,6 @@ AC_DEFUN([CURL_CHECK_OPTION_RT], [
esac esac
]) ])
dnl CURL_CHECK_OPTION_WARNINGS dnl CURL_CHECK_OPTION_WARNINGS
dnl ------------------------------------------------- dnl -------------------------------------------------
dnl Verify if configure has been invoked with option dnl Verify if configure has been invoked with option
@ -649,4 +648,3 @@ AC_DEFUN([CURL_CHECK_NTLM_WB], [
NTLM_WB_ENABLED=1 NTLM_WB_ENABLED=1
fi fi
]) ])

1
m4/curl-override.m4
View File

@ -73,4 +73,3 @@ char $1 ();
choke me choke me
#endif #endif
], [return $1 ();])]) ], [return $1 ();])])

1
m4/curl-reentrant.m4
View File

@ -614,4 +614,3 @@ AC_DEFUN([CURL_CONFIGURE_THREAD_SAFE], [
fi fi
# #
]) ])

1
m4/xc-am-iface.m4
View File

@ -250,4 +250,3 @@ _XC_AMEND_DISTCLEAN_BODY([$1])
])dnl ])dnl
m4_define([$0], [])[]dnl m4_define([$0], [])[]dnl
]) ])

1
m4/xc-cc-check.m4
View File

@ -93,4 +93,3 @@ AC_DEFUN([XC_CHECK_PROG_CC], [
AC_BEFORE([$0],[_XC_PROG_CC_POSTLUDE])dnl AC_BEFORE([$0],[_XC_PROG_CC_POSTLUDE])dnl
AC_REQUIRE([_XC_PROG_CC])dnl AC_REQUIRE([_XC_PROG_CC])dnl
]) ])

1
m4/xc-lt-iface.m4
View File

@ -462,4 +462,3 @@ m4_ifdef([LT_INIT],
dnl dnl
m4_define([$0],[])dnl m4_define([$0],[])dnl
]) ])

1
m4/xc-translit.m4
View File

@ -161,4 +161,3 @@ dnl Expands to quoted result of 'translit' expansion.
AC_DEFUN([XC_QTRANSLIT], AC_DEFUN([XC_QTRANSLIT],
[XC_QUOTE(translit([$1], [$2], [$3]))]) [XC_QUOTE(translit([$1], [$2], [$3]))])

1
m4/xc-val-flgs.m4
View File

@ -240,4 +240,3 @@ AC_DEFUN([XC_CHECK_BUILD_FLAGS], [
AC_MSG_WARN([Continuing even with errors mentioned immediately above this line.]) AC_MSG_WARN([Continuing even with errors mentioned immediately above this line.])
fi fi
]) ])

1
m4/zz40-xc-ovr.m4
View File

@ -663,4 +663,3 @@ dnl
m4_pattern_forbid([^_*XC])dnl m4_pattern_forbid([^_*XC])dnl
m4_define([$0],[])dnl m4_define([$0],[])dnl
]) ])

1
m4/zz50-xc-ovr.m4
View File

@ -57,4 +57,3 @@ dnl provided elsewhere.
AC_DEFUN([XC_OVR_ZZ50], AC_DEFUN([XC_OVR_ZZ50],
[AC_BEFORE([$0],[AC_PROG_LIBTOOL])]) [AC_BEFORE([$0],[AC_PROG_LIBTOOL])])

1
m4/zz60-xc-ovr.m4
View File

@ -61,4 +61,3 @@ dnl
AC_BEFORE([$0],[AC_CONFIG_MACRO_DIR])dnl AC_BEFORE([$0],[AC_CONFIG_MACRO_DIR])dnl
AC_BEFORE([$0],[AC_CONFIG_MACRO_DIRS])dnl AC_BEFORE([$0],[AC_CONFIG_MACRO_DIRS])dnl
]) ])

1
packages/AIX/RPM/Makefile.am
View File

@ -1,2 +1 @@
EXTRA_DIST = README curl.spec.in EXTRA_DIST = README curl.spec.in

17
packages/Android/Android.mk
View File

@ -59,14 +59,14 @@ common_CFLAGS := -Wpointer-arith -Wwrite-strings -Wunused -Winline -Wnested-exte
include $(CLEAR_VARS) include $(CLEAR_VARS)
include $(LOCAL_PATH)/lib/Makefile.inc include $(LOCAL_PATH)/lib/Makefile.inc
CURL_HEADERS := \ CURL_HEADERS := \
curl.h \ curl.h \
system.h \ system.h \
curlver.h \ curlver.h \
easy.h \ easy.h \
mprintf.h \ mprintf.h \
multi.h \ multi.h \
stdcheaders.h \ stdcheaders.h \
typecheck-gcc.h typecheck-gcc.h
LOCAL_SRC_FILES := $(addprefix lib/,$(CSOURCES)) LOCAL_SRC_FILES := $(addprefix lib/,$(CSOURCES))
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include/ LOCAL_C_INCLUDES += $(LOCAL_PATH)/include/
@ -108,4 +108,3 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/lib
LOCAL_CFLAGS += $(common_CFLAGS) LOCAL_CFLAGS += $(common_CFLAGS)
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

1
packages/Linux/RPM/Makefile.am
View File

@ -1,2 +1 @@
EXTRA_DIST = README curl-ssl.spec.in curl.spec.in make_curl_rpm EXTRA_DIST = README curl-ssl.spec.in curl.spec.in make_curl_rpm

1
packages/Linux/RPM/README
View File

@ -2,4 +2,3 @@ Author: Daniel (I'm not trustworthy, replace this!)
Paul Marquis's 'make_curl_rpm' script is a fine example on how to automate the Paul Marquis's 'make_curl_rpm' script is a fine example on how to automate the
jobs. You need to fill in your own name and email at least. jobs. You need to fill in your own name and email at least.

1
packages/Linux/RPM/curl.spec.in
View File

@ -81,4 +81,3 @@ rm -rf %{builddir}
- use _mandir instead of prefix to locate man pages because - use _mandir instead of prefix to locate man pages because
_mandir is not always prefix/man/man?. _mandir is not always prefix/man/man?.

62
packages/Makefile.am
View File

@ -1,33 +1,33 @@
SUBDIRS = Win32 Linux Solaris AIX vms SUBDIRS = Win32 Linux Solaris AIX vms
EXTRA_DIST = README \ EXTRA_DIST = README \
DOS/README \ DOS/README \
DOS/common.dj \ DOS/common.dj \
NetWare/get_ver.awk \ NetWare/get_ver.awk \
NetWare/get_exp.awk \ NetWare/get_exp.awk \
OS400/README.OS400 \ OS400/README.OS400 \
OS400/ccsidcurl.c \ OS400/ccsidcurl.c \
OS400/ccsidcurl.h \ OS400/ccsidcurl.h \
OS400/curl.inc.in \ OS400/curl.inc.in \
OS400/initscript.sh \ OS400/initscript.sh \
OS400/make-include.sh \ OS400/make-include.sh \
OS400/make-lib.sh \ OS400/make-lib.sh \
OS400/make-src.sh \ OS400/make-src.sh \
OS400/make-tests.sh \ OS400/make-tests.sh \
OS400/makefile.sh \ OS400/makefile.sh \
OS400/os400sys.c \ OS400/os400sys.c \
OS400/os400sys.h \ OS400/os400sys.h \
Symbian/bwins/libcurlu.def \ Symbian/bwins/libcurlu.def \
Symbian/eabi/libcurlu.def \ Symbian/eabi/libcurlu.def \
Symbian/group/bld.inf \ Symbian/group/bld.inf \
Symbian/group/curl.iby \ Symbian/group/curl.iby \
Symbian/group/curl.mmp \ Symbian/group/curl.mmp \
Symbian/group/curl.pkg \ Symbian/group/curl.pkg \
Symbian/group/libcurl.iby \ Symbian/group/libcurl.iby \
Symbian/group/libcurl.mmp \ Symbian/group/libcurl.mmp \
Symbian/group/libcurl.pkg \ Symbian/group/libcurl.pkg \
Symbian/readme.txt \ Symbian/readme.txt \
TPF/curl.mak \ TPF/curl.mak \
TPF/maketpf.env_curl \ TPF/maketpf.env_curl \
TPF/maketpf.env_curllib \ TPF/maketpf.env_curllib \
Android/Android.mk Android/Android.mk

1
packages/NetWare/get_exp.awk
View File

@ -69,4 +69,3 @@ END {
} }
printf(" %s\n", exports[++x]) printf(" %s\n", exports[++x])
} }

1
packages/NetWare/get_ver.awk
View File

@ -41,4 +41,3 @@ BEGIN {
print "LIBCURL_VERSION_STR = " version_string print "LIBCURL_VERSION_STR = " version_string
print "LIBCURL_COPYRIGHT_STR = " copyright_string print "LIBCURL_COPYRIGHT_STR = " copyright_string
} }

1
packages/Symbian/bwins/libcurlu.def
View File

@ -58,4 +58,3 @@ EXPORTS
curl_easy_recv @ 57 NONAME curl_easy_recv @ 57 NONAME
curl_easy_send @ 58 NONAME curl_easy_send @ 58 NONAME
curl_multi_wait @ 59 NONAME curl_multi_wait @ 59 NONAME

1
packages/Symbian/eabi/libcurlu.def
View File

@ -58,4 +58,3 @@ EXPORTS
curl_easy_recv @ 57 NONAME curl_easy_recv @ 57 NONAME
curl_easy_send @ 58 NONAME curl_easy_send @ 58 NONAME
curl_multi_wait @ 59 NONAME curl_multi_wait @ 59 NONAME

1
packages/Symbian/group/curl.mmp
View File

@ -61,4 +61,3 @@ STATICLIBRARY libcrt0.lib
CAPABILITY NetworkServices CAPABILITY NetworkServices
EPOCSTACKSIZE 0x8000 EPOCSTACKSIZE 0x8000

1
packages/TPF/curl.mak
View File

@ -57,4 +57,3 @@ CFLAGS_CURL += -DCURL_DISABLE_TFTP
####################################################################### #######################################################################
include maketpf.rules include maketpf.rules

1
packages/TPF/maketpf.env_curl
View File

@ -22,4 +22,3 @@ ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/include/curl)
################################################################################ ################################################################################
CFLAGS_$(APP) += -D TPF CFLAGS_$(APP) += -D TPF

1
packages/TPF/maketpf.env_curllib
View File

@ -54,4 +54,3 @@ ROOTCDIRS := $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/lib)
################################################################################ ################################################################################
CFLAGS_$(APP) += -D TPF CFLAGS_$(APP) += -D TPF

Some files were not shown because too many files have changed in this diff Show More