check_c_compiler_flag(-Wno-long-double HAVE_C_FLAG_Wno_long_double)
if(HAVE_C_FLAG_Wno_long_double)
# The Mac version of GCC warns about use of long double. Disable it.
- get_source_file_property(MPRINTF_COMPILE_FLAGS curl_mprintf.c COMPILE_FLAGS)
+ get_source_file_property(MPRINTF_COMPILE_FLAGS mprintf.c COMPILE_FLAGS)
if(MPRINTF_COMPILE_FLAGS)
set(MPRINTF_COMPILE_FLAGS "${MPRINTF_COMPILE_FLAGS} -Wno-long-double")
else(MPRINTF_COMPILE_FLAGS)
set(MPRINTF_COMPILE_FLAGS "-Wno-long-double")
endif(MPRINTF_COMPILE_FLAGS)
- set_source_files_properties(curl_mprintf.c PROPERTIES
+ set_source_files_properties(mprintf.c PROPERTIES
COMPILE_FLAGS ${MPRINTF_COMPILE_FLAGS})
endif(HAVE_C_FLAG_Wno_long_double)
endif(CMAKE_COMPILER_IS_GNUCC AND APPLE)
#
if test ! -f configure.ac ||
test ! -f src/tool_main.c ||
- test ! -f lib/curl_urldata.h ||
+ test ! -f lib/urldata.h ||
test ! -f include/curl/curl.h ||
test ! -f m4/curl-functions.m4; then
echo "Can not run buildconf from outside of curl's source subdirectory!"
This configure script may be copied, distributed and modified under the
terms of the curl license; see COPYING for more details])
-AC_CONFIG_SRCDIR([lib/curl_urldata.h])
+AC_CONFIG_SRCDIR([lib/urldata.h])
AC_CONFIG_HEADERS(lib/curl_config.h include/curl/curlbuild.h)
AC_CONFIG_MACRO_DIR([m4])
AM_MAINTAINER_MODE
possibilities:
- Modify lib/config-win32.h
- - Modify lib/curl_setup.h
+ - Modify lib/setup.h
- Modify lib/Makefile.vc6
- Add defines to Project/Settings/C/C++/General/Preprocessor Definitions
in the vc6libcurl.dsw/vc6libcurl.dsp Visual C++ 6 IDE project.
There are plenty of entry points to the library, namely each publicly defined
function that libcurl offers to applications. All of those functions are
rather small and easy-to-follow. All the ones prefixed with 'curl_easy' are
- put in the lib/curl_easy.c file.
+ put in the lib/easy.c file.
curl_global_init_() and curl_global_cleanup() should be called by the
application to initialize and clean up global stuff in the library. As of
today, it can handle the global SSL initing if SSL is enabled and it can init
the socket layer on windows machines. libcurl itself has no "global" scope.
- All printf()-style functions use the supplied clones in lib/curl_mprintf.c.
- This makes sure we stay absolutely platform independent.
+ All printf()-style functions use the supplied clones in lib/mprintf.c. This
+ makes sure we stay absolutely platform independent.
curl_easy_init() allocates an internal struct and makes some initializations.
The returned handle does not reveal internals. This is the 'SessionHandle'
curl_easy_perform() does a whole lot of things:
- It starts off in the lib/curl_easy.c file by calling Curl_perform() and the
- main work then continues in lib/curl_url.c. The flow continues with a call to
+ It starts off in the lib/easy.c file by calling Curl_perform() and the main
+ work then continues in lib/url.c. The flow continues with a call to
Curl_connect() to connect to the remote site.
o Curl_connect()
... analyzes the URL, it separates the different components and connects to
the remote host. This may involve using a proxy and/or using SSL. The
- Curl_resolv() function in lib/curl_hostip.c is used for looking up host
- names (it does then use the proper underlying method, which may vary
- between platforms and builds).
+ Curl_resolv() function in lib/hostip.c is used for looking up host names
+ (it does then use the proper underlying method, which may vary between
+ platforms and builds).
When Curl_connect is done, we are connected to the remote site. Then it is
time to tell the server to get a document/file. Curl_do() arranges this.
Curl_do() makes sure the proper protocol-specific function is called. The
functions are named after the protocols they handle. Curl_ftp(),
Curl_http(), Curl_dict(), etc. They all reside in their respective files
- (curl_ftp.c, curl_http.c and curl_dict.c). HTTPS is handled by Curl_http()
- and FTPS by Curl_ftp().
+ (ftp.c, http.c and dict.c). HTTPS is handled by Curl_http() and FTPS by
+ Curl_ftp().
The protocol-specific functions of course deal with protocol-specific
negotiations and setup. They have access to the Curl_sendf() (from
- lib/curl_sendf.c) function to send printf-style formatted data to the
- remote host and when they're ready to make the actual file transfer they
- call the Curl_Transfer() function (in lib/curl_transfer.c) to setup the
- transfer and returns.
+ lib/sendf.c) function to send printf-style formatted data to the remote
+ host and when they're ready to make the actual file transfer they call the
+ Curl_Transfer() function (in lib/transfer.c) to setup the transfer and
+ returns.
If this DO function fails and the connection is being re-used, libcurl will
then close this connection, setup a new connection and re-issue the DO
o Transfer()
- Curl_perform() then calls Transfer() in lib/curl_transfer.c that performs
- the entire file transfer.
+ Curl_perform() then calls Transfer() in lib/transfer.c that performs the
+ entire file transfer.
- During transfer, the progress functions in lib/curl_progress.c are called
- at a frequent interval (or at the user's choice, a specified callback
- might get called). The speedcheck functions in lib/curl_speedcheck.c are
- also used to verify that the transfer is as fast as required.
+ During transfer, the progress functions in lib/progress.c are called at a
+ frequent interval (or at the user's choice, a specified callback might get
+ called). The speedcheck functions in lib/speedcheck.c are also used to
+ verify that the transfer is as fast as required.
o Curl_done()
HTTP(S)
HTTP offers a lot and is the protocol in curl that uses the most lines of
- code. There is a special file (lib/curl_formdata.c) that offers all the
- multipart post functions.
+ code. There is a special file (lib/formdata.c) that offers all the multipart
+ post functions.
- base64-functions for user+password stuff (and more) is in (lib/curl_base64.c)
- and all functions for parsing and sending cookies in (lib/curl_cookie.c).
+ base64-functions for user+password stuff (and more) is in (lib/base64.c) and
+ all functions for parsing and sending cookies are found in (lib/cookie.c).
HTTPS uses in almost every means the same procedure as HTTP, with only two
exceptions: the connect procedure is different and the function used to read
the source by the use of Curl_read() for reading and Curl_write() for writing
data to the remote server.
- curl_http_chunks.c contains functions that understands HTTP 1.1 chunked
- transfer encoding.
+ http_chunks.c contains functions that understands HTTP 1.1 chunked transfer
+ encoding.
An interesting detail with the HTTP(S) request, is the Curl_add_buffer()
series of functions we use. They append data to one single buffer, and when
FTP
The Curl_if2ip() function can be used for getting the IP number of a
- specified network interface, and it resides in lib/curl_if2ip.c.
+ specified network interface, and it resides in lib/if2ip.c.
Curl_ftpsendf() is used for sending FTP commands to the remote server. It was
made a separate function to prevent us programmers from forgetting that they
Kerberos
- The kerberos support is mainly in lib/curl_krb4.c and lib/curl_security.c.
+ The kerberos support is mainly in lib/krb4.c and lib/security.c.
TELNET
- Telnet is implemented in lib/curl_telnet.c.
+ Telnet is implemented in lib/telnet.c.
FILE
- The file:// protocol is dealt with in lib/curl_file.c.
+ The file:// protocol is dealt with in lib/file.c.
LDAP
- Everything LDAP is in lib/curl_ldap.c and lib/curl_openldap.c
+ Everything LDAP is in lib/ldap.c and lib/openldap.c
GENERAL
URL encoding and decoding, called escaping and unescaping in the source code,
- is found in lib/curl_escape.c.
+ is found in lib/escape.c.
While transferring data in Transfer() a few functions might get used.
- curl_getdate() in lib/curl_parsedate.c is for HTTP date comparisons (and
- more).
+ curl_getdate() in lib/parsedate.c is for HTTP date comparisons (and more).
- lib/curl_getenv.c offers curl_getenv() which is for reading environment
- variables in a neat platform independent way. That's used in the client,
- but also in lib/curl_url.c when checking the proxy environment variables.
- Note that contrary to the normal unix getenv(), this returns an allocated
- buffer that must be free()ed after use.
+ lib/getenv.c offers curl_getenv() which is for reading environment variables
+ in a neat platform independent way. That's used in the client, but also in
+ lib/url.c when checking the proxy environment variables. Note that contrary
+ to the normal unix getenv(), this returns an allocated buffer that must be
+ free()ed after use.
- lib/curl_netrc.c holds the .netrc parser
+ lib/netrc.c holds the .netrc parser
- lib/curl_timeval.c features replacement functions for systems that don't have
+ lib/timeval.c features replacement functions for systems that don't have
gettimeofday() and a few support functions for timeval conversions.
A function named curl_version() that returns the full curl version string is
- found in lib/curl_version.c.
+ found in lib/version.c.
Persistent Connections
======================
Client
======
- main() resides in src/tool_main.c together with most of the client code.
+ main() resides in src/main.c together with most of the client code.
src/tool_hugehelp.c is automatically generated by the mkhelp.pl perl script
- to display the complete "manual" and the src/tool_urlglob.c file holds the
+ to display the complete "manual" and the src/urlglob.c file holds the
functions used for the URL-"globbing" support. Globbing in the sense that
the {} and [] expansion stuff is there.
control after the curl_easy_perform() it cleans up the library, checks status
and exits.
- When the operation is done, the ourWriteOut() function in
- src/tool_writeout.c may be called to report about the operation. That
- function is using the curl_easy_getinfo() function to extract useful
- information from the curl session.
+ When the operation is done, the ourWriteOut() function in src/writeout.c may
+ be called to report about the operation. That function is using the
+ curl_easy_getinfo() function to extract useful information from the curl
+ session.
Recent versions may loop and do all this several times if many URLs were
specified on the command line or config file.
Memory Debugging
================
- The file lib/curl_memdebug.c contains debug-versions of a few functions.
- Functions such as malloc, free, fopen, fclose, etc that somehow deal with
- resources that might give us problems if we "leak" them. The functions in
- the memory tracking system do nothing fancy, they do their normal function
- and then log information about what they just did. The logged data can then
- be analyzed after a complete session,
+ The file lib/memdebug.c contains debug-versions of a few functions. Functions
+ such as malloc, free, fopen, fclose, etc that somehow deal with resources
+ that might give us problems if we "leak" them. The functions in the memdebug
+ system do nothing fancy, they do their normal function and then log
+ information about what they just did. The logged data can then be analyzed
+ after a complete session,
memanalyze.pl is the perl script present in tests/ that analyzes a log file
generated by the memory tracking system. It detects if resources are
19.1 http-style HEAD output for ftp
- #undef CURL_FTP_HTTPSTYLE_HEAD in lib/curl_ftp.c to remove the HTTP-style
- headers from being output in NOBODY requests over ftp
+ #undef CURL_FTP_HTTPSTYLE_HEAD in lib/ftp.c to remove the HTTP-style headers
+ from being output in NOBODY requests over ftp
19.2 combine error codes
* CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow
* these to be visible and exported by the external libcurl interface API,
* while also making them visible to the library internals, simply including
- * curl_setup.h, without actually needing to include curl.h internally.
+ * setup.h, without actually needing to include curl.h internally.
* If some day this section would grow big enough, all this should be moved
* to its own header file.
*/
endif()
# SET(CSOURCES
-# # curl_memdebug.c -not used
-# # curl_nwlib.c - Not used
-# # curl_strtok.c - specify later
-# # curl_strtoofft.c - specify later
+# # memdebug.c -not used
+# # nwlib.c - Not used
+# # strtok.c - specify later
+# # strtoofft.c - specify later
# )
# # if we have Kerberos 4, right now this is never on
# #OPTION(CURL_KRB4 "Use Kerberos 4" OFF)
# IF(CURL_KRB4)
# SET(CSOURCES ${CSOURCES}
-# curl_krb4.c
-# curl_security.c
+# krb4.c
+# security.c
# )
# ENDIF(CURL_KRB4)
# MARK_AS_ADVANCED(CURL_MALLOC_DEBUG)
# IF(CURL_MALLOC_DEBUG)
# SET(CSOURCES ${CSOURCES}
-# curl_memdebug.c
+# memdebug.c
# )
# ENDIF(CURL_MALLOC_DEBUG)
# # only build compat strtoofft if we need to
# IF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64)
# SET(CSOURCES ${CSOURCES}
-# curl_strtoofft.c
+# strtoofft.c
# )
# ENDIF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64)
if(HAVE_FEATURES_H)
set_source_files_properties(
- curl_cookie.c
- curl_easy.c
- curl_formdata.c
- curl_getenv.c
- curl_nonblock.c
- curl_hash.c
- curl_http.c
- curl_if2ip.c
- curl_mprintf.c
- curl_multi.c
- curl_sendf.c
- curl_telnet.c
- curl_transfer.c
- curl_url.c
+ cookie.c
+ easy.c
+ formdata.c
+ getenv.c
+ nonblock.c
+ hash.c
+ http.c
+ if2ip.c
+ mprintf.c
+ multi.c
+ sendf.c
+ telnet.c
+ transfer.c
+ url.c
COMPILE_FLAGS -D_BSD_SOURCE)
endif(HAVE_FEATURES_H)
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
-EXTRA_DIST = \
- $(CMAKE_DIST) \
- $(DOCS) \
- $(DSP) \
- $(VCPROJ) \
- Makefile.Watcom \
- Makefile.b32 \
- Makefile.m32 \
- Makefile.netware \
- Makefile.vc6 \
- Makefile.vxworks \
- checksrc.pl \
- config-amigaos.h \
- config-dos.h \
- config-mac.h \
- config-os400.h \
- config-riscos.h \
- config-symbian.h \
- config-tpf.h \
- config-vms.h \
- config-vxworks.h \
- config-win32.h \
- config-win32ce.h \
- config-win32ce.h \
- curl_config.h.in \
- curl_nwlib.c \
- curl_nwos.c \
- firefox-db2pem.sh \
- libcurl.plist \
- libcurl.rc \
- makefile.amiga \
- makefile.dj \
- mk-ca-bundle.pl \
- mk-ca-bundle.vbs \
- msvcproj.foot \
- msvcproj.head \
- objnames-test08.sh \
- objnames-test10.sh \
- objnames.inc \
- setup-os400.h \
- vc6libcurl.dsw
+EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 $(DSP) \
+ vc6libcurl.dsw config-win32.h 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.amiga \
+ Makefile.netware nwlib.c nwos.c msvcproj.head msvcproj.foot \
+ config-win32ce.h config-os400.h setup-os400.h config-symbian.h \
+ Makefile.Watcom config-tpf.h $(DOCS) $(VCPROJ) mk-ca-bundle.pl \
+ mk-ca-bundle.vbs firefox-db2pem.sh $(CMAKE_DIST) config-vxworks.h \
+ Makefile.vxworks config-vms.h checksrc.pl objnames-test08.sh \
+ objnames-test10.sh objnames.inc
CLEANFILES = $(DSP) $(VCPROJ)
# CSRC2 = file4.c file5.c file6.c
# CSOURCES = $(CSRC1) $(CSRC2)
-CSOURCES = \
- curl_amigaos.c \
- curl_asyn_ares.c \
- curl_asyn_thread.c \
- curl_axtls.c \
- curl_base64.c \
- curl_bundles.c \
- curl_conncache.c \
- curl_connect.c \
- curl_content_encoding.c \
- curl_cookie.c \
- curl_addrinfo.c \
- curl_darwinssl.c \
- curl_fnmatch.c \
- curl_gethostname.c \
- curl_gssapi.c \
- curl_memrchr.c \
- curl_multibyte.c \
- curl_ntlm.c \
- curl_ntlm_core.c \
- curl_ntlm_msgs.c \
- curl_ntlm_wb.c \
- curl_rand.c \
- curl_rtmp.c \
- curl_sasl.c \
- curl_schannel.c \
- curl_sspi.c \
- curl_threads.c \
- curl_cyassl.c \
- curl_dict.c \
- curl_easy.c \
- curl_escape.c \
- curl_file.c \
- curl_fileinfo.c \
- curl_formdata.c \
- curl_ftp.c \
- curl_ftplistparser.c \
- curl_getenv.c \
- curl_getinfo.c \
- curl_gopher.c \
- curl_gtls.c \
- curl_hash.c \
- curl_hmac.c \
- curl_hostasyn.c \
- curl_hostcheck.c \
- curl_hostip.c \
- curl_hostip4.c \
- curl_hostip6.c \
- curl_hostsyn.c \
- curl_http.c \
- curl_http_chunks.c \
- curl_http_digest.c \
- curl_http_negotiate.c \
- curl_http_negotiate_sspi.c \
- curl_http_proxy.c \
- curl_idn_win32.c \
- curl_if2ip.c \
- curl_imap.c \
- curl_inet_ntop.c \
- curl_inet_pton.c \
- curl_krb4.c \
- curl_krb5.c \
- curl_ldap.c \
- curl_llist.c \
- curl_md4.c \
- curl_md5.c \
- curl_memdebug.c \
- curl_mprintf.c \
- curl_multi.c \
- curl_netrc.c \
- curl_non_ascii.c \
- curl_nonblock.c \
- curl_nss.c \
- curl_openldap.c \
- curl_parsedate.c \
- curl_pingpong.c \
- curl_polarssl.c \
- curl_pop3.c \
- curl_progress.c \
- curl_qssl.c \
- curl_rawstr.c \
- curl_rtsp.c \
- curl_security.c \
- curl_select.c \
- curl_sendf.c \
- curl_share.c \
- curl_slist.c \
- curl_smtp.c \
- curl_socks.c \
- curl_socks_gssapi.c \
- curl_socks_sspi.c \
- curl_speedcheck.c \
- curl_splay.c \
- curl_ssh.c \
- curl_sslgen.c \
- curl_ssluse.c \
- curl_strdup.c \
- curl_strequal.c \
- curl_strerror.c \
- curl_strtok.c \
- curl_strtoofft.c \
- curl_telnet.c \
- curl_tftp.c \
- curl_timeval.c \
- curl_transfer.c \
- curl_url.c \
- curl_version.c \
- curl_warnless.c \
- curl_wildcard.c
-
-HHEADERS = \
- curl_addrinfo.h \
- curl_amigaos.h \
- curl_arpa_telnet.h \
- curl_asyn.h \
- curl_axtls.h \
- curl_base64.h \
- curl_bundles.h \
- curl_conncache.h \
- curl_connect.h \
- curl_content_encoding.h \
- curl_cookie.h \
- curl_cyassl.h \
- curl_darwinssl.h \
- curl_dict.h \
- curl_easyif.h \
- curl_escape.h \
- curl_file.h \
- curl_fileinfo.h \
- curl_fnmatch.h \
- curl_formdata.h \
- curl_ftp.h \
- curl_ftplistparser.h \
- curl_gethostname.h \
- curl_getinfo.h \
- curl_gopher.h \
- curl_gssapi.h \
- curl_gtls.h \
- curl_hash.h \
- curl_hmac.h \
- curl_hostcheck.h \
- curl_hostip.h \
- curl_http.h \
- curl_http_chunks.h \
- curl_http_digest.h \
- curl_http_negotiate.h \
- curl_http_proxy.h \
- curl_if2ip.h \
- curl_imap.h \
- curl_inet_ntop.h \
- curl_inet_pton.h \
- curl_krb4.h \
- curl_ldap.h \
- curl_llist.h \
- curl_md4.h \
- curl_md5.h \
- curl_memdebug.h \
- curl_memory.h \
- curl_memrchr.h \
- curl_multibyte.h \
- curl_multiif.h \
- curl_netrc.h \
- curl_non_ascii.h \
- curl_nonblock.h \
- curl_nssg.h \
- curl_ntlm.h \
- curl_ntlm_core.h \
- curl_ntlm_msgs.h \
- curl_ntlm_wb.h \
- curl_parsedate.h \
- curl_pingpong.h \
- curl_polarssl.h \
- curl_pop3.h \
- curl_progress.h \
- curl_qssl.h \
- curl_rand.h \
- curl_rawstr.h \
- curl_rtmp.h \
- curl_rtsp.h \
- curl_sasl.h \
- curl_schannel.h \
- curl_select.h \
- curl_sendf.h \
- curl_setup.h \
- curl_setup_once.h \
- curl_share.h \
- curl_slist.h \
- curl_smtp.h \
- curl_sockaddr.h \
- curl_socks.h \
- curl_speedcheck.h \
- curl_splay.h \
- curl_ssh.h \
- curl_sslgen.h \
- curl_ssluse.h \
- curl_sspi.h \
- curl_strdup.h \
- curl_strequal.h \
- curl_strerror.h \
- curl_strtok.h \
- curl_strtoofft.h \
- curl_telnet.h \
- curl_tftp.h \
- curl_threads.h \
- curl_timeval.h \
- curl_transfer.h \
- curl_url.h \
- curl_urldata.h \
- curl_wildcard.h \
- curlx.h
+CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \
+ cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \
+ ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c \
+ netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c \
+ curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c krb5.c \
+ memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c \
+ content_encoding.c share.c http_digest.c md4.c md5.c curl_rand.c \
+ http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c \
+ hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c \
+ select.c gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c \
+ qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c \
+ curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c \
+ pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c \
+ curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c \
+ idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c \
+ asyn-ares.c asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \
+ curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_schannel.c \
+ curl_multibyte.c curl_darwinssl.c hostcheck.c \
+ bundles.c conncache.c
+HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \
+ progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h \
+ if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h \
+ getinfo.h strequal.h krb4.h memdebug.h http_chunks.h curl_rand.h \
+ curl_fnmatch.h wildcard.h fileinfo.h ftplistparser.h strtok.h \
+ connect.h llist.h hash.h content_encoding.h share.h curl_md4.h \
+ curl_md5.h http_digest.h http_negotiate.h inet_pton.h amigaos.h \
+ strtoofft.h strerror.h inet_ntop.h curlx.h curl_memory.h setup.h \
+ transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h \
+ tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h \
+ curl_base64.h rawstr.h curl_addrinfo.h curl_sspi.h slist.h nonblock.h \
+ curl_memrchr.h imap.h pop3.h smtp.h pingpong.h rtsp.h curl_threads.h \
+ warnless.h curl_hmac.h polarssl.h curl_rtmp.h curl_gethostname.h \
+ gopher.h axtls.h cyassl.h http_proxy.h non-ascii.h asyn.h curl_ntlm.h \
+ curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h curl_ntlm_msgs.h \
+ curl_sasl.h curl_schannel.h curl_multibyte.h curl_darwinssl.h \
+ hostcheck.h bundles.h conncache.h
# Makefile.inc provides the CSOURCES and HHEADERS defines
include Makefile.inc
-OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CSOURCES))) $(OBJDIR)/curl_nwos.o
+OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CSOURCES))) $(OBJDIR)/nwos.o
-OBJL = $(OBJS) $(OBJDIR)/curl_nwlib.o $(LDLIBS)
+OBJL = $(OBJS) $(OBJDIR)/nwlib.o $(LDLIBS)
all: lib nlm
# | (__| |_| | _ <| |___\r
# \___|\___/|_| \_\_____|\r
#\r
-# Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.\r
+# Copyright (C) 1999 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.\r
#\r
# This software is licensed as described in the file COPYING, which\r
# you should have received as part of this distribution. The terms\r
# A config was provided, so the library can be built.\r
#\r
X_OBJS= \\r
- $(DIROBJ)\curl_asyn_ares.obj \\r
- $(DIROBJ)\curl_asyn_thread.obj \\r
- $(DIROBJ)\curl_base64.obj \\r
- $(DIROBJ)\curl_bundles.obj \\r
- $(DIROBJ)\curl_conncache.obj \\r
- $(DIROBJ)\curl_connect.obj \\r
- $(DIROBJ)\curl_content_encoding.obj \\r
- $(DIROBJ)\curl_cookie.obj \\r
+ $(DIROBJ)\asyn-ares.obj \\r
+ $(DIROBJ)\asyn-thread.obj \\r
+ $(DIROBJ)\base64.obj \\r
+ $(DIROBJ)\bundles.obj \\r
+ $(DIROBJ)\conncache.obj \\r
+ $(DIROBJ)\connect.obj \\r
+ $(DIROBJ)\content_encoding.obj \\r
+ $(DIROBJ)\cookie.obj \\r
$(DIROBJ)\curl_addrinfo.obj \\r
$(DIROBJ)\curl_darwinssl.obj \\r
$(DIROBJ)\curl_fnmatch.obj \\r
$(DIROBJ)\curl_schannel.obj \\r
$(DIROBJ)\curl_sspi.obj \\r
$(DIROBJ)\curl_threads.obj \\r
- $(DIROBJ)\curl_dict.obj \\r
- $(DIROBJ)\curl_easy.obj \\r
- $(DIROBJ)\curl_escape.obj \\r
- $(DIROBJ)\curl_file.obj \\r
- $(DIROBJ)\curl_fileinfo.obj \\r
- $(DIROBJ)\curl_formdata.obj \\r
- $(DIROBJ)\curl_ftp.obj \\r
- $(DIROBJ)\curl_ftplistparser.obj \\r
- $(DIROBJ)\curl_getenv.obj \\r
- $(DIROBJ)\curl_getinfo.obj \\r
- $(DIROBJ)\curl_gopher.obj \\r
- $(DIROBJ)\curl_gtls.obj \\r
- $(DIROBJ)\curl_hash.obj \\r
- $(DIROBJ)\curl_hmac.obj \\r
- $(DIROBJ)\curl_hostasyn.obj \\r
- $(DIROBJ)\curl_hostcheck.obj \\r
- $(DIROBJ)\curl_hostip.obj \\r
- $(DIROBJ)\curl_hostip4.obj \\r
- $(DIROBJ)\curl_hostip6.obj \\r
- $(DIROBJ)\curl_hostsyn.obj \\r
- $(DIROBJ)\curl_http.obj \\r
- $(DIROBJ)\curl_http_chunks.obj \\r
- $(DIROBJ)\curl_http_digest.obj \\r
- $(DIROBJ)\curl_http_negotiate.obj \\r
- $(DIROBJ)\curl_http_negotiate_sspi.obj \\r
- $(DIROBJ)\curl_http_proxy.obj \\r
- $(DIROBJ)\curl_if2ip.obj \\r
- $(DIROBJ)\curl_imap.obj \\r
- $(DIROBJ)\curl_inet_ntop.obj \\r
- $(DIROBJ)\curl_inet_pton.obj \\r
- $(DIROBJ)\curl_ldap.obj \\r
- $(DIROBJ)\curl_llist.obj \\r
- $(DIROBJ)\curl_md4.obj \\r
- $(DIROBJ)\curl_md5.obj \\r
- $(DIROBJ)\curl_memdebug.obj \\r
- $(DIROBJ)\curl_mprintf.obj \\r
- $(DIROBJ)\curl_multi.obj \\r
- $(DIROBJ)\curl_netrc.obj \\r
- $(DIROBJ)\curl_nonblock.obj \\r
- $(DIROBJ)\curl_openldap.obj \\r
- $(DIROBJ)\curl_parsedate.obj \\r
- $(DIROBJ)\curl_pingpong.obj \\r
- $(DIROBJ)\curl_polarssl.obj \\r
- $(DIROBJ)\curl_pop3.obj \\r
- $(DIROBJ)\curl_progress.obj \\r
- $(DIROBJ)\curl_rawstr.obj \\r
- $(DIROBJ)\curl_rtsp.obj \\r
- $(DIROBJ)\curl_select.obj \\r
- $(DIROBJ)\curl_sendf.obj \\r
- $(DIROBJ)\curl_share.obj \\r
- $(DIROBJ)\curl_slist.obj \\r
- $(DIROBJ)\curl_smtp.obj \\r
- $(DIROBJ)\curl_socks.obj \\r
- $(DIROBJ)\curl_socks_gssapi.obj \\r
- $(DIROBJ)\curl_socks_sspi.obj \\r
- $(DIROBJ)\curl_speedcheck.obj \\r
- $(DIROBJ)\curl_splay.obj \\r
- $(DIROBJ)\curl_ssh.obj \\r
- $(DIROBJ)\curl_sslgen.obj \\r
- $(DIROBJ)\curl_ssluse.obj \\r
- $(DIROBJ)\curl_strequal.obj \\r
- $(DIROBJ)\curl_strerror.obj \\r
- $(DIROBJ)\curl_strtok.obj \\r
- $(DIROBJ)\curl_strtoofft.obj \\r
- $(DIROBJ)\curl_telnet.obj \\r
- $(DIROBJ)\curl_tftp.obj \\r
- $(DIROBJ)\curl_timeval.obj \\r
- $(DIROBJ)\curl_transfer.obj \\r
- $(DIROBJ)\curl_url.obj \\r
- $(DIROBJ)\curl_version.obj \\r
- $(DIROBJ)\curl_warnless.obj \\r
- $(DIROBJ)\curl_wildcard.obj \\r
+ $(DIROBJ)\dict.obj \\r
+ $(DIROBJ)\easy.obj \\r
+ $(DIROBJ)\escape.obj \\r
+ $(DIROBJ)\file.obj \\r
+ $(DIROBJ)\fileinfo.obj \\r
+ $(DIROBJ)\formdata.obj \\r
+ $(DIROBJ)\ftp.obj \\r
+ $(DIROBJ)\ftplistparser.obj \\r
+ $(DIROBJ)\getenv.obj \\r
+ $(DIROBJ)\getinfo.obj \\r
+ $(DIROBJ)\gopher.obj \\r
+ $(DIROBJ)\gtls.obj \\r
+ $(DIROBJ)\hash.obj \\r
+ $(DIROBJ)\hmac.obj \\r
+ $(DIROBJ)\hostasyn.obj \\r
+ $(DIROBJ)\hostcheck.obj \\r
+ $(DIROBJ)\hostip.obj \\r
+ $(DIROBJ)\hostip4.obj \\r
+ $(DIROBJ)\hostip6.obj \\r
+ $(DIROBJ)\hostsyn.obj \\r
+ $(DIROBJ)\http.obj \\r
+ $(DIROBJ)\http_chunks.obj \\r
+ $(DIROBJ)\http_digest.obj \\r
+ $(DIROBJ)\http_negotiate.obj \\r
+ $(DIROBJ)\http_negotiate_sspi.obj \\r
+ $(DIROBJ)\http_proxy.obj \\r
+ $(DIROBJ)\if2ip.obj \\r
+ $(DIROBJ)\imap.obj \\r
+ $(DIROBJ)\inet_ntop.obj \\r
+ $(DIROBJ)\inet_pton.obj \\r
+ $(DIROBJ)\ldap.obj \\r
+ $(DIROBJ)\llist.obj \\r
+ $(DIROBJ)\md4.obj \\r
+ $(DIROBJ)\md5.obj \\r
+ $(DIROBJ)\memdebug.obj \\r
+ $(DIROBJ)\mprintf.obj \\r
+ $(DIROBJ)\multi.obj \\r
+ $(DIROBJ)\netrc.obj \\r
+ $(DIROBJ)\nonblock.obj \\r
+ $(DIROBJ)\openldap.obj \\r
+ $(DIROBJ)\parsedate.obj \\r
+ $(DIROBJ)\pingpong.obj \\r
+ $(DIROBJ)\polarssl.obj \\r
+ $(DIROBJ)\pop3.obj \\r
+ $(DIROBJ)\progress.obj \\r
+ $(DIROBJ)\rawstr.obj \\r
+ $(DIROBJ)\rtsp.obj \\r
+ $(DIROBJ)\select.obj \\r
+ $(DIROBJ)\sendf.obj \\r
+ $(DIROBJ)\share.obj \\r
+ $(DIROBJ)\slist.obj \\r
+ $(DIROBJ)\smtp.obj \\r
+ $(DIROBJ)\socks.obj \\r
+ $(DIROBJ)\socks_gssapi.obj \\r
+ $(DIROBJ)\socks_sspi.obj \\r
+ $(DIROBJ)\speedcheck.obj \\r
+ $(DIROBJ)\splay.obj \\r
+ $(DIROBJ)\ssh.obj \\r
+ $(DIROBJ)\sslgen.obj \\r
+ $(DIROBJ)\ssluse.obj \\r
+ $(DIROBJ)\strequal.obj \\r
+ $(DIROBJ)\strerror.obj \\r
+ $(DIROBJ)\strtok.obj \\r
+ $(DIROBJ)\strtoofft.obj \\r
+ $(DIROBJ)\telnet.obj \\r
+ $(DIROBJ)\tftp.obj \\r
+ $(DIROBJ)\timeval.obj \\r
+ $(DIROBJ)\transfer.obj \\r
+ $(DIROBJ)\url.obj \\r
+ $(DIROBJ)\version.obj \\r
+ $(DIROBJ)\warnless.obj \\r
+ $(DIROBJ)\wildcard.obj \\r
$(RESOURCE)\r
\r
all : $(TARGET)\r
A macro that converts a string containing a number to a curl_off_t number.
This might use the curlx_strtoll() function which is provided as source
- code in curl_strtoofft.c. Note that the function is only provided if no
+ code in strtoofft.c. Note that the function is only provided if no
strtoll() (or equivalent) function exist on your platform. If curl_off_t
is only a 32 bit number on your platform, this macro uses strtol().
- curl_hostip.c explained
+ hostip.c explained
==================
- The main COMPILE-TIME DEFINES to keep in mind when reading the curl_host*.c
+ The main COMPILE-TIME DEFINES to keep in mind when reading the host*.c
source file are these:
CURLRES_IPV6 - this host has getaddrinfo() and family, and thus we use
libcurl is not built to use an asynchronous resolver, CURLRES_SYNCH is
defined.
- The curl_host*.c sources files are split up like this:
+ The host*.c sources files are split up like this:
- curl_hostip.c - method-independent resolver functions and utility functions
- curl_hostasyn.c - functions for asynchronous name resolves
- curl_hostsyn.c - functions for synchronous name resolves
- curl_hostares.c - functions for ares-using name resolves
- curl_hostthre.c - functions for threaded name resolves
- curl_hostip4.c - ipv4-specific functions
- curl_hostip6.c - ipv6-specific functions
+ hostip.c - method-independent resolver functions and utility functions
+ hostasyn.c - functions for asynchronous name resolves
+ hostsyn.c - functions for synchronous name resolves
+ hostares.c - functions for ares-using name resolves
+ hostthre.c - functions for threaded name resolves
+ hostip4.c - ipv4-specific functions
+ hostip6.c - ipv6-specific functions
- The curl_hostip.h is the single united header file for all this. It defines
- the CURLRES_* defines based on the config*.h and curl_setup.h defines.
+ The hostip.h is the single united header file for all this. It defines the
+ CURLRES_* defines based on the config*.h and setup.h defines.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if defined(__AMIGA__) && !defined(__ixemul__)
#include <amitcp/socketbasetags.h>
-#include "curl_amigaos.h"
+#include "amigaos.h"
struct Library *SocketBase = NULL;
extern int errno, h_errno;
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if defined(__AMIGA__) && !defined(__ixemul__)
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_LIMITS_H
#include <limits.h>
/***********************************************************************
* Only for ares-enabled builds
* And only for functions that fulfill the asynch resolver backend API
- * as defined in curl_asyn.h, nothing else belongs in this file!
+ * as defined in asyn.h, nothing else belongs in this file!
**********************************************************************/
#ifdef CURLRES_ARES
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
-#include "curl_multiif.h"
-#include "curl_inet_pton.h"
-#include "curl_connect.h"
-#include "curl_select.h"
-#include "curl_progress.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
+#include "multiif.h"
+#include "inet_pton.h"
+#include "connect.h"
+#include "select.h"
+#include "progress.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
struct ResolverResults {
int num_pending; /* number of ares_gethostbyname() requests */
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
# define RESOLVER_ENOMEM ENOMEM
#endif
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
-#include "curl_multiif.h"
-#include "curl_inet_pton.h"
-#include "curl_inet_ntop.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
+#include "multiif.h"
+#include "inet_pton.h"
+#include "inet_ntop.h"
#include "curl_threads.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/***********************************************************************
* Only for threaded name resolves builds
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include "curl_addrinfo.h"
struct addrinfo;
/*
* This header defines all functions in the internal asynch resolver interface.
* All asynch resolvers need to provide these functions.
- * curl_asyn_ares.c and curl_asyn_thread.c are the current implementations of
- * asynch resolver backends.
+ * asyn-ares.c and asyn-thread.c are the current implementations of asynch
+ * resolver backends.
*/
/*
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 2010, DirecTV * contact: Eric Hu <ehu@directv.com>
- * Copyright (C) 2010 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2010, DirecTV
+ * contact: Eric Hu <ehu@directv.com>
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
/*
* Source file for all axTLS-specific code for the TLS/SSL layer. No code
- * but curl_sslgen.c should ever call or use these functions.
+ * but sslgen.c should ever call or use these functions.
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_AXTLS
#include <axTLS/ssl.h>
-#include "curl_axtls.h"
-
-#include "curl_sendf.h"
-#include "curl_inet_pton.h"
-#include "curl_sslgen.h"
-#include "curl_parsedate.h"
-#include "curl_connect.h" /* for the connect timeout */
-#include "curl_select.h"
+#include "axtls.h"
+
+#include "sendf.h"
+#include "inet_pton.h"
+#include "sslgen.h"
+#include "parsedate.h"
+#include "connect.h" /* for the connect timeout */
+#include "select.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
-#include "curl_hostcheck.h"
+#include "memdebug.h"
+#include "hostcheck.h"
/* SSL_read is opied from axTLS compat layer */
int Curl_axtls_init(void)
{
/* axTLS has no global init. Everything is done through SSL and SSL_CTX
- * structs stored in connectdata structure. Perhaps can move to curl_axtls.h.
+ * structs stored in connectdata structure. Perhaps can move to axtls.h.
*/
return 1;
}
int Curl_axtls_cleanup(void)
{
- /* axTLS has no global cleanup. Perhaps can move this to curl_axtls.h. */
+ /* axTLS has no global cleanup. Perhaps can move this to axtls.h. */
return 1;
}
infof(data, "found certificates in %s\n", data->set.ssl.CAfile);
}
- /* curl_gtls.c tasks we're skipping for now:
+ /* gtls.c tasks we're skipping for now:
* 1) certificate revocation list checking
* 2) dns name assignment to host
* 3) set protocol priority. axTLS is TLSv1 only, so can probably ignore
}
}
- /* curl_gtls.c does more here that is being left out for now
+ /* gtls.c does more here that is being left out for now
* 1) set session credentials. can probably ignore since axtls puts this
* info in the ssl_ctx struct
* 2) setting up callbacks. these seem gnutls specific
}
infof (data, "handshake completed successfully\n");
- /* Here, curl_gtls.c gets the peer certificates and fails out depending on
+ /* Here, gtls.c gets the peer certificates and fails out depending on
* settings in "data." axTLS api doesn't have get cert chain fcn, so omit?
*/
else
infof(data, "\t server certificate verification SKIPPED\n");
- /* Here, curl_gtls.c does issuer verification. axTLS has no straightforward
+ /* Here, gtls.c does issuer verification. axTLS has no straightforward
* equivalent, so omitting for now.*/
- /* Here, curl_gtls.c does the following
+ /* Here, gtls.c does the following
* 1) x509 hostname checking per RFC2818. axTLS doesn't support this, but
* it seems useful. This is now implemented, by Oscar Koeroo
* 2) checks cert validity based on time. axTLS does this in ssl_verify_cert
infof(conn->data, " Curl_axtls_close\n");
if(connssl->ssl) {
- /* line from curl_ssluse.c: (void)SSL_shutdown(connssl->ssl);
+ /* line from ssluse.c: (void)SSL_shutdown(connssl->ssl);
axTLS compat layer does nothing for SSL_shutdown */
- /* The following line is from curl_ssluse.c. There seems to be no axTLS
+ /* The following line is from ssluse.c. There seems to be no axTLS
equivalent. ssl_free and ssl_ctx_free close things.
SSL_set_connect_state(connssl->handle); */
*/
int Curl_axtls_shutdown(struct connectdata *conn, int sockindex)
{
- /* Outline taken from curl_ssluse.c since functions are in axTLS compat
- layer. axTLS's error set is much smaller, so a lot of error-handling
- was removed.
+ /* Outline taken from ssluse.c since functions are in axTLS compat layer.
+ axTLS's error set is much smaller, so a lot of error-handling was removed.
*/
int retval = 0;
struct ssl_connect_data *connssl = &conn->ssl[sockindex];
*/
int Curl_axtls_check_cxn(struct connectdata *conn)
{
- /* curl_ssluse.c line:
- rc = SSL_peek(conn->ssl[FIRSTSOCKET].ssl, (void*)&buf, 1);
+ /* ssluse.c line: rc = SSL_peek(conn->ssl[FIRSTSOCKET].ssl, (void*)&buf, 1);
axTLS compat layer always returns the last argument, so connection is
always alive? */
{
(void)ptr;
/* free the ID */
- /* both curl_ssluse.c and curl_gtls.c do something here, but axTLS's
- OpenSSL compatibility layer does nothing, so we do nothing too. */
+ /* both ssluse.c and gtls.c do something here, but axTLS's OpenSSL
+ compatibility layer does nothing, so we do nothing too. */
}
size_t Curl_axtls_version(char *buffer, size_t size)
#ifdef USE_AXTLS
#include "curl/curl.h"
-#include "curl_urldata.h"
+#include "urldata.h"
int Curl_axtls_init(void);
int Curl_axtls_cleanup(void);
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
/* Base64 encoding/decoding */
-#include "curl_setup.h"
+#include "setup.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
-#include "curl_urldata.h" /* for the SessionHandle definition */
-#include "curl_warnless.h"
+#include "urldata.h" /* for the SessionHandle definition */
+#include "warnless.h"
#include "curl_base64.h"
#include "curl_memory.h"
-#include "curl_non_ascii.h"
+#include "non-ascii.h"
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
/* ---- Base64 Encoding/Decoding Table --- */
static const char table64[]=
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_url.h"
-#include "curl_progress.h"
-#include "curl_multiif.h"
-#include "curl_bundles.h"
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "url.h"
+#include "progress.h"
+#include "multiif.h"
+#include "bundles.h"
+#include "sendf.h"
+#include "rawstr.h"
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
static void conn_llist_dtor(void *user, void *element)
{
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_url.h"
-#include "curl_progress.h"
-#include "curl_multiif.h"
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
-#include "curl_bundles.h"
-#include "curl_conncache.h"
+#include "urldata.h"
+#include "url.h"
+#include "progress.h"
+#include "multiif.h"
+#include "sendf.h"
+#include "rawstr.h"
+#include "bundles.h"
+#include "conncache.h"
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#define CONNECTION_HASH_SIZE 97
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h> /* <netinet/tcp.h> may need it */
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_if2ip.h"
-#include "curl_strerror.h"
-#include "curl_connect.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "if2ip.h"
+#include "strerror.h"
+#include "connect.h"
#include "curl_memory.h"
-#include "curl_select.h"
-#include "curl_url.h"
-#include "curl_multiif.h"
-#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */
-#include "curl_inet_ntop.h"
-#include "curl_inet_pton.h"
-#include "curl_sslgen.h" /* for Curl_ssl_check_cxn() */
-#include "curl_progress.h"
-#include "curl_warnless.h"
+#include "select.h"
+#include "url.h" /* for Curl_safefree() */
+#include "multiif.h"
+#include "sockaddr.h" /* required for Curl_sockaddr_storage */
+#include "inet_ntop.h"
+#include "inet_pton.h"
+#include "sslgen.h" /* for Curl_ssl_check_cxn() */
+#include "progress.h"
+#include "warnless.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifdef __SYMBIAN32__
/* This isn't actually supported under Symbian OS */
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_nonblock.h"
-#include "curl_sockaddr.h"
+#include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */
+#include "sockaddr.h"
CURLcode Curl_is_connected(struct connectdata *conn,
int sockindex,
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_LIBZ
-#include "curl_urldata.h"
+#include "urldata.h"
#include <curl/curl.h>
-#include "curl_sendf.h"
-#include "curl_content_encoding.h"
+#include "sendf.h"
+#include "content_encoding.h"
#include "curl_memory.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* Comment this out if zlib is always going to be at least ver. 1.2.0.4
(doing so will reduce code size slightly). */
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
/*
* Comma-separated list all supported Content-Encodings ('identity' is implied)
****/
-#include "curl_setup.h"
+#include "setup.h"
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)
#define _MPRINTF_REPLACE
#include <curl/mprintf.h>
-#include "curl_urldata.h"
-#include "curl_cookie.h"
-#include "curl_strequal.h"
-#include "curl_strtok.h"
-#include "curl_sendf.h"
+#include "urldata.h"
+#include "cookie.h"
+#include "strequal.h"
+#include "strtok.h"
+#include "sendf.h"
#include "curl_memory.h"
-#include "curl_share.h"
-#include "curl_strtoofft.h"
-#include "curl_rawstr.h"
+#include "share.h"
+#include "strtoofft.h"
+#include "rawstr.h"
#include "curl_memrchr.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
static void freecookie(struct Cookie *co)
{
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
#endif
#include "curl_addrinfo.h"
-#include "curl_inet_pton.h"
-#include "curl_warnless.h"
+#include "inet_pton.h"
+#include "warnless.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* curl_dofreeaddrinfo()
*
* This is strictly for memory tracing and are using the same style as the
- * family otherwise present in curl_memdebug.c. I put these ones here since
- * they require a bunch of structs I didn't want to include there.
+ * family otherwise present in memdebug.c. I put these ones here since they
+ * require a bunch of structs I didn't want to include in memdebug.c
*/
void
* curl_dogetaddrinfo()
*
* This is strictly for memory tracing and are using the same style as the
- * family otherwise present in curl_memdebug.c. I put these ones here since
- * they require a bunch of structs I didn't want to include there.
+ * family otherwise present in memdebug.c. I put these ones here since they
+ * require a bunch of structs I didn't want to include in memdebug.c
*/
int
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
* \___|\___/|_| \_\_____|
*
* Copyright (C) 2012, Nick Zitzmann, <nickzman@gmail.com>.
- * Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
/*
* Source file for all iOS and Mac OS X SecureTransport-specific code for the
- * TLS/SSL layer. No code but curl_sslgen.c should ever call or use these
- * functions.
+ * TLS/SSL layer. No code but sslgen.c should ever call or use these functions.
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_DARWINSSL
#include <sys/sysctl.h>
#endif
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_inet_pton.h"
-#include "curl_connect.h"
-#include "curl_select.h"
-#include "curl_sslgen.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "inet_pton.h"
+#include "connect.h"
+#include "select.h"
+#include "sslgen.h"
#include "curl_darwinssl.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* From MacTypes.h (which we can't include because it isn't present in iOS: */
#define ioErr -36
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_DARWINSSL
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include "curl_fnmatch.h"
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#define CURLFNM_CHARSET_LEN (sizeof(char) * 256)
#define CURLFNM_CHSET_SIZE (CURLFNM_CHARSET_LEN + 15)
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include "curl_gethostname.h"
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_GSSAPI
#include "curl_gssapi.h"
-#include "curl_sendf.h"
+#include "sendf.h"
OM_uint32 Curl_gss_init_sec_context(
struct SessionHandle *data,
*
***************************************************************************/
-#include "curl_setup.h"
-#include "curl_urldata.h"
+#include "setup.h"
+#include "urldata.h"
#ifdef HAVE_GSSAPI
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
/* NSS crypto library does not provide the MD4 hash algorithm, so that we have
* a local implementation of it */
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include "curl_memrchr.h"
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifndef HAVE_MEMRCHR
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_MEMRCHR
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE))
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
wchar_t *Curl_convert_UTF8_to_wchar(const char *str_utf8)
{
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE))
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_NTLM
#define DEBUG_ME 0
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "rawstr.h"
#include "curl_ntlm.h"
#include "curl_ntlm_msgs.h"
#include "curl_ntlm_wb.h"
-#include "curl_url.h"
+#include "url.h"
#include "curl_memory.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#if defined(USE_NSS)
-#include "curl_nssg.h"
+#include "nssg.h"
#elif defined(USE_WINDOWS_SSPI)
#include "curl_sspi.h"
#endif
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#if DEBUG_ME
# define DEBUG_OUT(x) x
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_NTLM
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)
# error "Can't compile NTLM support without a crypto library."
#endif
-#include "curl_urldata.h"
-#include "curl_non_ascii.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "non-ascii.h"
+#include "rawstr.h"
#include "curl_memory.h"
#include "curl_ntlm_core.h"
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifdef USE_SSLEAY
/*
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_NTLM
#define DEBUG_ME 0
-#include "curl_urldata.h"
-#include "curl_non_ascii.h"
-#include "curl_sendf.h"
+#include "urldata.h"
+#include "non-ascii.h"
+#include "sendf.h"
#include "curl_base64.h"
#include "curl_ntlm_core.h"
#include "curl_gethostname.h"
#include "curl_multibyte.h"
-#include "curl_warnless.h"
+#include "warnless.h"
#include "curl_memory.h"
#ifdef USE_WINDOWS_SSPI
# include "curl_sspi.h"
#endif
-#include "curl_sslgen.h"
+#include "sslgen.h"
#define BUILDING_CURL_NTLM_MSGS_C
#include "curl_ntlm_msgs.h"
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* "NTLMSSP" signature is always in ASCII regardless of the platform */
#define NTLMSSP_SIGNATURE "\x4e\x54\x4c\x4d\x53\x53\x50"
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_NTLM
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)
#include <signal.h>
#endif
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_select.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "select.h"
#include "curl_ntlm_wb.h"
-#include "curl_url.h"
-#include "curl_strerror.h"
+#include "url.h"
+#include "strerror.h"
#include "curl_memory.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#if DEBUG_ME
# define DEBUG_OUT(x) x
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* Private pseudo-random number seed. Unsigned integer >= 32bit. Threads
mutual exclusion is not implemented to acess it since we do not require
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_LIBRTMP
-#include "curl_urldata.h"
-#include "curl_nonblock.h" /* for curlx_nonblock */
-#include "curl_progress.h" /* for Curl_pgrsSetUploadSize */
-#include "curl_transfer.h"
-#include "curl_warnless.h"
+#include "urldata.h"
+#include "nonblock.h" /* for curlx_nonblock */
+#include "progress.h" /* for Curl_pgrsSetUploadSize */
+#include "transfer.h"
+#include "warnless.h"
#include <curl/curl.h>
#include <librtmp/rtmp.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifdef _WIN32
#define setsockopt(a,b,c,d,e) (setsockopt)(a,b,c,(const char *)d,(int)e)
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
-#include "curl_urldata.h"
+#include "urldata.h"
#include "curl_base64.h"
#include "curl_md5.h"
#include "curl_hmac.h"
#include "curl_ntlm_msgs.h"
#include "curl_sasl.h"
-#include "curl_warnless.h"
+#include "warnless.h"
#include "curl_memory.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifndef CURL_DISABLE_CRYPTO_AUTH
/* Retrieves the value for a corresponding key from the challenge string
*
***************************************************************************/
-#include "curl_pingpong.h"
+#include "pingpong.h"
/* Authentication mechanism flags */
#define SASL_MECH_LOGIN 0x0001
*
* Copyright (C) 2012, Marc Hoersken, <info@marc-hoersken.de>, et al.
* Copyright (C) 2012, Mark Salisbury, <mark.salisbury@hp.com>
- * Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
/*
* Source file for all SChannel-specific code for the TLS/SSL layer. No code
- * but curl_sslgen.c should ever call or use these functions.
+ * but sslgen.c should ever call or use these functions.
*
*/
/*
+ * Based upon the PolarSSL implementation in polarssl.c and polarssl.h:
+ * Copyright (C) 2010, 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com>
+ *
+ * Based upon the CyaSSL implementation in cyassl.c and cyassl.h:
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * Thanks for code and inspiration!
+ */
+
+/*
* TODO list for TLS/SSL implementation:
* - implement client certificate authentication
* - implement custom server certificate validation
* http://msdn.microsoft.com/en-us/library/windows/desktop/aa380161.aspx
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_SCHANNEL
#include "curl_sspi.h"
#include "curl_schannel.h"
-#include "curl_sslgen.h"
-#include "curl_sendf.h"
-#include "curl_connect.h" /* for the connect timeout */
-#include "curl_strerror.h"
-#include "curl_select.h" /* for the socket readyness */
-#include "curl_inet_pton.h" /* for IP addr SNI check */
+#include "sslgen.h"
+#include "sendf.h"
+#include "connect.h" /* for the connect timeout */
+#include "strerror.h"
+#include "select.h" /* for the socket readyness */
+#include "inet_pton.h" /* for IP addr SNI check */
#include "curl_multibyte.h"
-#include "curl_warnless.h"
+#include "warnless.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* Uncomment to force verbose output
* #define infof(x, y, ...) printf(y, __VA_ARGS__)
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_SCHANNEL
-#include "curl_urldata.h"
+#include "urldata.h"
#ifndef UNISP_NAME_A
#define UNISP_NAME_A "Microsoft Unified Security Protocol Provider"
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_WINDOWS_SSPI
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* We use our own typedef here since some headers might lack these */
typedef PSecurityFunctionTable (APIENTRY *INITSECURITYINTERFACE_FN)(VOID);
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_WINDOWS_SSPI
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if defined(USE_THREADS_POSIX)
# ifdef HAVE_PTHREAD_H
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#if defined(USE_THREADS_POSIX)
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if defined(USE_THREADS_POSIX)
# define CURL_STDCALL
functions while they still are offered publicly. They will be made library-
private one day */
-#include "curl_strequal.h"
-/* "curl_strequal.h" provides the strequal protos */
+#include "strequal.h"
+/* "strequal.h" provides the strequal protos */
-#include "curl_strtoofft.h"
-/* "curl_strtoofft.h" provides this function: curlx_strtoofft(), returns a
+#include "strtoofft.h"
+/* "strtoofft.h" provides this function: curlx_strtoofft(), returns a
curl_off_t number from a given string.
*/
-#include "curl_timeval.h"
+#include "timeval.h"
/*
- "curl_timeval.h" sets up a 'struct timeval' even for platforms that
- otherwise don't have one and has protos for these functions:
+ "timeval.h" sets up a 'struct timeval' even for platforms that otherwise
+ don't have one and has protos for these functions:
curlx_tvnow()
curlx_tvdiff()
curlx_tvdiff_secs()
*/
-#include "curl_nonblock.h"
-/* "curl_nonblock.h" provides curlx_nonblock() */
+#include "nonblock.h"
+/* "nonblock.h" provides curlx_nonblock() */
-#include "curl_warnless.h"
-/* "curl_warnless.h" provides functions:
+#include "warnless.h"
+/* "warnless.h" provides functions:
curlx_ultous()
curlx_ultouc()
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
/*
* Source file for all CyaSSL-specific code for the TLS/SSL layer. No code
- * but curl_sslgen.c should ever call or use these functions.
+ * but sslgen.c should ever call or use these functions.
*
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_CYASSL
#include <limits.h>
#endif
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_inet_pton.h"
-#include "curl_cyassl.h"
-#include "curl_sslgen.h"
-#include "curl_parsedate.h"
-#include "curl_connect.h" /* for the connect timeout */
-#include "curl_select.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "inet_pton.h"
+#include "cyassl.h"
+#include "sslgen.h"
+#include "parsedate.h"
+#include "connect.h" /* for the connect timeout */
+#include "select.h"
+#include "rawstr.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#include <cyassl/ssl.h>
#include <cyassl/error.h>
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_CYASSL
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_DICT
#include <sys/select.h>
#endif
-#include "curl_urldata.h"
+#include "urldata.h"
#include <curl/curl.h>
-#include "curl_transfer.h"
-#include "curl_sendf.h"
+#include "transfer.h"
+#include "sendf.h"
-#include "curl_progress.h"
-#include "curl_strequal.h"
-#include "curl_dict.h"
-#include "curl_rawstr.h"
+#include "progress.h"
+#include "strequal.h"
+#include "dict.h"
+#include "rawstr.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* Forward declarations.
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#include <sys/param.h>
#endif
-#include "curl_strequal.h"
-#include "curl_urldata.h"
+#include "strequal.h"
+#include "urldata.h"
#include <curl/curl.h>
-#include "curl_transfer.h"
-#include "curl_sslgen.h"
-#include "curl_url.h"
-#include "curl_getinfo.h"
-#include "curl_hostip.h"
-#include "curl_share.h"
-#include "curl_strdup.h"
+#include "transfer.h"
+#include "sslgen.h"
+#include "url.h"
+#include "getinfo.h"
+#include "hostip.h"
+#include "share.h"
+#include "strdup.h"
#include "curl_memory.h"
-#include "curl_progress.h"
-#include "curl_easyif.h"
-#include "curl_select.h"
-#include "curl_sendf.h" /* for failf function prototype */
+#include "progress.h"
+#include "easyif.h"
+#include "select.h"
+#include "sendf.h" /* for failf function prototype */
#include "curl_ntlm.h"
-#include "curl_connect.h" /* for Curl_getconnectinfo */
-#include "curl_slist.h"
-#include "curl_amigaos.h"
+#include "connect.h" /* for Curl_getconnectinfo */
+#include "slist.h"
+#include "amigaos.h"
#include "curl_rand.h"
-#include "curl_non_ascii.h"
-#include "curl_warnless.h"
-#include "curl_conncache.h"
+#include "non-ascii.h"
+#include "warnless.h"
+#include "conncache.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* win32_cleanup() is for win32 socket cleanup functionality, the opposite
of win32_init() */
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
***************************************************************************/
/*
- * Prototypes for library-wide functions provided by curl_easy.c
+ * Prototypes for library-wide functions provided by easy.c
*/
void Curl_easy_addmulti(struct SessionHandle *data, void *multi);
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
/* Escape and unescape URL encoding in strings. The functions return a new
* allocated string or NULL if an error occurred. */
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
#include "curl_memory.h"
-#include "curl_urldata.h"
-#include "curl_warnless.h"
-#include "curl_non_ascii.h"
-#include "curl_escape.h"
+#include "urldata.h"
+#include "warnless.h"
+#include "non-ascii.h"
+#include "escape.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* Portable character check (remember EBCDIC). Do not use isalnum() because
its behavior is altered by the current locale.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_FILE
#include <fcntl.h>
#endif
-#include "curl_strtoofft.h"
-#include "curl_urldata.h"
+#include "strtoofft.h"
+#include "urldata.h"
#include <curl/curl.h>
-#include "curl_progress.h"
-#include "curl_sendf.h"
-#include "curl_escape.h"
-#include "curl_file.h"
-#include "curl_speedcheck.h"
-#include "curl_getinfo.h"
-#include "curl_transfer.h"
-#include "curl_url.h"
+#include "progress.h"
+#include "sendf.h"
+#include "escape.h"
+#include "file.h"
+#include "speedcheck.h"
+#include "getinfo.h"
+#include "transfer.h"
+#include "url.h"
#include "curl_memory.h"
-#include "curl_parsedate.h" /* for the week day and month names */
-#include "curl_warnless.h"
+#include "parsedate.h" /* for the week day and month names */
+#include "warnless.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#if defined(WIN32) || defined(MSDOS) || defined(__EMX__) || \
defined(__SYMBIAN32__)
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_strdup.h"
-#include "curl_fileinfo.h"
+#include "strdup.h"
+#include "fileinfo.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
struct curl_fileinfo *Curl_fileinfo_alloc(void)
{
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
#include <libgen.h>
#endif
-#include "curl_urldata.h" /* for struct SessionHandle */
-#include "curl_formdata.h"
+#include "urldata.h" /* for struct SessionHandle */
+#include "formdata.h"
#include "curl_rand.h"
-#include "curl_strequal.h"
+#include "strequal.h"
#include "curl_memory.h"
-#include "curl_sendf.h"
+#include "sendf.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#endif /* !defined(CURL_DISABLE_HTTP) || defined(USE_SSLEAY) */
}
/*
- * Curl_formclean() is used from curl_http.c, this cleans a built FormData
- * linked list
+ * Curl_formclean() is used from http.c, this cleans a built FormData linked
+ * list
*/
void Curl_formclean(struct FormData **form_ptr)
{
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_FTP
#endif
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_if2ip.h"
-#include "curl_hostip.h"
-#include "curl_progress.h"
-#include "curl_transfer.h"
-#include "curl_escape.h"
-#include "curl_http.h" /* for HTTP proxy tunnel stuff */
-#include "curl_socks.h"
-#include "curl_ftp.h"
-#include "curl_fileinfo.h"
-#include "curl_ftplistparser.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "if2ip.h"
+#include "hostip.h"
+#include "progress.h"
+#include "transfer.h"
+#include "escape.h"
+#include "http.h" /* for HTTP proxy tunnel stuff */
+#include "socks.h"
+#include "ftp.h"
+#include "fileinfo.h"
+#include "ftplistparser.h"
#if defined(HAVE_KRB4) || defined(HAVE_GSSAPI)
-#include "curl_krb4.h"
+#include "krb4.h"
#endif
-#include "curl_strtoofft.h"
-#include "curl_strequal.h"
-#include "curl_sslgen.h"
-#include "curl_connect.h"
-#include "curl_strerror.h"
-#include "curl_inet_ntop.h"
-#include "curl_inet_pton.h"
-#include "curl_select.h"
-#include "curl_parsedate.h" /* for the week day and month names */
-#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */
-#include "curl_multiif.h"
-#include "curl_url.h"
-#include "curl_rawstr.h"
-#include "curl_speedcheck.h"
-#include "curl_warnless.h"
-#include "curl_http_proxy.h"
-#include "curl_non_ascii.h"
+#include "strtoofft.h"
+#include "strequal.h"
+#include "sslgen.h"
+#include "connect.h"
+#include "strerror.h"
+#include "inet_ntop.h"
+#include "inet_pton.h"
+#include "select.h"
+#include "parsedate.h" /* for the week day and month names */
+#include "sockaddr.h" /* required for Curl_sockaddr_storage */
+#include "multiif.h"
+#include "url.h"
+#include "rawstr.h"
+#include "speedcheck.h"
+#include "warnless.h"
+#include "http_proxy.h"
+#include "non-ascii.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifndef NI_MAXHOST
#define NI_MAXHOST 1025
}
-/* called repeatedly until done from curl_multi.c */
+/* called repeatedly until done from multi.c */
static CURLcode ftp_multi_statemach(struct connectdata *conn,
bool *done)
{
return CURLE_OK;
}
-/* called from curl_multi.c while DOing */
+/* called from multi.c while DOing */
static CURLcode ftp_doing(struct connectdata *conn,
bool *dophase_done)
{
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_pingpong.h"
+#include "pingpong.h"
#ifndef CURL_DISABLE_FTP
extern const struct Curl_handler Curl_handler_ftp;
FTP_LAST /* never used */
} ftpstate;
-struct ftp_parselist_data; /* defined later in curl_ftplistparser.c */
+struct ftp_parselist_data; /* defined later in ftplistparser.c */
struct ftp_wc_tmpdata {
struct ftp_parselist_data *parser;
int count1; /* general purpose counter for the state machine */
int count2; /* general purpose counter for the state machine */
int count3; /* general purpose counter for the state machine */
- ftpstate state; /* always use curl_ftp.c:state() to change state! */
+ ftpstate state; /* always use ftp.c:state() to change state! */
ftpstate state_saved; /* transfer type saved to be reloaded after
data connection is established */
curl_off_t retr_size_saved; /* Size of retrieved file saved */
* 01-29-97 11:32PM <DIR> prog
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_FTP
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_fileinfo.h"
-#include "curl_llist.h"
-#include "curl_strtoofft.h"
-#include "curl_rawstr.h"
-#include "curl_ftp.h"
-#include "curl_ftplistparser.h"
+#include "urldata.h"
+#include "fileinfo.h"
+#include "llist.h"
+#include "strtoofft.h"
+#include "rawstr.h"
+#include "ftp.h"
+#include "ftplistparser.h"
#include "curl_fnmatch.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* allocs buffer which will contain one line of LIST command response */
#define FTP_BUFFER_ALLOCSIZE 160
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_FTP
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef __VMS
#include <unixlib.h>
#include <curl/curl.h>
#include "curl_memory.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
static
char *GetEnv(const char *variable)
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_getinfo.h"
+#include "urldata.h"
+#include "getinfo.h"
#include "curl_memory.h"
-#include "curl_sslgen.h"
-#include "curl_connect.h" /* Curl_getconnectinfo() */
-#include "curl_progress.h"
+#include "sslgen.h"
+#include "connect.h" /* Curl_getconnectinfo() */
+#include "progress.h"
/* Make this the last #include */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* This is supposed to be called in the beginning of a perform() session
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_GOPHER
-#include "curl_urldata.h"
+#include "urldata.h"
#include <curl/curl.h>
-#include "curl_transfer.h"
-#include "curl_sendf.h"
+#include "transfer.h"
+#include "sendf.h"
-#include "curl_progress.h"
-#include "curl_strequal.h"
-#include "curl_gopher.h"
-#include "curl_rawstr.h"
-#include "curl_select.h"
-#include "curl_url.h"
-#include "curl_warnless.h"
+#include "progress.h"
+#include "strequal.h"
+#include "gopher.h"
+#include "rawstr.h"
+#include "select.h"
+#include "url.h"
+#include "warnless.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* Forward declarations.
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
/*
* Source file for all GnuTLS-specific code for the TLS/SSL layer. No code
- * but curl_sslgen.c should ever call or use these functions.
+ * but sslgen.c should ever call or use these functions.
*
* Note: don't use the GnuTLS' *_t variable type names in this source code,
* since they were not present in 1.0.X.
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_GNUTLS
#include <gcrypt.h>
#endif
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_inet_pton.h"
-#include "curl_gtls.h"
-#include "curl_sslgen.h"
-#include "curl_parsedate.h"
-#include "curl_connect.h" /* for the connect timeout */
-#include "curl_select.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "inet_pton.h"
+#include "gtls.h"
+#include "sslgen.h"
+#include "parsedate.h"
+#include "connect.h" /* for the connect timeout */
+#include "select.h"
+#include "rawstr.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
Some hackish cast macros based on:
/*
* Custom push and pull callback functions used by GNU TLS to read and write
* to the socket. These functions are simple wrappers to send() and recv()
- * (although here using sread/swrite macros as defined by curl_setup_once.h).
+ * (although here using the sread/swrite macros as defined by setup_once.h).
* We use custom functions rather than the GNU TLS defaults because it allows
* us to get specific about the fourth "flags" argument, and to use arbitrary
* private data with gnutls_transport_set_ptr if we wish.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_GNUTLS
-#include "curl_urldata.h"
+#include "urldata.h"
int Curl_gtls_init(void);
int Curl_gtls_cleanup(void);
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_hash.h"
-#include "curl_llist.h"
+#include "hash.h"
+#include "llist.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
static void
hash_element_dtor(void *user, void *element)
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <stddef.h>
-#include "curl_llist.h"
+#include "llist.h"
/* Hash function prototype */
typedef size_t (*hash_function) (void* key,
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_CRYPTO_AUTH
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* Generic HMAC algorithm.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#include <process.h>
#endif
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/***********************************************************************
* Only for builds using asynchronous name resolves
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if defined(USE_SSLEAY) || defined(USE_AXTLS)
/* these two backends use functions from this file */
-#include "curl_hostcheck.h"
-#include "curl_rawstr.h"
+#include "hostcheck.h"
+#include "rawstr.h"
/*
* Match a hostname against a wildcard pattern.
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#include <process.h>
#endif
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
-#include "curl_inet_ntop.h"
-#include "curl_warnless.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
+#include "inet_ntop.h"
+#include "warnless.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#if defined(CURLRES_SYNCH) && \
defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP)
#endif
/*
- * curl_hostip.c explained
- * =======================
+ * hostip.c explained
+ * ==================
*
- * The main COMPILE-TIME DEFINES to keep in mind when reading the curl_host*.c
+ * The main COMPILE-TIME DEFINES to keep in mind when reading the host*.c
* source file are these:
*
* CURLRES_IPV6 - this host has getaddrinfo() and family, and thus we use
* libcurl is not built to use an asynchronous resolver, CURLRES_SYNCH is
* defined.
*
- * The curl_host*.c sources files are split up like this:
+ * The host*.c sources files are split up like this:
*
- * curl_hostip.c - method-independent resolver and utility functions
- * curl_hostasyn.c - functions for asynchronous name resolves
- * curl_hostsyn.c - functions for synchronous name resolves
- * curl_hostip4.c - ipv4-specific functions
- * curl_hostip6.c - ipv6-specific functions
+ * hostip.c - method-independent resolver functions and utility functions
+ * hostasyn.c - functions for asynchronous name resolves
+ * hostsyn.c - functions for synchronous name resolves
+ * hostip4.c - ipv4-specific functions
+ * hostip6.c - ipv6-specific functions
*
* The two asynchronous name resolver backends are implemented in:
- * curl_asyn_ares.c - functions for ares-using name resolves
- * curl_asyn_thread.c - functions for threaded name resolves
+ * asyn-ares.c - functions for ares-using name resolves
+ * asyn-thread.c - functions for threaded name resolves
- * The curl_hostip.h is the united header file for all this. It defines the
- * CURLRES_* defines based on the config*.h and curl_setup.h defines.
+ * The hostip.h is the united header file for all this. It defines the
+ * CURLRES_* defines based on the config*.h and setup.h defines.
*/
/* These two symbols are for the global DNS cache */
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
-#include "curl_hash.h"
+#include "setup.h"
+#include "hash.h"
#include "curl_addrinfo.h"
-#include "curl_asyn.h"
+#include "asyn.h"
#ifdef HAVE_SETJMP_H
#include <setjmp.h>
#endif
#ifdef HAVE_SIGSETJMP
-/* Forward-declaration of variable defined in curl_hostip.c. Beware this
+/* Forward-declaration of variable defined in hostip.c. Beware this
* is a global and unique instance. This is used to store the return
* address that we can jump back to from inside a signal handler.
* This is not thread-safe stuff.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#include <process.h>
#endif
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
-#include "curl_inet_pton.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
+#include "inet_pton.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/***********************************************************************
* Only for plain-ipv4 builds
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#include <process.h>
#endif
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
-#include "curl_inet_pton.h"
-#include "curl_connect.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
+#include "inet_pton.h"
+#include "connect.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/***********************************************************************
* Only for ipv6-enabled builds
#if defined(CURLDEBUG) && defined(HAVE_GETNAMEINFO)
/* These are strictly for memory tracing and are using the same style as the
- * family otherwise present in curl_memdebug.c. I put these ones here since
- * they require a bunch of structs I didn't want to include there.
+ * family otherwise present in memdebug.c. I put these ones here since they
+ * require a bunch of structs I didn't want to include in memdebug.c
*/
/*
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#include <process.h>
#endif
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/***********************************************************************
* Only for builds using synchronous name resolves
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_HTTP
#include <sys/param.h>
#endif
-#include "curl_urldata.h"
+#include "urldata.h"
#include <curl/curl.h>
-#include "curl_transfer.h"
-#include "curl_sendf.h"
-#include "curl_formdata.h"
-#include "curl_progress.h"
+#include "transfer.h"
+#include "sendf.h"
+#include "formdata.h"
+#include "progress.h"
#include "curl_base64.h"
-#include "curl_cookie.h"
-#include "curl_strequal.h"
-#include "curl_sslgen.h"
-#include "curl_http_digest.h"
+#include "cookie.h"
+#include "strequal.h"
+#include "sslgen.h"
+#include "http_digest.h"
#include "curl_ntlm.h"
#include "curl_ntlm_wb.h"
-#include "curl_http_negotiate.h"
-#include "curl_url.h"
-#include "curl_share.h"
-#include "curl_hostip.h"
-#include "curl_http.h"
+#include "http_negotiate.h"
+#include "url.h"
+#include "share.h"
+#include "hostip.h"
+#include "http.h"
#include "curl_memory.h"
-#include "curl_select.h"
-#include "curl_parsedate.h" /* for the week day and month names */
-#include "curl_strtoofft.h"
-#include "curl_multiif.h"
-#include "curl_rawstr.h"
-#include "curl_content_encoding.h"
-#include "curl_http_proxy.h"
-#include "curl_warnless.h"
-#include "curl_non_ascii.h"
+#include "select.h"
+#include "parsedate.h" /* for the week day and month names */
+#include "strtoofft.h"
+#include "multiif.h"
+#include "rawstr.h"
+#include "content_encoding.h"
+#include "http_proxy.h"
+#include "warnless.h"
+#include "non-ascii.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* Forward declarations.
/*
* Curl_http_input_auth() deals with Proxy-Authenticate: and WWW-Authenticate:
- * headers. They are dealt with both in the curl_transfer.c main loop and in
- * the proxy CONNECT loop.
+ * headers. They are dealt with both in the transfer.c main loop and in the
+ * proxy CONNECT loop.
*/
CURLcode Curl_http_input_auth(struct connectdata *conn,
* readmoredata() is a "fread() emulation" to provide POST and/or request
* data. It is used when a huge POST is to be made and the entire chunk wasn't
* sent in the first send(). This function will then be called from the
- * curl_transfer.c loop when more data is to be sent to the peer.
+ * transfer.c loop when more data is to be sent to the peer.
*
* Returns the amount of bytes it filled the buffer with.
*/
checkprefix("Host:", headers->data))
;
else if(conn->data->set.httpreq == HTTPREQ_POST_FORM &&
- /* this header (extended by curl_formdata.c) is sent later */
+ /* this header (extended by formdata.c) is sent later */
checkprefix("Content-Type:", headers->data))
;
else if(conn->bits.authneg &&
}
}
- /* The User-Agent string might have been allocated in curl_url.c already,
- because it might have been used in the proxy connect, but if we have
- got a header with the user-agent string specified, we erase the
- previously made string here. */
+ /* The User-Agent string might have been allocated in url.c already, because
+ it might have been used in the proxy connect, but if we have got a header
+ with the user-agent string specified, we erase the previously made string
+ here. */
if(Curl_checkheaders(data, "User-Agent:") && conn->allocptr.uagent) {
free(conn->allocptr.uagent);
conn->allocptr.uagent=NULL;
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
CURLcode Curl_http_done(struct connectdata *, CURLcode, bool premature);
CURLcode Curl_http_connect(struct connectdata *conn, bool *done);
-/* The following functions are defined in curl_http_chunks.c */
+/* The following functions are defined in http_chunks.c */
void Curl_httpchunk_init(struct connectdata *conn);
CHUNKcode Curl_httpchunk_read(struct connectdata *conn, char *datap,
ssize_t length, ssize_t *wrote);
-/* These functions are in curl_http.c */
+/* These functions are in http.c */
void Curl_http_auth_stage(struct SessionHandle *data, int stage);
CURLcode Curl_http_input_auth(struct connectdata *conn,
int httpcode, const char *header);
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_HTTP
-#include "curl_urldata.h" /* it includes curl_http_chunks.h */
-#include "curl_sendf.h" /* for the client write stuff */
+#include "urldata.h" /* it includes http_chunks.h */
+#include "sendf.h" /* for the client write stuff */
-#include "curl_content_encoding.h"
-#include "curl_http.h"
+#include "content_encoding.h"
+#include "http.h"
#include "curl_memory.h"
-#include "curl_non_ascii.h" /* for Curl_convert_to_network prototype */
+#include "non-ascii.h" /* for Curl_convert_to_network prototype */
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* Chunk format (simplified):
}
}
else {
- /* conn->trailer is assumed to be freed in curl_url.c on a
+ /* conn->trailer is assumed to be freed in url.c on a
connection basis */
if(conn->trlPos >= conn->trlMax) {
/* we always allocate three extra bytes, just because when the full
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH)
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "rawstr.h"
#include "curl_base64.h"
#include "curl_md5.h"
-#include "curl_http_digest.h"
-#include "curl_strtok.h"
-#include "curl_url.h"
+#include "http_digest.h"
+#include "strtok.h"
+#include "url.h" /* for Curl_safefree() */
#include "curl_memory.h"
-#include "curl_non_ascii.h" /* included for Curl_convert_... prototypes */
-#include "curl_warnless.h"
+#include "non-ascii.h" /* included for Curl_convert_... prototypes */
+#include "warnless.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#define MAX_VALUE_LENGTH 256
#define MAX_CONTENT_LENGTH 1024
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
typedef enum {
CURLDIGEST_NONE, /* not a digest */
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_GSSAPI
#ifdef HAVE_OLD_GSSMIT
#ifndef CURL_DISABLE_HTTP
-#include "curl_urldata.h"
-#include "curl_sendf.h"
+#include "urldata.h"
+#include "sendf.h"
#include "curl_gssapi.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
#include "curl_base64.h"
-#include "curl_http_negotiate.h"
+#include "http_negotiate.h"
#include "curl_memory.h"
-#include "curl_url.h"
+#include "url.h"
#ifdef HAVE_SPNEGO
# include <spnegohelp.h>
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
static int
get_gss_name(struct connectdata *conn, bool proxy, gss_name_t *server)
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_WINDOWS_SSPI
#ifndef CURL_DISABLE_HTTP
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
-#include "curl_warnless.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "rawstr.h"
+#include "warnless.h"
#include "curl_base64.h"
-#include "curl_http_negotiate.h"
+#include "http_negotiate.h"
#include "curl_memory.h"
#include "curl_multibyte.h"
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
static int
get_gss_name(struct connectdata *conn, bool proxy,
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
-#include "curl_urldata.h"
+#include "urldata.h"
#include <curl/curl.h>
-#include "curl_http_proxy.h"
-#include "curl_sendf.h"
-#include "curl_http.h"
-#include "curl_url.h"
-#include "curl_select.h"
-#include "curl_rawstr.h"
-#include "curl_progress.h"
-#include "curl_non_ascii.h"
-#include "curl_connect.h"
+#include "http_proxy.h"
+#include "sendf.h"
+#include "http.h"
+#include "url.h"
+#include "select.h"
+#include "rawstr.h"
+#include "progress.h"
+#include "non-ascii.h"
+#include "connect.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
CURLcode Curl_proxy_connect(struct connectdata *conn)
{
* IDN conversions using Windows kernel32 and normaliz libraries.
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_WIN32_IDN
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifdef WANT_IDN_PROTOTYPES
WINBASEAPI int WINAPI IdnToAscii(DWORD, const WCHAR *, int, WCHAR *, int);
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
# include <inet.h>
#endif
-#include "curl_inet_ntop.h"
-#include "curl_strequal.h"
-#include "curl_if2ip.h"
+#include "inet_ntop.h"
+#include "strequal.h"
+#include "if2ip.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* ------------------------------------------------------------------ */
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
bool Curl_if_is_interface_name(const char *interf);
char *Curl_if2ip(int af, const char *interf, char *buf, int buf_size);
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_IMAP
#endif
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_if2ip.h"
-#include "curl_hostip.h"
-#include "curl_progress.h"
-#include "curl_transfer.h"
-#include "curl_escape.h"
-#include "curl_http.h" /* for HTTP proxy tunnel stuff */
-#include "curl_socks.h"
-#include "curl_imap.h"
-
-#include "curl_strtoofft.h"
-#include "curl_strequal.h"
-#include "curl_sslgen.h"
-#include "curl_connect.h"
-#include "curl_strerror.h"
-#include "curl_select.h"
-#include "curl_multiif.h"
-#include "curl_url.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "if2ip.h"
+#include "hostip.h"
+#include "progress.h"
+#include "transfer.h"
+#include "escape.h"
+#include "http.h" /* for HTTP proxy tunnel stuff */
+#include "socks.h"
+#include "imap.h"
+
+#include "strtoofft.h"
+#include "strequal.h"
+#include "sslgen.h"
+#include "connect.h"
+#include "strerror.h"
+#include "select.h"
+#include "multiif.h"
+#include "url.h"
+#include "rawstr.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* Local API functions */
static CURLcode imap_parse_url_path(struct connectdata *conn);
return result;
}
-/* Called repeatedly until done from curl_multi.c */
+/* Called repeatedly until done from multi.c */
static CURLcode imap_multi_statemach(struct connectdata *conn,
bool *done)
{
return CURLE_OK;
}
-/* Called from curl_multi.c while DOing */
+/* Called from multi.c while DOing */
static CURLcode imap_doing(struct connectdata *conn, bool *dophase_done)
{
CURLcode result = imap_multi_statemach(conn, dophase_done);
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2009 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_pingpong.h"
+#include "pingpong.h"
/****************************************************************************
* IMAP unique setup
struct imap_conn {
struct pingpong pp;
char *mailbox; /* Message ID to fetch */
- imapstate state; /* Always use curl_imap.c:state() to change state! */
+ imapstate state; /* Always use imap.c:state() to change state! */
int cmdid; /* Next command ID */
const char *idstr; /* String based response ID to wait for */
bool ssldone; /* Is connect() over SSL done? Only relevant in
* Original code by Paul Vixie. "curlified" by Gisle Vanem.
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef HAVE_INET_NTOP
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
-#include "curl_inet_ntop.h"
+#include "inet_ntop.h"
#define IN6ADDRSZ 16
#define INADDRSZ 4
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
char *Curl_inet_ntop(int af, const void *addr, char *buf, size_t size);
* SOFTWARE.
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef HAVE_INET_PTON
#include <arpa/inet.h>
#endif
-#include "curl_inet_pton.h"
+#include "inet_pton.h"
#define IN6ADDRSZ 16
#define INADDRSZ 4
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
int Curl_inet_pton(int, const char *, void *);
*
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_FTP
#ifdef HAVE_KRB4
#include <krb.h>
#include <des.h>
-#include "curl_urldata.h"
+#include "urldata.h"
#include "curl_base64.h"
-#include "curl_ftp.h"
-#include "curl_sendf.h"
-#include "curl_krb4.h"
-#include "curl_inet_ntop.h"
+#include "ftp.h"
+#include "sendf.h"
+#include "krb4.h"
+#include "inet_ntop.h"
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#define LOCAL_ADDR (&conn->local_addr)
#define REMOTE_ADDR conn->ip_addr->ai_addr
-/* GSSAPI/krb5 support for FTP - loosely based on old curl_krb4.c
+/* GSSAPI/krb5 support for FTP - loosely based on old krb4.c
*
* Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
- * Copyright (c) 2004 - 2013 Daniel Stenberg
+ * Copyright (c) 2004 - 2012 Daniel Stenberg
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. */
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_FTP
#ifdef HAVE_GSSAPI
#include <netdb.h>
#endif
-#include "curl_urldata.h"
+#include "urldata.h"
#include "curl_base64.h"
-#include "curl_ftp.h"
+#include "ftp.h"
#include "curl_gssapi.h"
-#include "curl_sendf.h"
-#include "curl_krb4.h"
+#include "sendf.h"
+#include "krb4.h"
#include "curl_memory.h"
-#include "curl_warnless.h"
+#include "warnless.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#define LOCAL_ADDR (&conn->local_addr)
#define REMOTE_ADDR conn->ip_addr->ai_addr
/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
- * \___|\___/|_| \_\_____|
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
+ * \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if !defined(CURL_DISABLE_LDAP) && !defined(USE_OPENLDAP)
/*
* Notice that USE_OPENLDAP is only a source code selection switch. When
* libcurl is built with USE_OPENLDAP defined the libcurl source code that
- * gets compiled is the code from curl_openldap.c, otherwise the code that
- * gets compiled is the code from curl_ldap.c.
+ * gets compiled is the code from openldap.c, otherwise the code that gets
+ * compiled is the code from ldap.c.
*
* When USE_OPENLDAP is defined a recent version of the OpenLDAP library
* might be required for compilation and runtime. In order to use ancient
# endif /* HAVE_LDAP_SSL && HAVE_LDAP_SSL_H */
#endif
-#include "curl_urldata.h"
+#include "urldata.h"
#include <curl/curl.h>
-#include "curl_sendf.h"
-#include "curl_escape.h"
-#include "curl_progress.h"
-#include "curl_transfer.h"
-#include "curl_strequal.h"
-#include "curl_strtok.h"
+#include "sendf.h"
+#include "escape.h"
+#include "progress.h"
+#include "transfer.h"
+#include "strequal.h"
+#include "strtok.h"
#include "curl_ldap.h"
#include "curl_memory.h"
#include "curl_base64.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifndef HAVE_LDAP_URL_PARSE
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_llist.h"
+#include "llist.h"
#include "curl_memory.h"
/* this must be the last include file */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* @unittest: 1300
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <stddef.h>
typedef void (*curl_llist_dtor)(void *, void *);
documentation and/or software.
*/
-#include "curl_setup.h"
+#include "setup.h"
/* NSS crypto library does not provide the MD4 hash algorithm, so that we have
* a local implementation of it */
#ifdef USE_NSS
#include "curl_md4.h"
-#include "curl_warnless.h"
+#include "warnless.h"
typedef unsigned int UINT4;
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_CRYPTO_AUTH
#include "curl_md5.h"
#include "curl_hmac.h"
-#include "curl_warnless.h"
+#include "warnless.h"
#include "curl_memory.h"
#include <nettle/md5.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
typedef struct md5_ctx MD5_CTX;
#include <gcrypt.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
typedef gcry_md_hd_t MD5_CTX;
#endif /* CRYPTO LIBS */
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
const HMAC_params Curl_HMAC_MD5[] = {
{
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef CURLDEBUG
#define _MPRINTF_REPLACE
#include <curl/mprintf.h>
-#include "curl_urldata.h"
+#include "urldata.h"
#define MEMDEBUG_NODEFINES /* don't redefine the standard functions */
#include "curl_memory.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifndef HAVE_ASSERT_H
# define assert(x) Curl_nop_stmt
* as well as the library. Do not mix with library internals!
*/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1999 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* page at http://daniel.haxx.se/trio/
*/
-#include "curl_setup.h"
+#include "setup.h"
#if defined(DJGPP) && (DJGPP_MINOR < 4)
#undef _MPRINTF_REPLACE /* don't use x_was_used() here */
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifndef SIZEOF_LONG_DOUBLE
#define SIZEOF_LONG_DOUBLE 0
#endif
/*
- * Max integer data types that curl_mprintf.c is capable
+ * Max integer data types that mprintf.c is capable
*/
#ifdef HAVE_LONG_LONG_TYPE
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_transfer.h"
-#include "curl_url.h"
-#include "curl_connect.h"
-#include "curl_progress.h"
-#include "curl_easyif.h"
-#include "curl_multiif.h"
-#include "curl_sendf.h"
-#include "curl_timeval.h"
-#include "curl_http.h"
-#include "curl_select.h"
-#include "curl_warnless.h"
-#include "curl_speedcheck.h"
-#include "curl_conncache.h"
-#include "curl_bundles.h"
+#include "urldata.h"
+#include "transfer.h"
+#include "url.h"
+#include "connect.h"
+#include "progress.h"
+#include "easyif.h"
+#include "multiif.h"
+#include "sendf.h"
+#include "timeval.h"
+#include "http.h"
+#include "select.h"
+#include "warnless.h"
+#include "speedcheck.h"
+#include "conncache.h"
+#include "bundles.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
CURL_SOCKET_HASH_TABLE_SIZE should be a prime number. Increasing it from 97
*
* Curl_hash_print(multi->sockhash, debug_print_sock_hash);
*
- * Enable the hash print function first by editing curl_hash.c
+ * Enable the hash print function first by editing hash.c
*/
static void debug_print_sock_hash(void *p)
{
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
***************************************************************************/
/*
- * Prototypes for library-wide functions provided by curl_multi.c
+ * Prototypes for library-wide functions provided by multi.c
*/
void Curl_expire(struct SessionHandle *data, long milli);
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_PWD_H
#include <pwd.h>
#endif
#include <curl/curl.h>
-#include "curl_netrc.h"
+#include "netrc.h"
-#include "curl_strequal.h"
-#include "curl_strtok.h"
+#include "strequal.h"
+#include "strtok.h"
#include "curl_memory.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* Get user and password from .netrc when given a machine name */
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef CURL_DOES_CONVERSIONS
#include <curl/curl.h>
-#include "curl_non_ascii.h"
-#include "curl_formdata.h"
-#include "curl_sendf.h"
-#include "curl_urldata.h"
+#include "non-ascii.h"
+#include "formdata.h"
+#include "sendf.h"
+#include "urldata.h"
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifdef HAVE_ICONV
#include <iconv.h>
}
/*
- * Curl_convert_form() is used from curl_http.c, this converts any form items
- * that need to be sent in the network encoding. Returns CURLE_OK on success.
+ * Curl_convert_form() is used from http.c, this converts any form items that
+ need to be sent in the network encoding. Returns CURLE_OK on success.
*/
CURLcode Curl_convert_form(struct SessionHandle *data, struct FormData *form)
{
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef CURL_DOES_CONVERSIONS
-#include "curl_urldata.h"
+#include "urldata.h"
/*
* Curl_convert_clone() returns a malloced copy of the source string (if
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#include <inet.h>
#endif
-#include "curl_nonblock.h"
+#include "nonblock.h"
/*
* curlx_nonblock() set the given socket to either blocking or non-blocking
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
/*
* Source file for all NSS-specific code for the TLS/SSL layer. No code
- * but curl_sslgen.c should ever call or use these functions.
+ * but sslgen.c should ever call or use these functions.
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_NSS
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_formdata.h" /* for the boundary function */
-#include "curl_url.h" /* for the ssl config check function */
-#include "curl_connect.h"
-#include "curl_strequal.h"
-#include "curl_select.h"
-#include "curl_sslgen.h"
-#include "curl_llist.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "formdata.h" /* for the boundary function */
+#include "url.h" /* for the ssl config check function */
+#include "connect.h"
+#include "strequal.h"
+#include "select.h"
+#include "sslgen.h"
+#include "llist.h"
#define _MPRINTF_REPLACE /* use the internal *printf() functions */
#include <curl/mprintf.h>
-#include "curl_nssg.h"
+#include "nssg.h"
#include <nspr.h>
#include <nss.h>
#include <ssl.h>
#include <prerror.h>
#include "curl_memory.h"
-#include "curl_rawstr.h"
-#include "curl_warnless.h"
+#include "rawstr.h"
+#include "warnless.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#define SSL_DIR "/etc/pki/nssdb"
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_NSS
/*
- * This header should only be needed to get included by curl_sslgen.c and
- * curl_nss.c
+ * This header should only be needed to get included by sslgen.c and nss.c
*/
-#include "curl_urldata.h"
+#include "urldata.h"
CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex);
CURLcode Curl_nss_connect_nonblocking(struct connectdata *conn,
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef NETWARE /* Novell NetWare */
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
typedef struct
{
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef NETWARE /* Novell NetWare */
/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
- * \___|\___/|_| \_\_____|
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
+ * \___|\___/|_| \_\_____|
*
* Copyright (C) 2010, Howard Chu, <hyc@openldap.org>
- * Copyright (C) 2011 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2011 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if !defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP)
/*
* Notice that USE_OPENLDAP is only a source code selection switch. When
* libcurl is built with USE_OPENLDAP defined the libcurl source code that
- * gets compiled is the code from curl_openldap.c, otherwise the code that
- * gets compiled is the code from curl_ldap.c.
+ * gets compiled is the code from openldap.c, otherwise the code that gets
+ * compiled is the code from ldap.c.
*
* When USE_OPENLDAP is defined a recent version of the OpenLDAP library
* might be required for compilation and runtime. In order to use ancient
#include <ldap.h>
-#include "curl_urldata.h"
+#include "urldata.h"
#include <curl/curl.h>
-#include "curl_sendf.h"
-#include "curl_sslgen.h"
-#include "curl_transfer.h"
+#include "sendf.h"
+#include "sslgen.h"
+#include "transfer.h"
#include "curl_ldap.h"
#include "curl_memory.h"
#include "curl_base64.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifndef _LDAP_PVT_H
extern int ldap_pvt_url_scheme2proto(const char *);
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
#include <curl/curl.h>
-#include "curl_rawstr.h"
-#include "curl_warnless.h"
-#include "curl_parsedate.h"
+#include "rawstr.h"
+#include "warnless.h"
+#include "parsedate.h"
const char * const Curl_wkday[] =
{"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"};
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_select.h"
-#include "curl_progress.h"
-#include "curl_speedcheck.h"
-#include "curl_pingpong.h"
-#include "curl_multiif.h"
-#include "curl_non_ascii.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "select.h"
+#include "progress.h"
+#include "speedcheck.h"
+#include "pingpong.h"
+#include "multiif.h"
+#include "non-ascii.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifdef USE_PINGPONG
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_FTP) || \
!defined(CURL_DISABLE_POP3) || !defined(CURL_DISABLE_SMTP)
#define USE_PINGPONG
#endif
-/* forward-declaration, this is defined in curl_urldata.h */
+/* forward-declaration, this is defined in urldata.h */
struct connectdata;
/*
* \___|\___/|_| \_\_____|
*
* Copyright (C) 2010, 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com>
- * Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
/*
* Source file for all PolarSSL-specific code for the TLS/SSL layer. No code
- * but curl_sslgen.c should ever call or use these functions.
+ * but sslgen.c should ever call or use these functions.
*
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_POLARSSL
#define POLARSSL_ERR_NET_WANT_WRITE POLARSSL_ERR_NET_TRY_AGAIN
#endif
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_inet_pton.h"
-#include "curl_polarssl.h"
-#include "curl_sslgen.h"
-#include "curl_parsedate.h"
-#include "curl_connect.h" /* for the connect timeout */
-#include "curl_select.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "inet_pton.h"
+#include "polarssl.h"
+#include "sslgen.h"
+#include "parsedate.h"
+#include "connect.h" /* for the connect timeout */
+#include "select.h"
+#include "rawstr.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* version dependent differences */
#if POLARSSL_VERSION_NUMBER < 0x01010000
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_POLARSSL
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_POP3
#endif
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_if2ip.h"
-#include "curl_hostip.h"
-#include "curl_progress.h"
-#include "curl_transfer.h"
-#include "curl_escape.h"
-#include "curl_http.h" /* for HTTP proxy tunnel stuff */
-#include "curl_socks.h"
-#include "curl_pop3.h"
-
-#include "curl_strtoofft.h"
-#include "curl_strequal.h"
-#include "curl_sslgen.h"
-#include "curl_connect.h"
-#include "curl_strerror.h"
-#include "curl_select.h"
-#include "curl_multiif.h"
-#include "curl_url.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "if2ip.h"
+#include "hostip.h"
+#include "progress.h"
+#include "transfer.h"
+#include "escape.h"
+#include "http.h" /* for HTTP proxy tunnel stuff */
+#include "socks.h"
+#include "pop3.h"
+
+#include "strtoofft.h"
+#include "strequal.h"
+#include "sslgen.h"
+#include "connect.h"
+#include "strerror.h"
+#include "select.h"
+#include "multiif.h"
+#include "url.h"
+#include "rawstr.h"
#include "curl_sasl.h"
#include "curl_md5.h"
-#include "curl_warnless.h"
+#include "warnless.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* Local API functions */
static CURLcode pop3_parse_url_path(struct connectdata *conn);
return result;
}
-/* Called repeatedly until done from curl_multi.c */
+/* Called repeatedly until done from multi.c */
static CURLcode pop3_multi_statemach(struct connectdata *conn, bool *done)
{
struct pop3_conn *pop3c = &conn->proto.pop3c;
return CURLE_OK;
}
-/* Called from curl_multi.c while DOing */
+/* Called from multi.c while DOing */
static CURLcode pop3_doing(struct connectdata *conn, bool *dophase_done)
{
CURLcode result = pop3_multi_statemach(conn, dophase_done);
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2009 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
unsigned int authmechs; /* Accepted SASL authentication mechanisms */
unsigned int authused; /* SASL auth mechanism used for the connection */
char *apoptimestamp; /* APOP timestamp from the server greeting */
- pop3state state; /* Always use curl_pop3.c:state() to change state */
+ pop3state state; /* Always use pop3.c:state() to change state! */
};
extern const struct Curl_handler Curl_handler_pop3;
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_progress.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "progress.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
*
***************************************************************************/
-#include "curl_timeval.h"
+#include "timeval.h"
typedef enum {
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_QSOSSL
#endif
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_qssl.h"
-#include "curl_sslgen.h"
-#include "curl_connect.h" /* for the connect timeout */
-#include "curl_select.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "qssl.h"
+#include "sslgen.h"
+#include "connect.h" /* for the connect timeout */
+#include "select.h"
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
int Curl_qsossl_init(void)
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
/*
- * This header should only be needed to get included by curl_sslgen.c and
- * curl_qssl.c
+ * This header should only be needed to get included by sslgen.c and qssl.c
*/
-#include "curl_urldata.h"
+#include "urldata.h"
#ifdef USE_QSOSSL
int Curl_qsossl_init(void);
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
/* Portable, consistent toupper (remember EBCDIC). Do not use toupper() because
its behavior is altered by the current locale. */
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_RTSP
-#include "curl_urldata.h"
+#include "urldata.h"
#include <curl/curl.h>
-#include "curl_transfer.h"
-#include "curl_sendf.h"
-#include "curl_multiif.h"
-#include "curl_http.h"
-#include "curl_url.h"
-#include "curl_progress.h"
-#include "curl_rtsp.h"
-#include "curl_rawstr.h"
+#include "transfer.h"
+#include "sendf.h"
+#include "multiif.h"
+#include "http.h"
+#include "url.h"
+#include "progress.h"
+#include "rtsp.h"
+#include "rawstr.h"
#include "curl_memory.h"
-#include "curl_select.h"
-#include "curl_connect.h"
+#include "select.h"
+#include "connect.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* TODO (general)
}
}
- /* The User-Agent string might have been allocated in curl_url.c already,
- because it might have been used in the proxy connect, but if we have
- got a header with the user-agent string specified, we erase the
- previously made string here. */
+ /* The User-Agent string might have been allocated in url.c already, because
+ it might have been used in the proxy connect, but if we have got a header
+ with the user-agent string specified, we erase the previously made string
+ here. */
if(Curl_checkheaders(data, "User-Agent:") && conn->allocptr.uagent) {
Curl_safefree(conn->allocptr.uagent);
conn->allocptr.uagent = NULL;
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. */
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_FTP
#if defined(HAVE_KRB4) || defined(HAVE_GSSAPI)
#include <limits.h>
#endif
-#include "curl_urldata.h"
+#include "urldata.h"
#include "curl_base64.h"
#include "curl_memory.h"
-#include "curl_krb4.h"
-#include "curl_ftp.h"
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
-#include "curl_warnless.h"
+#include "krb4.h"
+#include "ftp.h"
+#include "sendf.h"
+#include "rawstr.h"
+#include "warnless.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
static const struct {
enum protection_level level;
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_connect.h"
-#include "curl_select.h"
-#include "curl_warnless.h"
+#include "urldata.h"
+#include "connect.h"
+#include "select.h"
+#include "warnless.h"
/* Convenience local macros */
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_SYS_POLL_H
#include <sys/poll.h>
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_connect.h"
-#include "curl_sslgen.h"
-#include "curl_ssh.h"
-#include "curl_multiif.h"
-#include "curl_non_ascii.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "connect.h"
+#include "sslgen.h"
+#include "ssh.h"
+#include "multiif.h"
+#include "non-ascii.h"
#define _MPRINTF_REPLACE /* use the internal *printf() functions */
#include <curl/mprintf.h>
/* the krb4 functions only exists for FTP and if krb4 or gssapi is defined */
#if !defined(CURL_DISABLE_FTP) && (defined(HAVE_KRB4) || defined(HAVE_GSSAPI))
-#include "curl_krb4.h"
+#include "krb4.h"
#else
#define Curl_sec_send(a,b,c,d) -1
#define Curl_sec_read(a,b,c,d) -1
#endif
#include "curl_memory.h"
-#include "curl_strerror.h"
+#include "strerror.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifdef CURL_DO_LINEEND_CONV
/*
/* Curl_client_write() sends data to the write callback(s)
The bit pattern defines to what "streams" to write to. Body and/or header.
- The defines are in curl_sendf.h of course.
+ The defines are in sendf.h of course.
If CURL_DO_LINEEND_CONV is enabled, data is converted IN PLACE to the
local character encoding. This is a problem and should be changed in
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
CURLcode Curl_sendf(curl_socket_t sockfd, struct connectdata *,
const char *fmt, ...);
* Include macros and defines that should only be processed once.
*/
-#include "curl_setup_once.h"
+#ifndef __SETUP_ONCE_H
+#include "setup_once.h"
+#endif
/*
* Definition of our NOP statement Object-like macro
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_share.h"
-#include "curl_sslgen.h"
+#include "urldata.h"
+#include "share.h"
+#include "sslgen.h"
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
CURLSH *
curl_share_init(void)
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
-#include "curl_cookie.h"
-#include "curl_urldata.h"
+#include "cookie.h"
+#include "urldata.h"
/* SalfordC says "A structure member may not be volatile". Hence:
*/
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include "curl_memory.h"
-#include "curl_slist.h"
+#include "slist.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* returns last node in linked list */
static struct curl_slist *slist_get_last(struct curl_slist *list)
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_SMTP
#endif
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_if2ip.h"
-#include "curl_hostip.h"
-#include "curl_progress.h"
-#include "curl_transfer.h"
-#include "curl_escape.h"
-#include "curl_http.h" /* for HTTP proxy tunnel stuff */
-#include "curl_socks.h"
-#include "curl_smtp.h"
-
-#include "curl_strtoofft.h"
-#include "curl_strequal.h"
-#include "curl_sslgen.h"
-#include "curl_connect.h"
-#include "curl_strerror.h"
-#include "curl_select.h"
-#include "curl_multiif.h"
-#include "curl_url.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "if2ip.h"
+#include "hostip.h"
+#include "progress.h"
+#include "transfer.h"
+#include "escape.h"
+#include "http.h" /* for HTTP proxy tunnel stuff */
+#include "socks.h"
+#include "smtp.h"
+
+#include "strtoofft.h"
+#include "strequal.h"
+#include "sslgen.h"
+#include "connect.h"
+#include "strerror.h"
+#include "select.h"
+#include "multiif.h"
+#include "url.h"
+#include "rawstr.h"
#include "curl_gethostname.h"
#include "curl_sasl.h"
-#include "curl_warnless.h"
+#include "warnless.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* Local API functions */
static CURLcode smtp_regular_transfer(struct connectdata *conn, bool *done);
return result;
}
-/* Called repeatedly until done from curl_multi.c */
+/* Called repeatedly until done from multi.c */
static CURLcode smtp_multi_statemach(struct connectdata *conn, bool *done)
{
struct smtp_conn *smtpc = &conn->proto.smtpc;
return CURLE_OK;
}
-/* Called from curl_multi.c while DOing */
+/* Called from multi.c while DOing */
static CURLcode smtp_doing(struct connectdata *conn, bool *dophase_done)
{
CURLcode result = smtp_multi_statemach(conn, dophase_done);
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2009 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_pingpong.h"
+#include "pingpong.h"
/****************************************************************************
* SMTP unique setup
have been received so far */
unsigned int authmechs; /* Accepted authentication mechanisms */
unsigned int authused; /* Auth mechanism used for the connection */
- smtpstate state; /* Always use curl_smtp.c:state() to change */
+ smtpstate state; /* Always use smtp.c:state() to change state! */
struct curl_slist *rcpt; /* Recipient list */
bool ssldone; /* Is connect() over SSL done? Only relevant in
multi mode */
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
struct Curl_sockaddr_storage {
union {
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if !defined(CURL_DISABLE_PROXY)
#include <arpa/inet.h>
#endif
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_strequal.h"
-#include "curl_select.h"
-#include "curl_connect.h"
-#include "curl_timeval.h"
-#include "curl_socks.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "strequal.h"
+#include "select.h"
+#include "connect.h"
+#include "timeval.h"
+#include "socks.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* Helper read-from-socket functions. Does the same as Curl_read() but it
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef CURL_DISABLE_PROXY
#define Curl_SOCKS4(a,b,c,d,e,f) CURLE_NOT_BUILT_IN
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_PROXY
#endif
#include "curl_gssapi.h"
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_connect.h"
-#include "curl_timeval.h"
-#include "curl_socks.h"
-#include "curl_warnless.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "connect.h"
+#include "timeval.h"
+#include "socks.h"
+#include "warnless.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
static gss_ctx_id_t gss_context = GSS_C_NO_CONTEXT;
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_PROXY)
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_connect.h"
-#include "curl_strerror.h"
-#include "curl_timeval.h"
-#include "curl_socks.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "connect.h"
+#include "strerror.h"
+#include "timeval.h"
+#include "socks.h"
#include "curl_sspi.h"
#include "curl_multibyte.h"
-#include "curl_warnless.h"
+#include "warnless.h"
#define _MPRINTF_REPLACE /* use the internal *printf() functions */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* Definitions required from ntsecapi.h are directly provided below this point
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_multiif.h"
-#include "curl_speedcheck.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "multiif.h"
+#include "speedcheck.h"
void Curl_speedinit(struct SessionHandle *data)
{
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_timeval.h"
+#include "timeval.h"
void Curl_speedinit(struct SessionHandle *data);
CURLcode Curl_speedcheck(struct SessionHandle *data,
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_splay.h"
+#include "splay.h"
/*
* This macro compares two node keys i and j and returns:
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
struct Curl_tree {
struct Curl_tree *smaller; /* smaller node */
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
/* #define CURL_LIBSSH2_DEBUG */
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_LIBSSH2
#endif
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_progress.h"
-#include "curl_transfer.h"
-#include "curl_escape.h"
-#include "curl_http.h" /* for HTTP proxy tunnel stuff */
-#include "curl_ssh.h"
-#include "curl_url.h"
-#include "curl_speedcheck.h"
-#include "curl_getinfo.h"
-
-#include "curl_strequal.h"
-#include "curl_sslgen.h"
-#include "curl_connect.h"
-#include "curl_strerror.h"
-#include "curl_inet_ntop.h"
-#include "curl_parsedate.h" /* for the week day and month names */
-#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */
-#include "curl_strtoofft.h"
-#include "curl_multiif.h"
-#include "curl_select.h"
-#include "curl_warnless.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "progress.h"
+#include "transfer.h"
+#include "escape.h"
+#include "http.h" /* for HTTP proxy tunnel stuff */
+#include "ssh.h"
+#include "url.h"
+#include "speedcheck.h"
+#include "getinfo.h"
+
+#include "strequal.h"
+#include "sslgen.h"
+#include "connect.h"
+#include "strerror.h"
+#include "inet_ntop.h"
+#include "parsedate.h" /* for the week day and month names */
+#include "sockaddr.h" /* required for Curl_sockaddr_storage */
+#include "strtoofft.h"
+#include "multiif.h"
+#include "select.h"
+#include "warnless.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifdef WIN32
# undef PATH_MAX
#define ssh_block2waitfor(x,y) Curl_nop_stmt
#endif
-/* called repeatedly until done from curl_multi.c */
+/* called repeatedly until done from multi.c */
static CURLcode ssh_multi_statemach(struct connectdata *conn, bool *done)
{
struct ssh_conn *sshc = &conn->proto.sshc;
return result;
}
-/* called from curl_multi.c while DOing */
+/* called from multi.c while DOing */
static CURLcode scp_doing(struct connectdata *conn,
bool *dophase_done)
{
return result;
}
-/* called from curl_multi.c while DOing */
+/* called from multi.c while DOing */
static CURLcode sftp_doing(struct connectdata *conn,
bool *dophase_done)
{
return nread;
}
-/* The get_pathname() function is being borrowed from OpenSSH-sftp.c
+/* The get_pathname() function is being borrowed from OpenSSH sftp.c
version 4.6p1. */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_LIBSSH2_H
#include <libssh2.h>
char *rsa_pub; /* path name */
char *rsa; /* path name */
bool authed; /* the connection has been authenticated fine */
- sshstate state; /* always use curl_ssh.c:state() to change */
+ sshstate state; /* always use ssh.c:state() to change state! */
sshstate nextstate; /* the state to goto after stopping */
CURLcode actualcode; /* the actual error code */
struct curl_slist *quote_item; /* for the quote option */
http://httpd.apache.org/docs-2.0/ssl/ssl_intro.html
*/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_urldata.h"
+#include "urldata.h"
#define SSLGEN_C
-#include "curl_sslgen.h" /* generic SSL protos etc */
-#include "curl_ssluse.h" /* OpenSSL versions */
-#include "curl_gtls.h" /* GnuTLS versions */
-#include "curl_nssg.h" /* NSS versions */
-#include "curl_qssl.h" /* QSOSSL versions */
-#include "curl_polarssl.h" /* PolarSSL versions */
-#include "curl_axtls.h" /* axTLS versions */
-#include "curl_cyassl.h" /* CyaSSL versions */
+#include "sslgen.h" /* generic SSL protos etc */
+#include "ssluse.h" /* OpenSSL versions */
+#include "gtls.h" /* GnuTLS versions */
+#include "nssg.h" /* NSS versions */
+#include "qssl.h" /* QSOSSL versions */
+#include "polarssl.h" /* PolarSSL versions */
+#include "axtls.h" /* axTLS versions */
+#include "cyassl.h" /* CyaSSL versions */
#include "curl_schannel.h" /* Schannel SSPI version */
#include "curl_darwinssl.h" /* SecureTransport (Darwin) version */
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
-#include "curl_url.h"
+#include "sendf.h"
+#include "rawstr.h"
+#include "url.h"
#include "curl_memory.h"
-#include "curl_progress.h"
-#include "curl_share.h"
+#include "progress.h"
+#include "share.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* convenience macro to check if this handle is using a shared SSL session */
#define SSLSESSION_SHARED(data) (data->share && \
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef MD5_DIGEST_LENGTH
#define MD5_DIGEST_LENGTH 16 /* fixed size */
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
/*
* Source file for all OpenSSL-specific code for the TLS/SSL layer. No code
- * but curl_sslgen.c should ever call or use these functions.
+ * but sslgen.c should ever call or use these functions.
*/
/*
* Sampo Kellomaki 1998.
*/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_formdata.h" /* for the boundary function */
-#include "curl_url.h" /* for the ssl config check function */
-#include "curl_inet_pton.h"
-#include "curl_ssluse.h"
-#include "curl_connect.h"
-#include "curl_strequal.h"
-#include "curl_select.h"
-#include "curl_sslgen.h"
-#include "curl_rawstr.h"
-#include "curl_hostcheck.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "formdata.h" /* for the boundary function */
+#include "url.h" /* for the ssl config check function */
+#include "inet_pton.h"
+#include "ssluse.h"
+#include "connect.h"
+#include "strequal.h"
+#include "select.h"
+#include "sslgen.h"
+#include "rawstr.h"
+#include "hostcheck.h"
#define _MPRINTF_REPLACE /* use the internal *printf() functions */
#include <curl/mprintf.h>
#include <md5.h>
#endif
-#include "curl_warnless.h"
+#include "warnless.h"
#include "curl_memory.h"
-#include "curl_non_ascii.h" /* for Curl_convert_from_utf8 prototype */
+#include "non-ascii.h" /* for Curl_convert_from_utf8 prototype */
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifndef OPENSSL_VERSION_NUMBER
#error "OPENSSL_VERSION_NUMBER not defined"
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef USE_SSLEAY
/*
- * This header should only be needed to get included by curl_sslgen.c and
- * curl_ssluse.c
+ * This header should only be needed to get included by sslgen.c and ssluse.c
*/
-#include "curl_urldata.h"
+#include "urldata.h"
CURLcode Curl_ossl_connect(struct connectdata *conn, int sockindex);
CURLcode Curl_ossl_connect_nonblocking(struct connectdata *conn,
/*
* This file is 'mem-include-scan' clean. See test 1132.
*/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_strdup.h"
+#include "strdup.h"
#ifndef HAVE_STRDUP
char *curlx_strdup(const char *str)
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef HAVE_STRDUP
extern char *curlx_strdup(const char *str);
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
-#include "curl_strequal.h"
+#include "strequal.h"
/*
* @unittest: 1301
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_STRERROR_R
# if (!defined(HAVE_POSIX_STRERROR_R) && \
#include <idna.h>
#endif
-#include "curl_strerror.h"
+#include "strerror.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
const char *
curl_easy_strerror(CURLcode error)
*
***************************************************************************/
-#include "curl_urldata.h"
+#include "urldata.h"
const char *Curl_strerror (struct connectdata *conn, int err);
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef HAVE_STRTOK_R
#include <stddef.h>
-#include "curl_strtok.h"
+#include "strtok.h"
char *
Curl_strtok_r(char *ptr, const char *sep, char **end)
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <stddef.h>
#ifndef HAVE_STRTOK_R
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_strtoofft.h"
+#include "strtoofft.h"
/*
* NOTE:
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
/*
* Determine which string to integral data type conversion function we use
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_TELNET
#include <sys/param.h>
#endif
-#include "curl_urldata.h"
+#include "urldata.h"
#include <curl/curl.h>
-#include "curl_transfer.h"
-#include "curl_sendf.h"
-#include "curl_telnet.h"
-#include "curl_connect.h"
-#include "curl_progress.h"
+#include "transfer.h"
+#include "sendf.h"
+#include "telnet.h"
+#include "connect.h"
+#include "progress.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#define TELOPTS
#define TELCMDS
-#include "curl_arpa_telnet.h"
+#include "arpa_telnet.h"
#include "curl_memory.h"
-#include "curl_select.h"
-#include "curl_strequal.h"
-#include "curl_rawstr.h"
-#include "curl_warnless.h"
+#include "select.h"
+#include "strequal.h"
+#include "rawstr.h"
+#include "warnless.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#define SUBBUFSIZE 512
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifndef CURL_DISABLE_TFTP
#include <sys/param.h>
#endif
-#include "curl_urldata.h"
+#include "urldata.h"
#include <curl/curl.h>
-#include "curl_transfer.h"
-#include "curl_sendf.h"
-#include "curl_tftp.h"
-#include "curl_progress.h"
-#include "curl_connect.h"
-#include "curl_strerror.h"
-#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */
-#include "curl_multiif.h"
-#include "curl_url.h"
-#include "curl_rawstr.h"
+#include "transfer.h"
+#include "sendf.h"
+#include "tftp.h"
+#include "progress.h"
+#include "connect.h"
+#include "strerror.h"
+#include "sockaddr.h" /* required for Curl_sockaddr_storage */
+#include "multiif.h"
+#include "url.h"
+#include "rawstr.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
-#include "curl_select.h"
+#include "select.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* RFC2348 allows the block size to be negotiated */
#define TFTP_BLKSIZE_DEFAULT 512
*
* tftp_doing
*
- * Called from curl_multi.c while DOing
+ * Called from multi.c while DOing
*
**********************************************************/
static CURLcode tftp_doing(struct connectdata *conn, bool *dophase_done)
*
***************************************************************************/
-#include "curl_timeval.h"
+#include "timeval.h"
#if defined(WIN32) && !defined(MSDOS)
* as well as the library. Do not mix with library internals!
*/
-#include "curl_setup.h"
+#include "setup.h"
struct timeval curlx_tvnow(void);
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_strtoofft.h"
-#include "curl_strequal.h"
-#include "curl_rawstr.h"
+#include "strtoofft.h"
+#include "strequal.h"
+#include "rawstr.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#error "We can't compile without socket() support!"
#endif
-#include "curl_urldata.h"
+#include "urldata.h"
#include <curl/curl.h>
-#include "curl_netrc.h"
-
-#include "curl_content_encoding.h"
-#include "curl_hostip.h"
-#include "curl_transfer.h"
-#include "curl_sendf.h"
-#include "curl_speedcheck.h"
-#include "curl_progress.h"
-#include "curl_http.h"
-#include "curl_url.h"
-#include "curl_getinfo.h"
-#include "curl_sslgen.h"
-#include "curl_http_digest.h"
+#include "netrc.h"
+
+#include "content_encoding.h"
+#include "hostip.h"
+#include "transfer.h"
+#include "sendf.h"
+#include "speedcheck.h"
+#include "progress.h"
+#include "http.h"
+#include "url.h"
+#include "getinfo.h"
+#include "sslgen.h"
+#include "http_digest.h"
#include "curl_ntlm.h"
-#include "curl_http_negotiate.h"
-#include "curl_share.h"
+#include "http_negotiate.h"
+#include "share.h"
#include "curl_memory.h"
-#include "curl_select.h"
-#include "curl_multiif.h"
-#include "curl_connect.h"
-#include "curl_non_ascii.h"
+#include "select.h"
+#include "multiif.h"
+#include "connect.h"
+#include "non-ascii.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
#define CURL_TIMEOUT_EXPECT_100 1000 /* counting ms here */
if(k->badheader < HEADER_ALLBAD) {
/* This switch handles various content encodings. If there's an
error here, be sure to check over the almost identical code
- in curl_http_chunks.c.
+ in http_chunks.c.
Make sure that ALL_CONTENT_ENCODINGS contains all the
encodings handled here. */
#ifdef HAVE_LIBZ
char *newurl, /* this 'newurl' is the Location: string,
and it must be malloc()ed before passed
here */
- followtype type) /* see curl_transfer.h */
+ followtype type) /* see transfer.h */
{
#ifdef CURL_DISABLE_HTTP
(void)data;
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
int curl_win32_idn_to_ascii(const char *in, char **out);
#endif /* USE_LIBIDN */
-#include "curl_urldata.h"
-#include "curl_netrc.h"
-
-#include "curl_formdata.h"
-#include "curl_sslgen.h"
-#include "curl_hostip.h"
-#include "curl_transfer.h"
-#include "curl_sendf.h"
-#include "curl_progress.h"
-#include "curl_cookie.h"
-#include "curl_strequal.h"
-#include "curl_strerror.h"
-#include "curl_escape.h"
-#include "curl_strtok.h"
-#include "curl_share.h"
-#include "curl_content_encoding.h"
-#include "curl_http_digest.h"
-#include "curl_http_negotiate.h"
-#include "curl_select.h"
-#include "curl_multiif.h"
-#include "curl_easyif.h"
-#include "curl_speedcheck.h"
-#include "curl_rawstr.h"
-#include "curl_warnless.h"
-#include "curl_non_ascii.h"
-#include "curl_inet_pton.h"
+#include "urldata.h"
+#include "netrc.h"
+
+#include "formdata.h"
+#include "sslgen.h"
+#include "hostip.h"
+#include "transfer.h"
+#include "sendf.h"
+#include "progress.h"
+#include "cookie.h"
+#include "strequal.h"
+#include "strerror.h"
+#include "escape.h"
+#include "strtok.h"
+#include "share.h"
+#include "content_encoding.h"
+#include "http_digest.h"
+#include "http_negotiate.h"
+#include "select.h"
+#include "multiif.h"
+#include "easyif.h"
+#include "speedcheck.h"
+#include "rawstr.h"
+#include "warnless.h"
+#include "non-ascii.h"
+#include "inet_pton.h"
/* And now for the protocols */
-#include "curl_ftp.h"
-#include "curl_dict.h"
-#include "curl_telnet.h"
-#include "curl_tftp.h"
-#include "curl_http.h"
-#include "curl_file.h"
+#include "ftp.h"
+#include "dict.h"
+#include "telnet.h"
+#include "tftp.h"
+#include "http.h"
+#include "file.h"
#include "curl_ldap.h"
-#include "curl_ssh.h"
-#include "curl_imap.h"
-#include "curl_url.h"
-#include "curl_connect.h"
-#include "curl_inet_ntop.h"
+#include "ssh.h"
+#include "imap.h"
+#include "url.h"
+#include "connect.h"
+#include "inet_ntop.h"
#include "curl_ntlm.h"
#include "curl_ntlm_wb.h"
-#include "curl_socks.h"
+#include "socks.h"
#include "curl_rtmp.h"
-#include "curl_gopher.h"
-#include "curl_http_proxy.h"
-#include "curl_bundles.h"
-#include "curl_conncache.h"
+#include "gopher.h"
+#include "http_proxy.h"
+#include "bundles.h"
+#include "conncache.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* Local static prototypes */
static bool ConnectionKillOne(struct SessionHandle *data);
/* Set the default size of the SSL session ID cache */
set->ssl.max_ssl_sessions = 5;
- set->proxyport = CURL_DEFAULT_PROXY_PORT; /* from curl_url.h */
+ set->proxyport = CURL_DEFAULT_PROXY_PORT; /* from url.h */
set->proxytype = CURLPROXY_HTTP; /* defaults to HTTP proxy */
set->httpauth = CURLAUTH_BASIC; /* defaults to basic */
set->proxyauth = CURLAUTH_BASIC; /* defaults to basic */
break;
case CURLOPT_SSH_KEYFUNCTION:
- /* setting to NULL is fine since the curl_ssh.c functions themselves will
+ /* setting to NULL is fine since the ssh.c functions themselves will
then rever to use the internal default */
data->set.ssh_keyfunc = va_arg(param, curl_sshkeycallback);
break;
*/
/* Note: if you add a new protocol, please update the list in
- * lib/curl_version.c too! */
+ * lib/version.c too! */
if(checkprefix("FTP.", conn->host.name))
protop = "ftp";
/* generic protocol-specific function pointer set in curl_connect() */
result = conn->handler->do_it(conn, done);
- /* This was formerly done in curl_transfer.c, but we better do it here */
+ /* This was formerly done in transfer.c, but we better do it here */
if((CURLE_SEND_ERROR == result) && conn->bits.reuse) {
/*
* If the connection is using an easy handle, call reconnect
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
/*
- * Prototypes for library-wide functions provided by curl_url.c
+ * Prototypes for library-wide functions provided by url.c
*/
CURLcode Curl_open(struct SessionHandle **curl);
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
/* This file is for lib internal stuff */
-#include "curl_setup.h"
+#include "setup.h"
#define PORT_FTP 21
#define PORT_FTPS 990
*/
#define RESP_TIMEOUT (1800*1000)
-#include "curl_cookie.h"
-#include "curl_formdata.h"
+#include "cookie.h"
+#include "formdata.h"
#ifdef USE_SSLEAY
#ifdef USE_OPENSSL
#include <netinet/in.h>
#endif
-#include "curl_timeval.h"
+#include "timeval.h"
#ifdef HAVE_ZLIB_H
#include <zlib.h> /* for content-encoding */
#include <curl/curl.h>
-#include "curl_http_chunks.h" /* for the structs and enum stuff */
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_splay.h"
-
-#include "curl_imap.h"
-#include "curl_pop3.h"
-#include "curl_smtp.h"
-#include "curl_ftp.h"
-#include "curl_file.h"
-#include "curl_ssh.h"
-#include "curl_http.h"
-#include "curl_rtsp.h"
-#include "curl_wildcard.h"
+#include "http_chunks.h" /* for the structs and enum stuff */
+#include "hostip.h"
+#include "hash.h"
+#include "splay.h"
+
+#include "imap.h"
+#include "pop3.h"
+#include "smtp.h"
+#include "ftp.h"
+#include "file.h"
+#include "ssh.h"
+#include "http.h"
+#include "rtsp.h"
+#include "wildcard.h"
#ifdef HAVE_GSSAPI
# ifdef HAVE_GSSGNU
bool forbidchunk; /* used only to explicitly forbid chunk-upload for
specific upload buffers. See readmoredata() in
- curl_http.c for details. */
+ http.c for details. */
};
/*
*/
CURLcode (*disconnect)(struct connectdata *, bool dead_connection);
- /* If used, this function gets called from curl_transfer.c:readwrite_data()
- to allow the protocol to do extra reads/writes */
+ /* If used, this function gets called from transfer.c:readwrite_data() to
+ allow the protocol to do extra reads/writes */
CURLcode (*readwrite)(struct SessionHandle *data, struct connectdata *conn,
ssize_t *nread, bool *readmore);
bool callback; /* set when progress callback is used */
int width; /* screen width at download start */
- int flags; /* see curl_progress.h */
+ int flags; /* see progress.h */
double timespent;
struct FTP *ftp;
/* void *tftp; not used */
struct FILEPROTO *file;
- void *telnet; /* private for curl_telnet.c-eyes only */
+ void *telnet; /* private for telnet.c-eyes only */
void *generic;
struct SSHPROTO *ssh;
struct FTP *imap;
* the 'DynamicStatic' struct.
* Character pointer fields point to dynamic storage, unless otherwise stated.
*/
-struct Curl_one_easy; /* declared and used only in curl_multi.c */
-struct Curl_multi; /* declared and used only in curl_multi.c */
+struct Curl_one_easy; /* declared and used only in multi.c */
+struct Curl_multi; /* declared and used only in multi.c */
enum dupstring {
STRING_CERT, /* client certificate file name */
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sslgen.h"
+#include "urldata.h"
+#include "sslgen.h"
#define _MPRINTF_REPLACE /* use the internal *printf() functions */
#include <curl/mprintf.h>
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#if defined(__INTEL_COMPILER) && defined(__unix__)
#define BUILDING_WARNLESS_C 1
-#include "curl_warnless.h"
+#include "warnless.h"
#define CURL_MASK_SCHAR 0x7F
#define CURL_MASK_UCHAR 0xFF
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_wildcard.h"
-#include "curl_llist.h"
-#include "curl_fileinfo.h"
+#include "wildcard.h"
+#include "llist.h"
+#include "fileinfo.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
CURLcode Curl_wildcard_init(struct WildcardData *wc)
{
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
#***************************************************************************
# File version for 'aclocal' use. Keep it a single number.
-# serial 9
+# serial 8
dnl Note 1
dnl ------
dnl after this will execute with preprocessor symbol
dnl _REENTRANT defined. This macro also ensures that
dnl the generated config file defines NEED_REENTRANT
-dnl and that in turn curl_setup.h will define _REENTRANT.
+dnl and that in turn setup.h will define _REENTRANT.
dnl Internal macro for CURL_CONFIGURE_REENTRANT.
AC_DEFUN([CURL_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT], [
dnl after this will execute with preprocessor symbol
dnl _THREAD_SAFE defined. This macro also ensures that
dnl the generated config file defines NEED_THREAD_SAFE
-dnl and that in turn curl_setup.h will define _THREAD_SAFE.
+dnl and that in turn setup.h will define _THREAD_SAFE.
dnl Internal macro for CURL_CONFIGURE_THREAD_SAFE.
AC_DEFUN([CURL_CONFIGURE_FROM_NOW_ON_WITH_THREAD_SAFE], [
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
#pragma enum(int)
#include "curl.h"
-#include "curl_mprintf.h"
-#include "curl_urldata.h"
-#include "curl_url.h"
-#include "curl_getinfo.h"
+#include "mprintf.h"
+#include "urldata.h"
+#include "url.h"
+#include "getinfo.h"
#include "ccsidcurl.h"
#include "os400sys.h"
echo '#pragma comment(user, "libcurl version '"${LIBCURL_VERSION}"'")' > os400.c
echo '#pragma comment(user, __DATE__)' >> os400.c
echo '#pragma comment(user, __TIME__)' >> os400.c
-echo '#pragma comment(copyright, "Copyright (C) 1998-2013 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c
+echo '#pragma comment(copyright, "Copyright (C) 1998-2012 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c
make_module OS400 os400.c
LINK= # No need to rebuild service program yet.
MODULES=
if [ "${TEST_FORMDATA}" ]
then MODULES=
- make_module TFORMDATA curl_formdata.c "'_FORM_DEBUG' 'CURLDEBUG'"
- make_module TSTREQUAL curl_strequal.c "'_FORM_DEBUG' 'CURLDEBUG'"
- make_module TMEMDEBUG curl_memdebug.c "'_FORM_DEBUG' 'CURLDEBUG'"
- make_module TMPRINTF curl_mprintf.c "'_FORM_DEBUG' 'CURLDEBUG'"
- make_module TSTRERROR curl_strerror.c "'_FORM_DEBUG' 'CURLDEBUG'"
+ make_module TFORMDATA formdata.c "'_FORM_DEBUG' 'CURLDEBUG'"
+ make_module TSTREQUAL strequal.c "'_FORM_DEBUG' 'CURLDEBUG'"
+ make_module TMEMDEBUG memdebug.c "'_FORM_DEBUG' 'CURLDEBUG'"
+ make_module TMPRINTF mprintf.c "'_FORM_DEBUG' 'CURLDEBUG'"
+ make_module TSTRERROR strerror.c "'_FORM_DEBUG' 'CURLDEBUG'"
# The following modules should not be needed (see comment in
- # curl_formdata.c. However, there are some unsatisfied
+ # formdata.c. However, there are some unsatisfied
# external references leading in the following
# modules to be (recursively) needed.
MODULES="${MODULES} EASY STRDUP SSLGEN QSSL HOSTIP HOSTIP4 HOSTIP6"
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
/* OS/400 additional support. */
#include "curlbuild.h"
-#include "config-os400.h" /* Not curl_setup.h: we only need some defines. */
+#include "config-os400.h" /* Not setup.h: we only need some defines. */
#include <sys/types.h>
#include <sys/socket.h>
SOURCEPATH ../../../lib
SOURCE \
- curl_nonblock.c \
- curl_rawstr.c
+ rawstr.c nonblock.c
USERINCLUDE ../../../src ../../../lib ../../../include/curl
SOURCEPATH ../../../lib
SOURCE \
- curl_addrinfo.c \
- curl_amigaos.c \
- curl_asyn_ares.c \
- curl_asyn_thread.c \
- curl_axtls.c \
- curl_base64.c \
- curl_bundles.c \
- curl_conncache.c \
- curl_connect.c \
- curl_content_encoding.c \
- curl_cookie.c \
- curl_cyassl.c \
- curl_darwinssl.c \
- curl_dict.c \
- curl_easy.c \
- curl_escape.c \
- curl_file.c \
- curl_fileinfo.c \
- curl_fnmatch.c \
- curl_formdata.c \
- curl_ftp.c \
- curl_ftplistparser.c \
- curl_getenv.c \
- curl_gethostname.c \
- curl_getinfo.c \
- curl_gopher.c \
- curl_gssapi.c \
- curl_gtls.c \
- curl_hash.c \
- curl_hmac.c \
- curl_hostasyn.c \
- curl_hostip.c \
- curl_hostip4.c \
- curl_hostip6.c \
- curl_hostsyn.c \
- curl_http.c \
- curl_http_chunks.c \
- curl_http_digest.c \
- curl_http_negotiate.c \
- curl_http_negotiate_sspi.c \
- curl_http_proxy.c \
- curl_idn_win32.c \
- curl_if2ip.c \
- curl_imap.c \
- curl_inet_ntop.c \
- curl_inet_pton.c \
- curl_krb4.c \
- curl_krb5.c \
- curl_ldap.c \
- curl_llist.c \
- curl_md4.c \
- curl_md5.c \
- curl_memdebug.c \
- curl_memrchr.c \
- curl_mprintf.c \
- curl_multi.c \
- curl_multibyte.c \
- curl_netrc.c \
- curl_non_ascii.c \
- curl_nonblock.c \
- curl_nss.c \
- curl_ntlm.c \
- curl_ntlm_core.c \
- curl_ntlm_msgs.c \
- curl_ntlm_wb.c \
- curl_openldap.c \
- curl_parsedate.c \
- curl_pingpong.c \
- curl_polarssl.c \
- curl_pop3.c \
- curl_progress.c \
- curl_qssl.c \
- curl_rand.c \
- curl_rawstr.c \
- curl_rtmp.c \
- curl_rtsp.c \
- curl_sasl.c \
- curl_schannel.c \
- curl_security.c \
- curl_select.c \
- curl_sendf.c \
- curl_share.c \
- curl_slist.c \
- curl_smtp.c \
- curl_socks.c \
- curl_socks_gssapi.c \
- curl_socks_sspi.c \
- curl_speedcheck.c \
- curl_splay.c \
- curl_ssh.c \
- curl_sslgen.c \
- curl_ssluse.c \
- curl_sspi.c \
- curl_strdup.c \
- curl_strequal.c \
- curl_strerror.c \
- curl_strtok.c \
- curl_strtoofft.c \
- curl_telnet.c \
- curl_tftp.c \
- curl_threads.c \
- curl_timeval.c \
- curl_transfer.c \
- curl_url.c \
- curl_version.c \
- curl_warnless.c \
- curl_wildcard.c
+ file.c timeval.c base64.c hostip.c progress.c formdata.c \
+ cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \
+ ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c \
+ netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c \
+ curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c krb5.c \
+ memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c \
+ content_encoding.c share.c http_digest.c md4.c md5.c curl_rand.c \
+ http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c \
+ hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c \
+ select.c gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c \
+ qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c \
+ curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c \
+ pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c \
+ curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c \
+ idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c \
+ asyn-ares.c asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \
+ curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_schannel.c \
+ curl_multibyte.c curl_darwinssl.c bundles.c conncache.c
USERINCLUDE ../../../lib ../../../include/curl
#ifdef ENABLE_SSL
source_group("cURL header files" FILES ${CURL_HFILES})
include_directories(
- ${CURL_SOURCE_DIR}/lib # To be able to reach "curl_setup_once.h"
- ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h"
+ ${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h"
+ ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h"
${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
)
!endif
# For now we still define the CURLX_ONES sources here unless we know how
# to split off the prefixed path.
-CURLX_SOURCES = curl_rawstr.c curl_nonblock.c
+CURLX_SOURCES = rawstr.c nonblock.c
OBJS = $(CURL_CFILES:.c=.obj)
!ifdef %curl_static
# libcurl has sources that provide functions named curlx_* that aren't part of
# the official API, but we re-use the code here to avoid duplication.
-CURLX_ONES = \
- $(top_srcdir)/lib/curl_nonblock.c \
- $(top_srcdir)/lib/curl_rawstr.c \
- $(top_srcdir)/lib/curl_strdup.c \
- $(top_srcdir)/lib/curl_strtoofft.c
+CURLX_ONES = $(top_srcdir)/lib/strtoofft.c \
+ $(top_srcdir)/lib/strdup.c \
+ $(top_srcdir)/lib/rawstr.c \
+ $(top_srcdir)/lib/nonblock.c
CURL_CFILES = \
tool_binmode.c \
# | (__| |_| | _ <| |___\r
# \___|\___/|_| \_\_____|\r
#\r
-# Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.\r
+# Copyright (C) 1999 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.\r
#\r
# This software is licensed as described in the file COPYING, which\r
# you should have received as part of this distribution. The terms\r
!ENDIF\r
\r
RELEASE_OBJS= \\r
- curl_nonblockr.obj \\r
- curl_rawstrr.obj \\r
- curl_strtoofftr.obj \\r
+ nonblockr.obj \\r
+ rawstrr.obj \\r
+ strtoofftr.obj \\r
tool_binmoder.obj \\r
tool_bnamer.obj \\r
tool_cb_dbgr.obj \\r
curlr.res\r
\r
DEBUG_OBJS= \\r
- curl_nonblockd.obj \\r
- curl_rawstrd.obj \\r
- curl_strtoofftd.obj \\r
+ nonblockd.obj \\r
+ rawstrd.obj \\r
+ strtoofftd.obj \\r
tool_binmoded.obj \\r
tool_bnamed.obj \\r
tool_cb_dbgd.obj \\r
$(MANIFESTTOOL)\r
\r
## Release\r
-curl_nonblockr.obj: ../lib/curl_nonblock.c\r
- $(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_nonblock.c\r
-curl_rawstrr.obj: ../lib/curl_rawstr.c\r
- $(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_rawstr.c\r
-curl_strtoofftr.obj: ../lib/curl_strtoofft.c\r
- $(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c\r
+nonblockr.obj: ../lib/nonblock.c\r
+ $(CCR) $(CFLAGS) /Fo"$@" ../lib/nonblock.c\r
+rawstrr.obj: ../lib/rawstr.c\r
+ $(CCR) $(CFLAGS) /Fo"$@" ../lib/rawstr.c\r
+strtoofftr.obj: ../lib/strtoofft.c\r
+ $(CCR) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c\r
tool_binmoder.obj: tool_binmode.c\r
$(CCR) $(CFLAGS) /Fo"$@" tool_binmode.c\r
tool_bnamer.obj: tool_bname.c\r
$(RCR) $(RESFLAGS) /Fo"$@" curl.rc\r
\r
## Debug\r
-curl_nonblockd.obj: ../lib/curl_nonblock.c\r
- $(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_nonblock.c\r
-curl_rawstrd.obj: ../lib/curl_rawstr.c\r
- $(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_rawstr.c\r
-curl_strtoofftd.obj: ../lib/curl_strtoofft.c\r
- $(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c\r
+nonblockd.obj: ../lib/nonblock.c\r
+ $(CCD) $(CFLAGS) /Fo"$@" ../lib/nonblock.c\r
+rawstrd.obj: ../lib/rawstr.c\r
+ $(CCD) $(CFLAGS) /Fo"$@" ../lib/rawstr.c\r
+strtoofftd.obj: ../lib/strtoofft.c\r
+ $(CCD) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c\r
tool_binmoded.obj: tool_binmode.c\r
$(CCD) $(CFLAGS) /Fo"$@" tool_binmode.c\r
tool_bnamed.obj: tool_bname.c\r
if($c) {
print <<HEAD
#include <zlib.h>
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
static const unsigned char hugehelpgz[] = {
/* This mumbo-jumbo is the huge help text compressed with gzip.
Thanks to this operation, the size of this data shrunk from $gzip
#include "tool_binmode.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
void set_binmode(FILE *stream)
{
#include "tool_bname.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
#ifndef HAVE_BASENAME
#include "tool_cb_dbg.h"
#include "tool_util.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
static void dump(const char *timebuf, const char *text,
FILE *stream, const unsigned char *ptr, size_t size,
***************************************************************************/
#include "tool_setup.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
#include "tool_msgs.h"
#include "tool_cb_hdr.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
static char *parse_filename(const char *ptr, size_t len);
#include "tool_cfgable.h"
#include "tool_cb_prg.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
/*
** callback for CURLOPT_PROGRESSFUNCTION
#include "tool_cfgable.h"
#include "tool_cb_rea.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
/*
** callback for CURLOPT_READFUNCTION
#include "tool_cfgable.h"
#include "tool_cb_see.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
/* OUR_MAX_SEEK_L has 'long' data type, OUR_MAX_SEEK_O has 'curl_off_t,
both represent the same value. Maximum offset used here when we lseek
#include "tool_msgs.h"
#include "tool_cb_wrt.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
/*
** callback for CURLOPT_WRITEFUNCTION
#include "tool_cfgable.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
void free_config_fields(struct Configurable *config)
{
#include "tool_convert.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
#ifdef HAVE_ICONV
#include "tool_dirhie.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
#ifdef NETWARE
# ifndef __NOVELL_LIBC__
#include "tool_bname.h"
#include "tool_doswin.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
/*
* Macros ALWAYS_TRUE and ALWAYS_FALSE are used to avoid compiler warnings.
#include "tool_easysrc.h"
#include "tool_msgs.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
/* global variable definitions, for easy-interface source code generation */
***************************************************************************/
#include "tool_setup.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
#include "tool_msgs.h"
#include "tool_formparse.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
/***************************************************************************
*
***************************************************************************/
#include "tool_setup.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
#include "tool_parsecfg.h"
#include "tool_version.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
#ifdef MSDOS
# define USE_WATT32
#include "tool_getpass.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
#ifdef __VMS
/* VMS implementation */
#include "tool_panykey.h"
#include "tool_help.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
#ifdef MSDOS
# define USE_WATT32
***************************************************************************/
#include "tool_setup.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
#include "tool_getparam.h"
#include "tool_helpers.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
/*
** Helper functions that are used from more tha one source file.
#include "tool_homedir.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
static char *GetEnv(const char *variable, char do_expand)
{
***************************************************************************/
#include "tool_setup.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
#include "tool_libinfo.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
/* global variable definitions, for libcurl run-time info */
* the library level code from this client-side is ugly, but we do this
* anyway for convenience.
*/
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
#ifdef __VMS
static int vms_show = 0;
# error "Can't compile METALINK support without a crypto library."
#endif
-#include "curl_rawstr.h"
+#include "rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
#include "tool_metalink.h"
#include "tool_msgs.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
/* Copied from tool_getparam.c */
#define GetStr(str,val) do { \
#include "tool_mfiles.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
static void AppendNode(struct multi_files **first,
struct multi_files **last,
#include "tool_cfgable.h"
#include "tool_msgs.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
#define WARN_PREFIX "Warning: "
#define WARN_TEXTWIDTH (79 - (int)strlen(WARN_PREFIX))
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
# include <netinet/tcp.h>
#endif
-#include "curl_rawstr.h"
+#include "rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
#include "tool_writeout.h"
#include "tool_xattr.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
#define CURLseparator "--_curl_--"
input.fd = infd;
input.config = config;
/* Note that if CURLOPT_READFUNCTION is fread (the default), then
- * lib/curl_telnet.c will Curl_poll() on the input file descriptor
+ * lib/telnet.c will Curl_poll() on the input file descriptor
* rather then calling the READFUNCTION at regular intervals.
* The circumstances in which it is preferable to enable this
* behaviour, by omitting to set the READFUNCTION & READDATA options,
***************************************************************************/
#include "tool_setup.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
# include "tool_metalink.h"
#endif
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
/*
* my_useragent: returns allocated string with default user agent
#include "tool_panykey.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
void tool_pressanykey(void)
{
***************************************************************************/
#include "tool_setup.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
#include "tool_msgs.h"
#include "tool_paramhlp.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
struct getout *new_getout(struct Configurable *config)
{
#include "tool_msgs.h"
#include "tool_parsecfg.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
#define CURLRC DOT_CHAR "curlrc"
#define ISSEP(x) (((x) == '=') || ((x) == ':'))
#include "tool_easysrc.h"
#include "tool_setopt.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
/* Lookup tables for converting setopt values back to symbols */
/* For enums, values may be in any order. */
#define CURL_NO_OLDIES
/*
- * curl_setup.h may define preprocessor macros such as _FILE_OFFSET_BITS and
+ * setup.h may define preprocessor macros such as _FILE_OFFSET_BITS and
* _LARGE_FILES in order to support files larger than 2 GB. On platforms
* where this happens it is mandatory that these macros are defined before
* any system header file is included, otherwise file handling function
* prototypes will be misdeclared and curl tool may not build properly;
- * therefore we must include curl_setup.h before curl.h when building curl.
+ * therefore we must include setup.h before curl.h when building curl.
*/
-#include "curl_setup.h" /* from the lib directory */
+#include "setup.h" /* from the lib directory */
/*
* curl tool certainly uses libcurl's external interface.
#endif
#ifndef HAVE_STRDUP
-# include "curl_strdup.h"
+# include "strdup.h"
# define strdup(ptr) curlx_strdup(ptr)
#endif
#include "tool_sleep.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
void tool_go_sleep(long ms)
{
#include "tool_urlglob.h"
#include "tool_vms.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
typedef enum {
GLOB_OK,
#include "tool_util.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
#if defined(WIN32) && !defined(MSDOS)
#include "curlmsg_vms.h"
#include "tool_vms.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
void decc$__posix_exit(int __status);
void decc$exit(int __status);
#include "tool_writeenv.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
static const struct
{
#include "tool_cfgable.h"
#include "tool_writeout.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
typedef enum {
VAR_NONE, /* must be the first */
#include "tool_xattr.h"
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
#ifdef HAVE_FSETXATTR
# PROP Default_Filter ""\r
# Begin Source File\r
\r
-SOURCE=..\lib\curl_nonblock.c\r
+SOURCE=..\lib\nonblock.c\r
# End Source File\r
# Begin Source File\r
\r
-SOURCE=..\lib\curl_rawstr.c\r
+SOURCE=..\lib\rawstr.c\r
# End Source File\r
# Begin Source File\r
\r
-SOURCE=..\lib\curl_strtoofft.c\r
+SOURCE=..\lib\strtoofft.c\r
# End Source File\r
# Begin Source File\r
\r
# End Source File\r
# Begin Source File\r
\r
-SOURCE=..\lib\curl_nonblock.h\r
+SOURCE=..\lib\nonblock.h\r
# End Source File\r
# Begin Source File\r
\r
-SOURCE=..\lib\curl_rawstr.h\r
+SOURCE=..\lib\rawstr.h\r
# End Source File\r
# Begin Source File\r
\r
-SOURCE=..\lib\curl_strtoofft.h\r
+SOURCE=..\lib\strtoofft.h\r
# End Source File\r
# Begin Source File\r
\r
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
# Boilerplate code for test tool
my $head =
'#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
string(TOUPPER ${TEST_NAME} UPPER_TEST_NAME)
include_directories(
- ${CURL_SOURCE_DIR}/lib # To be able to reach "curl_setup_once.h"
+ ${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h"
${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h"
${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
)
TSTTRACE = testtrace.c testtrace.h
# files used only in some libcurl test programs
-WARNLESS = $(top_srcdir)/lib/curl_warnless.c $(top_srcdir)/lib/curl_warnless.h
+WARNLESS = $(top_srcdir)/lib/warnless.c $(top_srcdir)/lib/warnless.h
# these files are used in every single test program below
SUPPORTFILES = first.c test.h
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include "curl_gethostname.h"
#ifdef CURLDEBUG
# define MEMDEBUG_NODEFINES
-# include "curl_memdebug.h"
+# include "memdebug.h"
#endif
int select_wrapper(int nfds, fd_set *rd, fd_set *wr, fd_set *exc,
#include "test.h"
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
#include <fcntl.h>
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 30 * 1000
#endif
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
#include "test.h"
#include "testtrace.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifdef LIB585
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
#include "test.h"
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
#include "test.h"
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
#include "test.h"
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
#include <fcntl.h>
#endif
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* This example shows an FTP upload, with a rename of the file just after
#include <curl/mprintf.h>
-#include "curl_memdebug.h"
+#include "memdebug.h"
static const char *HOSTHEADER = "Host: www.host.foo.com";
static const char *JAR = "log/jar506";
#include "test.h"
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
static char data[]="this is what we post to the silly web server\n";
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
static const char *post[]={
"one",
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* Test case code based on source in a bug report filed by James Bursa on
28 Apr 2004 */
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp)
{
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
static const char * const dates[]={
"Sun, 06 Nov 1994 08:49:37 GMT",
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
#include <limits.h>
#endif
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#ifndef FD_SETSIZE
#error "this test requires FD_SETSIZE"
* when using select() instead of poll() we cannot test
* libcurl functionality with a socket number equal or
* greater than FD_SETSIZE. In any case, macro VERIFY_SOCK
- * in lib/curl_select.c enforces this check and protects libcurl
+ * in lib/select.c enforces this check and protects libcurl
* from a possible crash. The effect of this protection
* is that test 518 will always fail, since the actual
* call to select() never takes place. We skip test 518
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
#include <fcntl.h>
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
#include <fcntl.h>
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
#include "test.h"
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
#include <fcntl.h>
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
#include <fcntl.h>
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
#include <limits.h>
#endif
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#if !defined(HAVE_POLL_FINE) && \
!defined(USE_WINSOCK) && \
* when using select() instead of poll() we cannot test
* libcurl functionality with a socket number equal or
* greater than FD_SETSIZE. In any case, macro VERIFY_SOCK
- * in lib/curl_select.c enforces this check and protects libcurl
+ * in lib/select.c enforces this check and protects libcurl
* from a possible crash. The effect of this protection
* is that test 537 will always fail, since the actual
* call to select() never takes place. We skip test 537
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
#endif
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
#include <fcntl.h>
#endif
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* Two FTP uploads, the second with no content sent.
#include <fcntl.h>
#endif
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* FTP get with NOBODY but no HEADER
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
static char teststring[] =
#ifdef CURL_DOES_CONVERSIONS
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
#ifdef CURL_DOES_CONVERSIONS
/* ASCII representation with escape sequences for non-ASCII platforms */
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
#include "test.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
struct data {
char trace_ascii; /* 1 or 0 */
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
#define POSTLEN 40960
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
static char data[]=
#ifdef CURL_DOES_CONVERSIONS
#include "test.h"
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* For Windows, mainly (may be moved in a config file?) */
#ifndef STDIN_FILENO
#include <curl/mprintf.h>
-#include "curl_memdebug.h"
+#include "memdebug.h"
#if (CURL_SIZEOF_CURL_OFF_T > CURL_SIZEOF_LONG)
#include "test.h"
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
#include <fcntl.h>
#endif
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* From "KNOWN_BUGS" April 2009:
#include <fcntl.h>
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
/*
* Test a simple OPTIONS request with a custom header
#include <curl/mprintf.h>
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* build request url */
static char *suburl(const char *base, int i)
#include <curl/mprintf.h>
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* build request url */
static char *suburl(const char *base, int i)
#include <curl/mprintf.h>
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* build request url */
static char *suburl(const char *base, int i)
#include <curl/mprintf.h>
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define RTP_PKT_CHANNEL(p) ((int)((unsigned char)((p)[1])))
#include <curl/mprintf.h>
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* build request url */
static char *suburl(const char *base, int i)
#include "testtrace.h"
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
static int new_fnmatch(const char *pattern, const char *string)
{
#include <fcntl.h>
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
#include "test.h"
#include "testutil.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
typedef struct {
int remains;
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
/* The size of data should be kept below MAX_INITIAL_POST_SIZE! */
static char data[]="this is a short string.\n";
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
static const char * const post[]={
"one",
#include <fcntl.h>
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
#include <sys/stat.h>
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
#include <curl/mprintf.h>
-#include "curl_memdebug.h"
+#include "memdebug.h"
#define THREADS 2
- Start the request
*/
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
#include <fcntl.h>
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 60 * 1000
#endif
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 5 * 1000
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
int test(char *URL)
{
***************************************************************************/
#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
static int progress_callback(void *clientp, double dltotal,
double dlnow, double ultotal, double ulnow)
*/
#include "test.h"
-#include "curl_strequal.h"
-#include "curl_memdebug.h"
+#include "strequal.h"
+#include "memdebug.h"
static CURLcode send_request(CURL *curl, const char *url, int seq,
long auth_scheme, const char *userpwd)
#include <assert.h>
#include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
#define TEST_HANG_TIMEOUT 5 * 1000
#define MAX_EASY_HANDLES 3
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include "sethostname.h"
*
***************************************************************************/
-/* Now include the curl_setup.h file from libcurl's private libdir (the
- source version, but that might include "curl_config.h" from the build
- dir so we need both of them in the include path), so that we get good
- in-depth knowledge about the system we're building this on */
+/* Now include the setup.h file from libcurl's private libdir (the source
+ version, but that might include "curl_config.h" from the build dir so we
+ need both of them in the include path), so that we get good in-depth
+ knowledge about the system we're building this on */
#define CURL_NO_OLDIES
-#include "curl_setup.h"
+#include "setup.h"
#include <curl/curl.h>
#endif
#ifdef TPF
-# include "curl_select.h"
+# include "select.h"
#endif
#define test_setopt(A,B,C) \
#include "testutil.h"
#include "testtrace.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
struct libtest_trace_cfg libtest_debug_config;
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
#include "testutil.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
#if defined(WIN32) && !defined(MSDOS)
* KIND, either express or implied.
*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
struct timeval tutil_tvnow(void);
if($_ =~ /(free|alloc|strdup)\(/) {
$memfunc++;
}
- elsif($_ =~ /^ *# *include \"curl_memdebug.h\"/) {
+ elsif($_ =~ /^ *# *include \"memdebug.h\"/) {
$memdebug++;
}
elsif($_ =~ /^ *# *include \"curl_memory.h\"/) {
}
else {
if(!$memdebug) {
- print STDERR "$file doesn't include \"curl_memdebug.h\"!\n";
+ print STDERR "$file doesn't include \"memdebug.h\"!\n";
}
if(!$curlmem) {
print STDERR "$file doesn't include \"curl_memory.h\"!\n";
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
#
# Example input:
#
-# MEM curl_mprintf.c:1094 malloc(32) = e5718
-# MEM curl_mprintf.c:1103 realloc(e5718, 64) = e6118
-# MEM curl_sendf.c:232 free(f6520)
+# MEM mprintf.c:1094 malloc(32) = e5718
+# MEM mprintf.c:1103 realloc(e5718, 64) = e6118
+# MEM sendf.c:232 free(f6520)
my $mallocs=0;
my $callocs=0;
print "Not recognized input line: $function\n";
}
}
- # FD curl_url.c:1282 socket() = 5
+ # FD url.c:1282 socket() = 5
elsif($_ =~ /^FD ([^ ]*):(\d*) (.*)/) {
# generic match for the filename+linenumber
$source = $1;
}
}
}
- # FILE curl_url.c:1282 fopen("blabla") = 0x5ddd
+ # FILE url.c:1282 fopen("blabla") = 0x5ddd
elsif($_ =~ /^FILE ([^ ]*):(\d*) (.*)/) {
# generic match for the filename+linenumber
$source = $1;
}
}
}
- # GETNAME curl_url.c:1901 getnameinfo()
+ # GETNAME url.c:1901 getnameinfo()
elsif($_ =~ /^GETNAME ([^ ]*):(\d*) (.*)/) {
# not much to do
}
- # ADDR curl_url.c:1282 getaddrinfo() = 0x5ddd
+ # ADDR url.c:1282 getaddrinfo() = 0x5ddd
elsif($_ =~ /^ADDR ([^ ]*):(\d*) (.*)/) {
# generic match for the filename+linenumber
$source = $1;
string(TOUPPER ${TEST_NAME} UPPER_TEST_NAME)
include_directories(
- ${CURL_SOURCE_DIR}/lib # To be able to reach "curl_setup_once.h"
- ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h"
+ ${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h"
+ ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h"
${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
)
if(CURL_USE_ARES)
# SET(useful
# getpart.c getpart.h
-# ${CURL_SOURCE_DIR}/lib/curl_strequal.c
-# ${CURL_SOURCE_DIR}/lib/curl_base64.c
-# ${CURL_SOURCE_DIR}/lib/curl_mprintf.c
-# ${CURL_SOURCE_DIR}/lib/curl_memdebug.c
-# ${CURL_SOURCE_DIR}/lib/curl_timeval.c
+# ${CURL_SOURCE_DIR}/lib/strequal.c
+# ${CURL_SOURCE_DIR}/lib/base64.c
+# ${CURL_SOURCE_DIR}/lib/mprintf.c
+# ${CURL_SOURCE_DIR}/lib/memdebug.c
+# ${CURL_SOURCE_DIR}/lib/timeval.c
# )
# SETUP_EXECUTABLE(sws sws.c util.c util.h ${useful})
# SETUP_EXECUTABLE(resolve resolve.c util.c util.h ${useful})
-# SETUP_EXECUTABLE(sockfilt sockfilt.c util.c util.h ${useful} ${CURL_SOURCE_DIR}/lib/curl_inet_pton.c)
+# SETUP_EXECUTABLE(sockfilt sockfilt.c util.c util.h ${useful} ${CURL_SOURCE_DIR}/lib/inet_pton.c)
# SETUP_EXECUTABLE(getpart testpart.c ${useful})
-# SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} server_tftp.h)
+# SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} tftp.h)
noinst_PROGRAMS = getpart resolve rtspd sockfilt sws tftpd fake_ntlm
CURLX_SRCS = \
- $(top_srcdir)/lib/curl_mprintf.c \
- $(top_srcdir)/lib/curl_nonblock.c \
- $(top_srcdir)/lib/curl_strequal.c \
- $(top_srcdir)/lib/curl_strtoofft.c \
- $(top_srcdir)/lib/curl_timeval.c \
- $(top_srcdir)/lib/curl_warnless.c
+ $(top_srcdir)/lib/mprintf.c \
+ $(top_srcdir)/lib/nonblock.c \
+ $(top_srcdir)/lib/strequal.c \
+ $(top_srcdir)/lib/strtoofft.c \
+ $(top_srcdir)/lib/timeval.c \
+ $(top_srcdir)/lib/warnless.c
CURLX_HDRS = \
$(top_srcdir)/lib/curlx.h \
- $(top_srcdir)/lib/curl_nonblock.h \
- $(top_srcdir)/lib/curl_strequal.h \
- $(top_srcdir)/lib/curl_strtoofft.h \
- $(top_srcdir)/lib/curl_timeval.h \
- $(top_srcdir)/lib/curl_warnless.h
+ $(top_srcdir)/lib/nonblock.h \
+ $(top_srcdir)/lib/strequal.h \
+ $(top_srcdir)/lib/strtoofft.h \
+ $(top_srcdir)/lib/timeval.h \
+ $(top_srcdir)/lib/warnless.h
USEFUL = \
getpart.c \
getpart.h \
server_setup.h \
- $(top_srcdir)/lib/curl_base64.c \
+ $(top_srcdir)/lib/base64.c \
$(top_srcdir)/lib/curl_base64.h \
- $(top_srcdir)/lib/curl_memdebug.c \
- $(top_srcdir)/lib/curl_memdebug.h
+ $(top_srcdir)/lib/memdebug.c \
+ $(top_srcdir)/lib/memdebug.h
UTIL = \
util.c \
sockfilt_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
server_sockaddr.h \
sockfilt.c \
- $(top_srcdir)/lib/curl_inet_pton.c
+ $(top_srcdir)/lib/inet_pton.c
sockfilt_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
sockfilt_CFLAGS = $(AM_CFLAGS)
sws_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
server_sockaddr.h \
sws.c \
- $(top_srcdir)/lib/curl_inet_pton.c
+ $(top_srcdir)/lib/inet_pton.c
sws_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
sws_CFLAGS = $(AM_CFLAGS)
tftpd_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
server_sockaddr.h \
tftpd.c \
- server_tftp.h
+ tftp.h
tftpd_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
tftpd_CFLAGS = $(AM_CFLAGS)
#include "getpart.h"
#include "util.h"
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
#ifndef DEFAULT_LOGFILE
#define DEFAULT_LOGFILE "log/fake_ntlm.log"
#include "curl_base64.h"
#include "curl_memory.h"
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
#define EAT_SPACE(p) while(*(p) && ISSPACE(*(p))) (p)++
#include "curlx.h" /* from the private lib dir */
#include "util.h"
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
static bool use_ipv6 = FALSE;
static const char *ipv_inuse = "IPv4";
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_CANONNAME;
/* Use parenthesis around function to stop it from being replaced by
- the macro in curl_memdebug.h */
+ the macro in memdebug.h */
rc = (getaddrinfo)(host, "80", &hints, &ai);
}
#include "util.h"
#include "server_sockaddr.h"
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
#ifdef ENABLE_IPV6
static bool use_ipv6 = FALSE;
#define CURL_NO_OLDIES
-#include "curl_setup.h" /* portability help from the lib directory */
+#include "setup.h" /* portability help from the lib directory */
#endif /* HEADER_CURL_SERVER_SETUP_H */
-
versions instead */
#include "curlx.h" /* from the private lib dir */
#include "getpart.h"
-#include "curl_inet_pton.h"
+#include "inet_pton.h"
#include "util.h"
#include "server_sockaddr.h"
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
#define DEFAULT_PORT 8999
versions instead */
#include "curlx.h" /* from the private lib dir */
#include "getpart.h"
-#include "curl_inet_pton.h"
+#include "inet_pton.h"
#include "util.h"
#include "server_sockaddr.h"
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
#ifdef ENABLE_IPV6
static bool use_ipv6 = FALSE;
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
int main(int argc, char **argv)
{
#ifdef HAVE_ARPA_TFTP_H
#include <arpa/tftp.h>
#else
-#include "server_tftp.h"
+#include "tftp.h"
#endif
#ifdef HAVE_NETDB_H
#include <netdb.h>
#include "util.h"
#include "server_sockaddr.h"
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
/*****************************************************************************
* STRUCT DECLARATIONS AND DEFINES *
#include "curlx.h" /* from the private lib dir */
#include "getpart.h"
#include "util.h"
-#include "curl_timeval.h"
+#include "timeval.h"
#if defined(ENABLE_IPV6) && defined(__MINGW32__)
const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }};
***************************************************************************/
#include "curlcheck.h"
-#include "curl_llist.h"
+#include "llist.h"
static struct curl_llist *llist;
***************************************************************************/
#include "curlcheck.h"
-#include "curl_strequal.h"
+#include "strequal.h"
static CURLcode unit_setup( void ) {return CURLE_OK;}
static void unit_stop( void ) {}
***************************************************************************/
#include "curlcheck.h"
-#include "curl_urldata.h"
-#include "curl_url.h"
+#include "urldata.h"
+#include "url.h" /* for Curl_safefree */
#include "curl_base64.h"
-#include "curl_memdebug.h" /* LAST include file */
+#include "memdebug.h" /* LAST include file */
static struct SessionHandle *data;
***************************************************************************/
#include "curlcheck.h"
-#include "curl_urldata.h"
-#include "curl_connect.h"
-#include "curl_memdebug.h" /* LAST include file */
+#include "urldata.h"
+#include "connect.h"
+#include "memdebug.h" /* LAST include file */
static struct SessionHandle *data;
***************************************************************************/
#include "curlcheck.h"
-#include "curl_netrc.h"
+#include "netrc.h"
static char login[LOGINSIZE];
static char password[PASSWORDSIZE];
#define ENABLE_CURLX_PRINTF
#include "curlx.h"
-#include "curl_hash.h"
-#include "curl_hostip.h"
+#include "hash.h"
+#include "hostip.h"
#include "curl_memory.h"
-#include "curl_memdebug.h" /* LAST include file */
+#include "memdebug.h" /* LAST include file */
static struct SessionHandle *data;
static struct curl_hash *hp;
***************************************************************************/
#include "curlcheck.h"
-#include "curl_splay.h"
+#include "splay.h"
static CURLcode unit_setup(void)
!ENDIF\r
\r
CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \\r
- $(CURL_DIROBJ)\curl_nonblock.obj \\r
- $(CURL_DIROBJ)\curl_rawstr.obj \\r
- $(CURL_DIROBJ)\curl_strtoofft.obj\r
+ $(CURL_DIROBJ)\nonblock.obj \\r
+ $(CURL_DIROBJ)\rawstr.obj \\r
+ $(CURL_DIROBJ)\strtoofft.obj\r
\r
$(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)\r
$(CURL_LINK) $(CURL_LFLAGS) $(CURL_LIBCURL_LIBNAME) $(WIN_LIBS) $(CURL_FROM_LIBCURL) $(EXE_OBJS)\r
\r
$(CURL_DIROBJ)\tool_hugehelp.obj: $(CURL_SRC_DIR)\tool_hugehelp.c\r
$(CURL_CC) $(CURL_CFLAGS) /Zm200 /Fo"$@" $(CURL_SRC_DIR)\tool_hugehelp.c\r
-$(CURL_DIROBJ)\curl_nonblock.obj: ../lib/curl_nonblock.c\r
- $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_nonblock.c\r
-$(CURL_DIROBJ)\curl_rawstr.obj: ../lib/curl_rawstr.c\r
- $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_rawstr.c\r
-$(CURL_DIROBJ)\curl_strtoofft.obj: ../lib/curl_strtoofft.c\r
- $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c\r
+$(CURL_DIROBJ)\nonblock.obj: ../lib/nonblock.c\r
+ $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/nonblock.c\r
+$(CURL_DIROBJ)\rawstr.obj: ../lib/rawstr.c\r
+ $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/rawstr.c\r
+$(CURL_DIROBJ)\strtoofft.obj: ../lib/strtoofft.c\r
+ $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/strtoofft.c\r
$(CURL_DIROBJ)\curl.res: $(CURL_SRC_DIR)\curl.rc\r
rc $(CURL_RC_FLAGS)\r
\r
projects / platform / upstream / curl.git / commitdiff