f0b8137c1c
Daniel Stenberg
2025-07-10
Subject
curl: remove the global argument from many functions
Binary
Architecture & Compiler Flags
—
Build Log
$ git checkout -f f0b8137c1cbe3ac47e506bffe9827a43e172c599
Previous HEAD position was 88ff396549 checksrc-all: rewrite in Perl, remove `checksrc.bat`
HEAD is now at f0b8137c1c curl: remove the global argument from many functions
$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing buildinfo.txt
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curlx/.deps/
Removing lib/curlx/.dirstamp
Removing lib/curlx/libcurl_la-base64.lo
Removing lib/curlx/libcurl_la-base64.o
Removing lib/curlx/libcurl_la-dynbuf.lo
Removing lib/curlx/libcurl_la-dynbuf.o
Removing lib/curlx/libcurl_la-inet_ntop.lo
Removing lib/curlx/libcurl_la-inet_ntop.o
Removing lib/curlx/libcurl_la-inet_pton.lo
Removing lib/curlx/libcurl_la-inet_pton.o
Removing lib/curlx/libcurl_la-multibyte.lo
Removing lib/curlx/libcurl_la-multibyte.o
Removing lib/curlx/libcurl_la-nonblock.lo
Removing lib/curlx/libcurl_la-nonblock.o
Removing lib/curlx/libcurl_la-strparse.lo
Removing lib/curlx/libcurl_la-strparse.o
Removing lib/curlx/libcurl_la-timediff.lo
Removing lib/curlx/libcurl_la-timediff.o
Removing lib/curlx/libcurl_la-timeval.lo
Removing lib/curlx/libcurl_la-timeval.o
Removing lib/curlx/libcurl_la-version_win32.lo
Removing lib/curlx/libcurl_la-version_win32.o
Removing lib/curlx/libcurl_la-wait.lo
Removing lib/curlx/libcurl_la-wait.o
Removing lib/curlx/libcurl_la-warnless.lo
Removing lib/curlx/libcurl_la-warnless.o
Removing lib/curlx/libcurl_la-winapi.lo
Removing lib/curlx/libcurl_la-winapi.o
Removing lib/curlx/libcurlu_la-base64.lo
Removing lib/curlx/libcurlu_la-base64.o
Removing lib/curlx/libcurlu_la-dynbuf.lo
Removing lib/curlx/libcurlu_la-dynbuf.o
Removing lib/curlx/libcurlu_la-inet_ntop.lo
Removing lib/curlx/libcurlu_la-inet_ntop.o
Removing lib/curlx/libcurlu_la-inet_pton.lo
Removing lib/curlx/libcurlu_la-inet_pton.o
Removing lib/curlx/libcurlu_la-multibyte.lo
Removing lib/curlx/libcurlu_la-multibyte.o
Removing lib/curlx/libcurlu_la-nonblock.lo
Removing lib/curlx/libcurlu_la-nonblock.o
Removing lib/curlx/libcurlu_la-strparse.lo
Removing lib/curlx/libcurlu_la-strparse.o
Removing lib/curlx/libcurlu_la-timediff.lo
Removing lib/curlx/libcurlu_la-timediff.o
Removing lib/curlx/libcurlu_la-timeval.lo
Removing lib/curlx/libcurlu_la-timeval.o
Removing lib/curlx/libcurlu_la-version_win32.lo
Removing lib/curlx/libcurlu_la-version_win32.o
Removing lib/curlx/libcurlu_la-wait.lo
Removing lib/curlx/libcurlu_la-wait.o
Removing lib/curlx/libcurlu_la-warnless.lo
Removing lib/curlx/libcurlu_la-warnless.o
Removing lib/curlx/libcurlu_la-winapi.lo
Removing lib/curlx/libcurlu_la-winapi.o
Removing lib/libcurl.la
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-base.lo
Removing lib/libcurl_la-asyn-base.o
Removing lib/libcurl_la-asyn-thrdd.lo
Removing lib/libcurl_la-asyn-thrdd.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-cshutdn.lo
Removing lib/libcurl_la-cshutdn.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sha512_256.lo
Removing lib/libcurl_la-curl_sha512_256.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-curl_trc.lo
Removing lib/libcurl_la-curl_trc.o
Removing lib/libcurl_la-cw-out.lo
Removing lib/libcurl_la-cw-out.o
Removing lib/libcurl_la-cw-pause.lo
Removing lib/libcurl_la-cw-pause.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynhds.lo
Removing lib/libcurl_la-dynhds.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-fake_addrinfo.lo
Removing lib/libcurl_la-fake_addrinfo.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-fopen.lo
Removing lib/libcurl_la-fopen.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-headers.lo
Removing lib/libcurl_la-headers.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-hostip.lo
Removing lib/libcurl_la-hostip.o
Removing lib/libcurl_la-hostip4.lo
Removing lib/libcurl_la-hostip4.o
Removing lib/libcurl_la-hostip6.lo
Removing lib/libcurl_la-hostip6.o
Removing lib/libcurl_la-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http1.lo
Removing lib/libcurl_la-http1.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-httpsrr.lo
Removing lib/libcurl_la-httpsrr.o
Removing lib/libcurl_la-idn.lo
Removing lib/libcurl_la-idn.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-macos.lo
Removing lib/libcurl_la-macos.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-multi_ev.lo
Removing lib/libcurl_la-multi_ev.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-request.lo
Removing lib/libcurl_la-request.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strequal.lo
Removing lib/libcurl_la-strequal.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-uint-bset.lo
Removing lib/libcurl_la-uint-bset.o
Removing lib/libcurl_la-uint-hash.lo
Removing lib/libcurl_la-uint-hash.o
Removing lib/libcurl_la-uint-spbset.lo
Removing lib/libcurl_la-uint-spbset.o
Removing lib/libcurl_la-uint-table.lo
Removing lib/libcurl_la-uint-table.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/libcurlu.la
Removing lib/libcurlu_la-altsvc.lo
Removing lib/libcurlu_la-altsvc.o
Removing lib/libcurlu_la-amigaos.lo
Removing lib/libcurlu_la-amigaos.o
Removing lib/libcurlu_la-asyn-ares.lo
Removing lib/libcurlu_la-asyn-ares.o
Removing lib/libcurlu_la-asyn-base.lo
Removing lib/libcurlu_la-asyn-base.o
Removing lib/libcurlu_la-asyn-thrdd.lo
Removing lib/libcurlu_la-asyn-thrdd.o
Removing lib/libcurlu_la-bufq.lo
Removing lib/libcurlu_la-bufq.o
Removing lib/libcurlu_la-bufref.lo
Removing lib/libcurlu_la-bufref.o
Removing lib/libcurlu_la-cf-h1-proxy.lo
Removing lib/libcurlu_la-cf-h1-proxy.o
Removing lib/libcurlu_la-cf-h2-proxy.lo
Removing lib/libcurlu_la-cf-h2-proxy.o
Removing lib/libcurlu_la-cf-haproxy.lo
Removing lib/libcurlu_la-cf-haproxy.o
Removing lib/libcurlu_la-cf-https-connect.lo
Removing lib/libcurlu_la-cf-https-connect.o
Removing lib/libcurlu_la-cf-socket.lo
Removing lib/libcurlu_la-cf-socket.o
Removing lib/libcurlu_la-cfilters.lo
Removing lib/libcurlu_la-cfilters.o
Removing lib/libcurlu_la-conncache.lo
Removing lib/libcurlu_la-conncache.o
Removing lib/libcurlu_la-connect.lo
Removing lib/libcurlu_la-connect.o
Removing lib/libcurlu_la-content_encoding.lo
Removing lib/libcurlu_la-content_encoding.o
Removing lib/libcurlu_la-cookie.lo
Removing lib/libcurlu_la-cookie.o
Removing lib/libcurlu_la-cshutdn.lo
Removing lib/libcurlu_la-cshutdn.o
Removing lib/libcurlu_la-curl_addrinfo.lo
Removing lib/libcurlu_la-curl_addrinfo.o
Removing lib/libcurlu_la-curl_des.lo
Removing lib/libcurlu_la-curl_des.o
Removing lib/libcurlu_la-curl_endian.lo
Removing lib/libcurlu_la-curl_endian.o
Removing lib/libcurlu_la-curl_fnmatch.lo
Removing lib/libcurlu_la-curl_fnmatch.o
Removing lib/libcurlu_la-curl_get_line.lo
Removing lib/libcurlu_la-curl_get_line.o
Removing lib/libcurlu_la-curl_gethostname.lo
Removing lib/libcurlu_la-curl_gethostname.o
Removing lib/libcurlu_la-curl_gssapi.lo
Removing lib/libcurlu_la-curl_gssapi.o
Removing lib/libcurlu_la-curl_memrchr.lo
Removing lib/libcurlu_la-curl_memrchr.o
Removing lib/libcurlu_la-curl_ntlm_core.lo
Removing lib/libcurlu_la-curl_ntlm_core.o
Removing lib/libcurlu_la-curl_range.lo
Removing lib/libcurlu_la-curl_range.o
Removing lib/libcurlu_la-curl_rtmp.lo
Removing lib/libcurlu_la-curl_rtmp.o
Removing lib/libcurlu_la-curl_sasl.lo
Removing lib/libcurlu_la-curl_sasl.o
Removing lib/libcurlu_la-curl_sha512_256.lo
Removing lib/libcurlu_la-curl_sha512_256.o
Removing lib/libcurlu_la-curl_sspi.lo
Removing lib/libcurlu_la-curl_sspi.o
Removing lib/libcurlu_la-curl_threads.lo
Removing lib/libcurlu_la-curl_threads.o
Removing lib/libcurlu_la-curl_trc.lo
Removing lib/libcurlu_la-curl_trc.o
Removing lib/libcurlu_la-cw-out.lo
Removing lib/libcurlu_la-cw-out.o
Removing lib/libcurlu_la-cw-pause.lo
Removing lib/libcurlu_la-cw-pause.o
Removing lib/libcurlu_la-dict.lo
Removing lib/libcurlu_la-dict.o
Removing lib/libcurlu_la-doh.lo
Removing lib/libcurlu_la-doh.o
Removing lib/libcurlu_la-dynhds.lo
Removing lib/libcurlu_la-dynhds.o
Removing lib/libcurlu_la-easy.lo
Removing lib/libcurlu_la-easy.o
Removing lib/libcurlu_la-easygetopt.lo
Removing lib/libcurlu_la-easygetopt.o
Removing lib/libcurlu_la-easyoptions.lo
Removing lib/libcurlu_la-easyoptions.o
Removing lib/libcurlu_la-escape.lo
Removing lib/libcurlu_la-escape.o
Removing lib/libcurlu_la-fake_addrinfo.lo
Removing lib/libcurlu_la-fake_addrinfo.o
Removing lib/libcurlu_la-file.lo
Removing lib/libcurlu_la-file.o
Removing lib/libcurlu_la-fileinfo.lo
Removing lib/libcurlu_la-fileinfo.o
Removing lib/libcurlu_la-fopen.lo
Removing lib/libcurlu_la-fopen.o
Removing lib/libcurlu_la-formdata.lo
Removing lib/libcurlu_la-formdata.o
Removing lib/libcurlu_la-ftp.lo
Removing lib/libcurlu_la-ftp.o
Removing lib/libcurlu_la-ftplistparser.lo
Removing lib/libcurlu_la-ftplistparser.o
Removing lib/libcurlu_la-getenv.lo
Removing lib/libcurlu_la-getenv.o
Removing lib/libcurlu_la-getinfo.lo
Removing lib/libcurlu_la-getinfo.o
Removing lib/libcurlu_la-gopher.lo
Removing lib/libcurlu_la-gopher.o
Removing lib/libcurlu_la-hash.lo
Removing lib/libcurlu_la-hash.o
Removing lib/libcurlu_la-headers.lo
Removing lib/libcurlu_la-headers.o
Removing lib/libcurlu_la-hmac.lo
Removing lib/libcurlu_la-hmac.o
Removing lib/libcurlu_la-hostip.lo
Removing lib/libcurlu_la-hostip.o
Removing lib/libcurlu_la-hostip4.lo
Removing lib/libcurlu_la-hostip4.o
Removing lib/libcurlu_la-hostip6.lo
Removing lib/libcurlu_la-hostip6.o
Removing lib/libcurlu_la-hsts.lo
Removing lib/libcurlu_la-hsts.o
Removing lib/libcurlu_la-http.lo
Removing lib/libcurlu_la-http.o
Removing lib/libcurlu_la-http1.lo
Removing lib/libcurlu_la-http1.o
Removing lib/libcurlu_la-http2.lo
Removing lib/libcurlu_la-http2.o
Removing lib/libcurlu_la-http_aws_sigv4.lo
Removing lib/libcurlu_la-http_aws_sigv4.o
Removing lib/libcurlu_la-http_chunks.lo
Removing lib/libcurlu_la-http_chunks.o
Removing lib/libcurlu_la-http_digest.lo
Removing lib/libcurlu_la-http_digest.o
Removing lib/libcurlu_la-http_negotiate.lo
Removing lib/libcurlu_la-http_negotiate.o
Removing lib/libcurlu_la-http_ntlm.lo
Removing lib/libcurlu_la-http_ntlm.o
Removing lib/libcurlu_la-http_proxy.lo
Removing lib/libcurlu_la-http_proxy.o
Removing lib/libcurlu_la-httpsrr.lo
Removing lib/libcurlu_la-httpsrr.o
Removing lib/libcurlu_la-idn.lo
Removing lib/libcurlu_la-idn.o
Removing lib/libcurlu_la-if2ip.lo
Removing lib/libcurlu_la-if2ip.o
Removing lib/libcurlu_la-imap.lo
Removing lib/libcurlu_la-imap.o
Removing lib/libcurlu_la-krb5.lo
Removing lib/libcurlu_la-krb5.o
Removing lib/libcurlu_la-ldap.lo
Removing lib/libcurlu_la-ldap.o
Removing lib/libcurlu_la-llist.lo
Removing lib/libcurlu_la-llist.o
Removing lib/libcurlu_la-macos.lo
Removing lib/libcurlu_la-macos.o
Removing lib/libcurlu_la-md4.lo
Removing lib/libcurlu_la-md4.o
Removing lib/libcurlu_la-md5.lo
Removing lib/libcurlu_la-md5.o
Removing lib/libcurlu_la-memdebug.lo
Removing lib/libcurlu_la-memdebug.o
Removing lib/libcurlu_la-mime.lo
Removing lib/libcurlu_la-mime.o
Removing lib/libcurlu_la-mprintf.lo
Removing lib/libcurlu_la-mprintf.o
Removing lib/libcurlu_la-mqtt.lo
Removing lib/libcurlu_la-mqtt.o
Removing lib/libcurlu_la-multi.lo
Removing lib/libcurlu_la-multi.o
Removing lib/libcurlu_la-multi_ev.lo
Removing lib/libcurlu_la-multi_ev.o
Removing lib/libcurlu_la-netrc.lo
Removing lib/libcurlu_la-netrc.o
Removing lib/libcurlu_la-noproxy.lo
Removing lib/libcurlu_la-noproxy.o
Removing lib/libcurlu_la-openldap.lo
Removing lib/libcurlu_la-openldap.o
Removing lib/libcurlu_la-parsedate.lo
Removing lib/libcurlu_la-parsedate.o
Removing lib/libcurlu_la-pingpong.lo
Removing lib/libcurlu_la-pingpong.o
Removing lib/libcurlu_la-pop3.lo
Removing lib/libcurlu_la-pop3.o
Removing lib/libcurlu_la-progress.lo
Removing lib/libcurlu_la-progress.o
Removing lib/libcurlu_la-psl.lo
Removing lib/libcurlu_la-psl.o
Removing lib/libcurlu_la-rand.lo
Removing lib/libcurlu_la-rand.o
Removing lib/libcurlu_la-rename.lo
Removing lib/libcurlu_la-rename.o
Removing lib/libcurlu_la-request.lo
Removing lib/libcurlu_la-request.o
Removing lib/libcurlu_la-rtsp.lo
Removing lib/libcurlu_la-rtsp.o
Removing lib/libcurlu_la-select.lo
Removing lib/libcurlu_la-select.o
Removing lib/libcurlu_la-sendf.lo
Removing lib/libcurlu_la-sendf.o
Removing lib/libcurlu_la-setopt.lo
Removing lib/libcurlu_la-setopt.o
Removing lib/libcurlu_la-sha256.lo
Removing lib/libcurlu_la-sha256.o
Removing lib/libcurlu_la-share.lo
Removing lib/libcurlu_la-share.o
Removing lib/libcurlu_la-slist.lo
Removing lib/libcurlu_la-slist.o
Removing lib/libcurlu_la-smb.lo
Removing lib/libcurlu_la-smb.o
Removing lib/libcurlu_la-smtp.lo
Removing lib/libcurlu_la-smtp.o
Removing lib/libcurlu_la-socketpair.lo
Removing lib/libcurlu_la-socketpair.o
Removing lib/libcurlu_la-socks.lo
Removing lib/libcurlu_la-socks.o
Removing lib/libcurlu_la-socks_gssapi.lo
Removing lib/libcurlu_la-socks_gssapi.o
Removing lib/libcurlu_la-socks_sspi.lo
Removing lib/libcurlu_la-socks_sspi.o
Removing lib/libcurlu_la-speedcheck.lo
Removing lib/libcurlu_la-speedcheck.o
Removing lib/libcurlu_la-splay.lo
Removing lib/libcurlu_la-splay.o
Removing lib/libcurlu_la-strcase.lo
Removing lib/libcurlu_la-strcase.o
Removing lib/libcurlu_la-strdup.lo
Removing lib/libcurlu_la-strdup.o
Removing lib/libcurlu_la-strequal.lo
Removing lib/libcurlu_la-strequal.o
Removing lib/libcurlu_la-strerror.lo
Removing lib/libcurlu_la-strerror.o
Removing lib/libcurlu_la-system_win32.lo
Removing lib/libcurlu_la-system_win32.o
Removing lib/libcurlu_la-telnet.lo
Removing lib/libcurlu_la-telnet.o
Removing lib/libcurlu_la-tftp.lo
Removing lib/libcurlu_la-tftp.o
Removing lib/libcurlu_la-transfer.lo
Removing lib/libcurlu_la-transfer.o
Removing lib/libcurlu_la-uint-bset.lo
Removing lib/libcurlu_la-uint-bset.o
Removing lib/libcurlu_la-uint-hash.lo
Removing lib/libcurlu_la-uint-hash.o
Removing lib/libcurlu_la-uint-spbset.lo
Removing lib/libcurlu_la-uint-spbset.o
Removing lib/libcurlu_la-uint-table.lo
Removing lib/libcurlu_la-uint-table.o
Removing lib/libcurlu_la-url.lo
Removing lib/libcurlu_la-url.o
Removing lib/libcurlu_la-urlapi.lo
Removing lib/libcurlu_la-urlapi.o
Removing lib/libcurlu_la-version.lo
Removing lib/libcurlu_la-version.o
Removing lib/libcurlu_la-ws.lo
Removing lib/libcurlu_la-ws.o
Removing lib/stamp-h1
Removing lib/unitprotos.h
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/vauth/libcurlu_la-cleartext.lo
Removing lib/vauth/libcurlu_la-cleartext.o
Removing lib/vauth/libcurlu_la-cram.lo
Removing lib/vauth/libcurlu_la-cram.o
Removing lib/vauth/libcurlu_la-digest.lo
Removing lib/vauth/libcurlu_la-digest.o
Removing lib/vauth/libcurlu_la-digest_sspi.lo
Removing lib/vauth/libcurlu_la-digest_sspi.o
Removing lib/vauth/libcurlu_la-gsasl.lo
Removing lib/vauth/libcurlu_la-gsasl.o
Removing lib/vauth/libcurlu_la-krb5_gssapi.lo
Removing lib/vauth/libcurlu_la-krb5_gssapi.o
Removing lib/vauth/libcurlu_la-krb5_sspi.lo
Removing lib/vauth/libcurlu_la-krb5_sspi.o
Removing lib/vauth/libcurlu_la-ntlm.lo
Removing lib/vauth/libcurlu_la-ntlm.o
Removing lib/vauth/libcurlu_la-ntlm_sspi.lo
Removing lib/vauth/libcurlu_la-ntlm_sspi.o
Removing lib/vauth/libcurlu_la-oauth2.lo
Removing lib/vauth/libcurlu_la-oauth2.o
Removing lib/vauth/libcurlu_la-spnego_gssapi.lo
Removing lib/vauth/libcurlu_la-spnego_gssapi.o
Removing lib/vauth/libcurlu_la-spnego_sspi.lo
Removing lib/vauth/libcurlu_la-spnego_sspi.o
Removing lib/vauth/libcurlu_la-vauth.lo
Removing lib/vauth/libcurlu_la-vauth.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_osslq.lo
Removing lib/vquic/libcurl_la-curl_osslq.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic-tls.lo
Removing lib/vquic/libcurl_la-vquic-tls.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vquic/libcurlu_la-curl_msh3.lo
Removing lib/vquic/libcurlu_la-curl_msh3.o
Removing lib/vquic/libcurlu_la-curl_ngtcp2.lo
Removing lib/vquic/libcurlu_la-curl_ngtcp2.o
Removing lib/vquic/libcurlu_la-curl_osslq.lo
Removing lib/vquic/libcurlu_la-curl_osslq.o
Removing lib/vquic/libcurlu_la-curl_quiche.lo
Removing lib/vquic/libcurlu_la-curl_quiche.o
Removing lib/vquic/libcurlu_la-vquic-tls.lo
Removing lib/vquic/libcurlu_la-vquic-tls.o
Removing lib/vquic/libcurlu_la-vquic.lo
Removing lib/vquic/libcurlu_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-curl_path.lo
Removing lib/vssh/libcurl_la-curl_path.o
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vssh/libcurlu_la-curl_path.lo
Removing lib/vssh/libcurlu_la-curl_path.o
Removing lib/vssh/libcurlu_la-libssh.lo
Removing lib/vssh/libcurlu_la-libssh.o
Removing lib/vssh/libcurlu_la-libssh2.lo
Removing lib/vssh/libcurlu_la-libssh2.o
Removing lib/vssh/libcurlu_la-wolfssh.lo
Removing lib/vssh/libcurlu_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-cipher_suite.lo
Removing lib/vtls/libcurl_la-cipher_suite.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-vtls_scache.lo
Removing lib/vtls/libcurl_la-vtls_scache.o
Removing lib/vtls/libcurl_la-vtls_spack.lo
Removing lib/vtls/libcurl_la-vtls_spack.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/vtls/libcurlu_la-cipher_suite.lo
Removing lib/vtls/libcurlu_la-cipher_suite.o
Removing lib/vtls/libcurlu_la-gtls.lo
Removing lib/vtls/libcurlu_la-gtls.o
Removing lib/vtls/libcurlu_la-hostcheck.lo
Removing lib/vtls/libcurlu_la-hostcheck.o
Removing lib/vtls/libcurlu_la-keylog.lo
Removing lib/vtls/libcurlu_la-keylog.o
Removing lib/vtls/libcurlu_la-mbedtls.lo
Removing lib/vtls/libcurlu_la-mbedtls.o
Removing lib/vtls/libcurlu_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurlu_la-mbedtls_threadlock.o
Removing lib/vtls/libcurlu_la-openssl.lo
Removing lib/vtls/libcurlu_la-openssl.o
Removing lib/vtls/libcurlu_la-rustls.lo
Removing lib/vtls/libcurlu_la-rustls.o
Removing lib/vtls/libcurlu_la-schannel.lo
Removing lib/vtls/libcurlu_la-schannel.o
Removing lib/vtls/libcurlu_la-schannel_verify.lo
Removing lib/vtls/libcurlu_la-schannel_verify.o
Removing lib/vtls/libcurlu_la-vtls.lo
Removing lib/vtls/libcurlu_la-vtls.o
Removing lib/vtls/libcurlu_la-vtls_scache.lo
Removing lib/vtls/libcurlu_la-vtls_scache.o
Removing lib/vtls/libcurlu_la-vtls_spack.lo
Removing lib/vtls/libcurlu_la-vtls_spack.o
Removing lib/vtls/libcurlu_la-wolfssl.lo
Removing lib/vtls/libcurlu_la-wolfssl.o
Removing lib/vtls/libcurlu_la-x509asn1.lo
Removing lib/vtls/libcurlu_la-x509asn1.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/curl-config2setopts.o
Removing src/curl-slist_wc.o
Removing src/curl-terminal.o
Removing src/curl-tool_bname.o
Removing src/curl-tool_ca_embed.o
Removing src/curl-tool_cb_dbg.o
Removing src/curl-tool_cb_hdr.o
Removing src/curl-tool_cb_prg.o
Removing src/curl-tool_cb_rea.o
Removing src/curl-tool_cb_see.o
Removing src/curl-tool_cb_soc.o
Removing src/curl-tool_cb_wrt.o
Removing src/curl-tool_cfgable.o
Removing src/curl-tool_dirhie.o
Removing src/curl-tool_doswin.o
Removing src/curl-tool_easysrc.o
Removing src/curl-tool_filetime.o
Removing src/curl-tool_findfile.o
Removing src/curl-tool_formparse.o
Removing src/curl-tool_getparam.o
Removing src/curl-tool_getpass.o
Removing src/curl-tool_help.o
Removing src/curl-tool_helpers.o
Removing src/curl-tool_hugehelp.o
Removing src/curl-tool_ipfs.o
Removing src/curl-tool_libinfo.o
Removing src/curl-tool_listhelp.o
Removing src/curl-tool_main.o
Removing src/curl-tool_msgs.o
Removing src/curl-tool_operate.o
Removing src/curl-tool_operhlp.o
Removing src/curl-tool_paramhlp.o
Removing src/curl-tool_parsecfg.o
Removing src/curl-tool_progress.o
Removing src/curl-tool_setopt.o
Removing src/curl-tool_ssls.o
Removing src/curl-tool_stderr.o
Removing src/curl-tool_strdup.o
Removing src/curl-tool_urlglob.o
Removing src/curl-tool_util.o
Removing src/curl-tool_vms.o
Removing src/curl-tool_writeout.o
Removing src/curl-tool_writeout_json.o
Removing src/curl-tool_xattr.o
Removing src/curl-var.o
Removing src/curlinfo
Removing src/curlinfo.o
Removing src/libcurltool.la
Removing src/libcurltool_la-config2setopts.lo
Removing src/libcurltool_la-config2setopts.o
Removing src/libcurltool_la-slist_wc.lo
Removing src/libcurltool_la-slist_wc.o
Removing src/libcurltool_la-terminal.lo
Removing src/libcurltool_la-terminal.o
Removing src/libcurltool_la-tool_bname.lo
Removing src/libcurltool_la-tool_bname.o
Removing src/libcurltool_la-tool_cb_dbg.lo
Removing src/libcurltool_la-tool_cb_dbg.o
Removing src/libcurltool_la-tool_cb_hdr.lo
Removing src/libcurltool_la-tool_cb_hdr.o
Removing src/libcurltool_la-tool_cb_prg.lo
Removing src/libcurltool_la-tool_cb_prg.o
Removing src/libcurltool_la-tool_cb_rea.lo
Removing src/libcurltool_la-tool_cb_rea.o
Removing src/libcurltool_la-tool_cb_see.lo
Removing src/libcurltool_la-tool_cb_see.o
Removing src/libcurltool_la-tool_cb_soc.lo
Removing src/libcurltool_la-tool_cb_soc.o
Removing src/libcurltool_la-tool_cb_wrt.lo
Removing src/libcurltool_la-tool_cb_wrt.o
Removing src/libcurltool_la-tool_cfgable.lo
Removing src/libcurltool_la-tool_cfgable.o
Removing src/libcurltool_la-tool_dirhie.lo
Removing src/libcurltool_la-tool_dirhie.o
Removing src/libcurltool_la-tool_doswin.lo
Removing src/libcurltool_la-tool_doswin.o
Removing src/libcurltool_la-tool_easysrc.lo
Removing src/libcurltool_la-tool_easysrc.o
Removing src/libcurltool_la-tool_filetime.lo
Removing src/libcurltool_la-tool_filetime.o
Removing src/libcurltool_la-tool_findfile.lo
Removing src/libcurltool_la-tool_findfile.o
Removing src/libcurltool_la-tool_formparse.lo
Removing src/libcurltool_la-tool_formparse.o
Removing src/libcurltool_la-tool_getparam.lo
Removing src/libcurltool_la-tool_getparam.o
Removing src/libcurltool_la-tool_getpass.lo
Removing src/libcurltool_la-tool_getpass.o
Removing src/libcurltool_la-tool_help.lo
Removing src/libcurltool_la-tool_help.o
Removing src/libcurltool_la-tool_helpers.lo
Removing src/libcurltool_la-tool_helpers.o
Removing src/libcurltool_la-tool_ipfs.lo
Removing src/libcurltool_la-tool_ipfs.o
Removing src/libcurltool_la-tool_libinfo.lo
Removing src/libcurltool_la-tool_libinfo.o
Removing src/libcurltool_la-tool_listhelp.lo
Removing src/libcurltool_la-tool_listhelp.o
Removing src/libcurltool_la-tool_main.lo
Removing src/libcurltool_la-tool_main.o
Removing src/libcurltool_la-tool_msgs.lo
Removing src/libcurltool_la-tool_msgs.o
Removing src/libcurltool_la-tool_operate.lo
Removing src/libcurltool_la-tool_operate.o
Removing src/libcurltool_la-tool_operhlp.lo
Removing src/libcurltool_la-tool_operhlp.o
Removing src/libcurltool_la-tool_paramhlp.lo
Removing src/libcurltool_la-tool_paramhlp.o
Removing src/libcurltool_la-tool_parsecfg.lo
Removing src/libcurltool_la-tool_parsecfg.o
Removing src/libcurltool_la-tool_progress.lo
Removing src/libcurltool_la-tool_progress.o
Removing src/libcurltool_la-tool_setopt.lo
Removing src/libcurltool_la-tool_setopt.o
Removing src/libcurltool_la-tool_ssls.lo
Removing src/libcurltool_la-tool_ssls.o
Removing src/libcurltool_la-tool_stderr.lo
Removing src/libcurltool_la-tool_stderr.o
Removing src/libcurltool_la-tool_strdup.lo
Removing src/libcurltool_la-tool_strdup.o
Removing src/libcurltool_la-tool_urlglob.lo
Removing src/libcurltool_la-tool_urlglob.o
Removing src/libcurltool_la-tool_util.lo
Removing src/libcurltool_la-tool_util.o
Removing src/libcurltool_la-tool_vms.lo
Removing src/libcurltool_la-tool_vms.o
Removing src/libcurltool_la-tool_writeout.lo
Removing src/libcurltool_la-tool_writeout.o
Removing src/libcurltool_la-tool_writeout_json.lo
Removing src/libcurltool_la-tool_writeout_json.o
Removing src/libcurltool_la-tool_xattr.lo
Removing src/libcurltool_la-tool_xattr.o
Removing src/libcurltool_la-var.lo
Removing src/libcurltool_la-var.o
Removing src/tool_ca_embed.c
Removing src/tool_hugehelp.c
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/client/.deps/
Removing tests/client/Makefile
Removing tests/client/Makefile.in
Removing tests/config
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/http/Makefile
Removing tests/http/Makefile.in
Removing tests/http/config.ini
Removing tests/libtest/.deps/
Removing tests/libtest/Makefile
Removing tests/libtest/Makefile.in
Removing tests/server/.deps/
Removing tests/server/Makefile
Removing tests/server/Makefile.in
Removing tests/tunit/.deps/
Removing tests/tunit/Makefile
Removing tests/tunit/Makefile.in
Removing tests/unit/.deps/
Removing tests/unit/Makefile
Removing tests/unit/Makefile.in
$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:128: installing './compile'
configure.ac:418: installing './config.guess'
configure.ac:418: installing './config.sub'
configure.ac:128: installing './install-sh'
configure.ac:134: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;
$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;
$ chmod +x configure
$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable HTTPSRR support... no
checking whether to enable ECH support... no
checking whether to enable SSL session export support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking that grep -E works... yes
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for stdatomic.h... yes
checking if _Atomic is available... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 8.15.0-DEV
checking for httpd... no
checking for apache2... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... no
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking compiler version... gcc '1100' (raw: '11')
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking whether build target is a native Windows one... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
checking whether build target supports Win32 crypto API... no
checking whether to build libcurl and curl in "unity" mode... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support IPFS... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to build documentation... no
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking whether build target is a native Windows one... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for sys/types.h... (cached) yes
checking for raw monotonic clock_gettime... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libpsl options with pkg-config... found
checking for psl_builtin in -lpsl... yes
checking for libpsl.h... yes
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for sys/types.h... (cached) yes
checking for sys/select.h... yes
checking for sys/ioctl.h... yes
checking for unistd.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netinet/udp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for fcntl.h... yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for stdint.h... (cached) yes
checking for sys/filio.h... no
checking for sys/eventfd.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking whether build target is a native Windows one... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking for sys/types.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for ifaddrs.h... yes
checking if getifaddrs can be linked... yes
checking if getifaddrs is prototyped... yes
checking if getifaddrs is compilable... yes
checking if getifaddrs seems to work... yes
checking if getifaddrs usage allowed... yes
checking if getifaddrs might be used... yes
checking if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for sys/types.h... (cached) yes
checking if gmtime_r can be linked... yes
checking if gmtime_r is prototyped... yes
checking if gmtime_r is compilable... yes
checking if gmtime_r seems to work... yes
checking if gmtime_r usage allowed... yes
checking if gmtime_r might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if memrchr can be linked... yes
checking if memrchr is prototyped... yes
checking if memrchr is compilable... yes
checking if memrchr usage allowed... yes
checking if memrchr might be used... yes
checking for sys/types.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking for accept4... yes
checking for eventfd... yes
checking for fnmatch... yes
checking for geteuid... yes
checking for getpass_r... no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for if_nametoindex... yes
checking for mach_absolute_time... no
checking for pipe... yes
checking for pipe2... yes
checking for poll... yes
checking for sendmmsg... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking for realpath... yes
checking for sched_yield... yes
checking for sys/types.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking if inet_ntop can be linked... yes
checking if inet_ntop is prototyped... yes
checking if inet_ntop is compilable... yes
checking if inet_ntop seems to work... yes
checking if inet_ntop usage allowed... yes
checking if inet_ntop might be used... yes
checking if inet_pton can be linked... yes
checking if inet_pton is prototyped... yes
checking if inet_pton is compilable... yes
checking if inet_pton seems to work... yes
checking if inet_pton usage allowed... yes
checking if inet_pton might be used... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking for setmode... no
checking for arc4random... no
checking for fseeko... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking whether to enable the threaded resolver... yes
checking for pthread.h... yes
checking for pthread_create... yes
checking for dirent.h... yes
checking for opendir... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable basic authentication method... yes
checking whether to enable bearer authentication method... yes
checking whether to enable digest authentication method... yes
checking whether to enable kerberos authentication method... yes
checking whether to enable negotiate authentication method... yes
checking whether to enable aws sig methods... yes
checking whether to support NTLM... yes
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support binding connections locally... yes
checking whether to support the form API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support the SHA-512/256 hash algorithm... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to enable HTTPS-RR support... no
checking whether to support WebSockets... yes
checking whether hiding of library internal symbols will actually happen... yes
checking if this build supports HTTPS-proxy... no
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating docs/Makefile
config.status: creating docs/examples/Makefile
config.status: creating docs/libcurl/Makefile
config.status: creating docs/libcurl/opts/Makefile
config.status: creating docs/cmdline-opts/Makefile
config.status: creating include/Makefile
config.status: creating include/curl/Makefile
config.status: creating src/Makefile
config.status: creating lib/Makefile
config.status: creating scripts/Makefile
config.status: creating lib/libcurl.vers
config.status: creating tests/Makefile
config.status: creating tests/config
config.status: creating tests/configurehelp.pm
config.status: creating tests/certs/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/tunit/Makefile
config.status: creating tests/client/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:
Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CFLAGS extras:
CPPFLAGS: -D_GNU_SOURCE
LDFLAGS:
curl-config:
LIBS: -lpsl -lz
curl version: 8.15.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,amissl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build docs: no
Build libcurl: Shared=no, Static=yes
Built-in manual: no (--enable-manual)
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca cert embed: no
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
IPFS/IPNS: enabled
RTSP: enabled
RTMP: no (--with-librtmp)
PSL: enabled
Alt-svc: enabled (--disable-alt-svc)
Headers API: enabled (--disable-headers-api)
HSTS: no (--enable-hsts)
HTTP1: enabled (internal)
HTTP2: no (--with-nghttp2)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-openssl-quic, --with-msh3)
ECH: no (--enable-ech)
HTTPS RR: no (--enable-httpsrr)
SSLS-EXPORT: no (--enable-ssls-export)
Protocols: dict file ftp gopher http imap ipfs ipns mqtt pop3 rtsp smtp telnet tftp ws
Features: alt-svc AsynchDNS IPv6 Largefile libz PSL threadsafe UnixSockets
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libidn2
$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-altsvc.lo
CC libcurl_la-asyn-base.lo
CC libcurl_la-asyn-thrdd.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-cshutdn.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sha512_256.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-cw-out.lo
CC libcurl_la-cw-pause.lo
CC libcurl_la-dict.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynhds.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-fake_addrinfo.lo
CC libcurl_la-file.lo
CC libcurl_la-fopen.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-httpsrr.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-macos.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-multi_ev.lo
CC libcurl_la-netrc.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-request.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strequal.lo
CC libcurl_la-strerror.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-transfer.lo
CC libcurl_la-uint-bset.lo
CC libcurl_la-uint-hash.lo
CC libcurl_la-uint-spbset.lo
CC libcurl_la-uint-table.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-ws.lo
CC libcurlu_la-altsvc.lo
CC libcurlu_la-amigaos.lo
CC libcurlu_la-asyn-ares.lo
CC libcurlu_la-asyn-base.lo
CC libcurlu_la-asyn-thrdd.lo
CC libcurlu_la-bufq.lo
CC libcurlu_la-bufref.lo
CC libcurlu_la-cf-h1-proxy.lo
CC libcurlu_la-cf-h2-proxy.lo
CC libcurlu_la-cf-haproxy.lo
CC libcurlu_la-cf-https-connect.lo
CC libcurlu_la-cf-socket.lo
CC libcurlu_la-cfilters.lo
CC libcurlu_la-conncache.lo
CC libcurlu_la-connect.lo
CC libcurlu_la-content_encoding.lo
CC libcurlu_la-cookie.lo
CC libcurlu_la-cshutdn.lo
CC libcurlu_la-curl_addrinfo.lo
CC libcurlu_la-curl_des.lo
CC libcurlu_la-curl_endian.lo
CC libcurlu_la-curl_fnmatch.lo
CC libcurlu_la-curl_get_line.lo
CC libcurlu_la-curl_gethostname.lo
CC libcurlu_la-curl_gssapi.lo
CC libcurlu_la-curl_memrchr.lo
CC libcurlu_la-curl_ntlm_core.lo
CC libcurlu_la-curl_range.lo
CC libcurlu_la-curl_rtmp.lo
CC libcurlu_la-curl_sasl.lo
CC libcurlu_la-curl_sha512_256.lo
CC libcurlu_la-curl_sspi.lo
CC libcurlu_la-curl_threads.lo
CC libcurlu_la-curl_trc.lo
CC libcurlu_la-cw-out.lo
CC libcurlu_la-cw-pause.lo
CC libcurlu_la-dict.lo
CC libcurlu_la-doh.lo
CC libcurlu_la-dynhds.lo
CC libcurlu_la-easy.lo
CC libcurlu_la-easygetopt.lo
CC libcurlu_la-escape.lo
CC libcurlu_la-easyoptions.lo
CC libcurlu_la-fake_addrinfo.lo
CC libcurlu_la-file.lo
CC libcurlu_la-fileinfo.lo
CC libcurlu_la-fopen.lo
CC libcurlu_la-formdata.lo
CC libcurlu_la-ftp.lo
CC libcurlu_la-ftplistparser.lo
CC libcurlu_la-getenv.lo
CC libcurlu_la-getinfo.lo
CC libcurlu_la-gopher.lo
CC libcurlu_la-hash.lo
CC libcurlu_la-headers.lo
CC libcurlu_la-hmac.lo
CC libcurlu_la-hostip.lo
CC libcurlu_la-hostip4.lo
CC libcurlu_la-hostip6.lo
CC libcurlu_la-hsts.lo
CC libcurlu_la-http.lo
CC libcurlu_la-http1.lo
CC libcurlu_la-http2.lo
CC libcurlu_la-http_aws_sigv4.lo
CC libcurlu_la-http_chunks.lo
CC libcurlu_la-http_digest.lo
CC libcurlu_la-http_negotiate.lo
CC libcurlu_la-http_ntlm.lo
CC libcurlu_la-http_proxy.lo
CC libcurlu_la-httpsrr.lo
CC libcurlu_la-idn.lo
CC libcurlu_la-if2ip.lo
CC libcurlu_la-imap.lo
CC libcurlu_la-krb5.lo
CC libcurlu_la-ldap.lo
CC libcurlu_la-llist.lo
CC libcurlu_la-macos.lo
CC libcurlu_la-md4.lo
CC libcurlu_la-md5.lo
CC libcurlu_la-memdebug.lo
CC libcurlu_la-mime.lo
CC libcurlu_la-mprintf.lo
CC libcurlu_la-mqtt.lo
CC libcurlu_la-multi.lo
CC libcurlu_la-multi_ev.lo
CC libcurlu_la-netrc.lo
CC libcurlu_la-noproxy.lo
CC libcurlu_la-openldap.lo
CC libcurlu_la-parsedate.lo
CC libcurlu_la-pingpong.lo
CC libcurlu_la-pop3.lo
CC libcurlu_la-progress.lo
CC libcurlu_la-psl.lo
CC libcurlu_la-rand.lo
CC libcurlu_la-rename.lo
CC libcurlu_la-request.lo
CC libcurlu_la-rtsp.lo
CC libcurlu_la-select.lo
CC libcurlu_la-sendf.lo
CC libcurlu_la-setopt.lo
CC libcurlu_la-sha256.lo
CC libcurlu_la-share.lo
CC libcurlu_la-slist.lo
CC libcurlu_la-smb.lo
CC libcurlu_la-smtp.lo
CC libcurlu_la-socketpair.lo
CC libcurlu_la-socks.lo
CC libcurlu_la-socks_gssapi.lo
CC libcurlu_la-socks_sspi.lo
CC libcurlu_la-speedcheck.lo
CC libcurlu_la-splay.lo
CC libcurlu_la-strcase.lo
CC libcurlu_la-strdup.lo
CC libcurlu_la-strequal.lo
CC libcurlu_la-strerror.lo
CC libcurlu_la-system_win32.lo
CC libcurlu_la-telnet.lo
CC libcurlu_la-tftp.lo
CC libcurlu_la-transfer.lo
CC libcurlu_la-uint-bset.lo
CC libcurlu_la-uint-hash.lo
CC libcurlu_la-uint-spbset.lo
CC libcurlu_la-uint-table.lo
CC libcurlu_la-url.lo
CC libcurlu_la-urlapi.lo
CC libcurlu_la-version.lo
CC libcurlu_la-ws.lo
CC vauth/libcurlu_la-cleartext.lo
CC vauth/libcurlu_la-cram.lo
CC vauth/libcurlu_la-digest.lo
CC vauth/libcurlu_la-digest_sspi.lo
CC vauth/libcurlu_la-gsasl.lo
CC vauth/libcurlu_la-krb5_gssapi.lo
CC vauth/libcurlu_la-krb5_sspi.lo
CC vauth/libcurlu_la-ntlm.lo
CC vauth/libcurlu_la-ntlm_sspi.lo
CC vauth/libcurlu_la-oauth2.lo
CC vauth/libcurlu_la-spnego_gssapi.lo
CC vauth/libcurlu_la-spnego_sspi.lo
CC vauth/libcurlu_la-vauth.lo
CC vtls/libcurlu_la-cipher_suite.lo
CC vtls/libcurlu_la-gtls.lo
CC vtls/libcurlu_la-hostcheck.lo
CC vtls/libcurlu_la-keylog.lo
CC vtls/libcurlu_la-mbedtls.lo
CC vtls/libcurlu_la-mbedtls_threadlock.lo
CC vtls/libcurlu_la-openssl.lo
CC vtls/libcurlu_la-rustls.lo
CC vtls/libcurlu_la-schannel.lo
CC vtls/libcurlu_la-schannel_verify.lo
CC vtls/libcurlu_la-vtls.lo
CC vtls/libcurlu_la-vtls_spack.lo
CC vtls/libcurlu_la-vtls_scache.lo
CC vtls/libcurlu_la-wolfssl.lo
CC vtls/libcurlu_la-x509asn1.lo
CC vquic/libcurlu_la-curl_msh3.lo
CC vquic/libcurlu_la-curl_ngtcp2.lo
CC vquic/libcurlu_la-curl_osslq.lo
CC vquic/libcurlu_la-curl_quiche.lo
CC vquic/libcurlu_la-vquic.lo
CC vssh/libcurlu_la-libssh.lo
CC vssh/libcurlu_la-libssh2.lo
CC vquic/libcurlu_la-vquic-tls.lo
CC vssh/libcurlu_la-curl_path.lo
CC vssh/libcurlu_la-wolfssh.lo
CC curlx/libcurlu_la-base64.lo
CC curlx/libcurlu_la-dynbuf.lo
CC curlx/libcurlu_la-inet_ntop.lo
CC curlx/libcurlu_la-inet_pton.lo
CC curlx/libcurlu_la-multibyte.lo
CC curlx/libcurlu_la-nonblock.lo
CC curlx/libcurlu_la-strparse.lo
CC curlx/libcurlu_la-timediff.lo
CC curlx/libcurlu_la-timeval.lo
CC curlx/libcurlu_la-version_win32.lo
CC curlx/libcurlu_la-wait.lo
CC curlx/libcurlu_la-warnless.lo
CC curlx/libcurlu_la-winapi.lo
UNITPR unitprotos.h
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-gsasl.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-cipher_suite.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-vtls_scache.lo
CC vtls/libcurl_la-vtls_spack.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_osslq.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vquic/libcurl_la-vquic-tls.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-curl_path.lo
CC vssh/libcurl_la-wolfssh.lo
CC curlx/libcurl_la-base64.lo
CC curlx/libcurl_la-dynbuf.lo
CC curlx/libcurl_la-inet_ntop.lo
CC curlx/libcurl_la-inet_pton.lo
CC curlx/libcurl_la-multibyte.lo
CC curlx/libcurl_la-nonblock.lo
CC curlx/libcurl_la-strparse.lo
CC curlx/libcurl_la-timediff.lo
CC curlx/libcurl_la-timeval.lo
CC curlx/libcurl_la-version_win32.lo
CC curlx/libcurl_la-wait.lo
CC curlx/libcurl_la-warnless.lo
CC curlx/libcurl_la-winapi.lo
CCLD libcurlu.la
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in docs
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Nothing to be done for 'all-am'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Nothing to be done for 'all'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
Making all in libcurl
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
Making all in opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[3]: Nothing to be done for 'all-am'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC curl-slist_wc.o
CC curl-terminal.o
CC curl-config2setopts.o
CC curl-tool_bname.o
CC curl-tool_cb_dbg.o
CC curl-tool_cb_hdr.o
CC curl-tool_cb_prg.o
CC curl-tool_cb_rea.o
CC curl-tool_cb_soc.o
CC curl-tool_cb_see.o
CC curl-tool_cb_wrt.o
CC curl-tool_cfgable.o
CC curl-tool_dirhie.o
CC curl-tool_doswin.o
CC curl-tool_easysrc.o
CC curl-tool_filetime.o
CC curl-tool_findfile.o
CC curl-tool_formparse.o
CC curl-tool_getparam.o
CC curl-tool_getpass.o
CC curl-tool_help.o
CC curl-tool_helpers.o
CC curl-tool_ipfs.o
CC curl-tool_libinfo.o
CC curl-tool_listhelp.o
CC curl-tool_main.o
CC curl-tool_msgs.o
CC curl-tool_operate.o
CC curl-tool_operhlp.o
CC curl-tool_paramhlp.o
CC curl-tool_parsecfg.o
CC curl-tool_progress.o
CC curl-tool_setopt.o
CC curl-tool_ssls.o
CC curl-tool_stderr.o
CC curl-tool_strdup.o
CC curl-tool_urlglob.o
CC curl-tool_util.o
CC curl-tool_vms.o
CC curl-tool_writeout.o
CC curl-tool_writeout_json.o
echo '/* !checksrc! disable COPYRIGHT all */' > tool_hugehelp.c; \
echo '#include "tool_hugehelp.h"' >> tool_hugehelp.c
CC curl-tool_xattr.o
echo '/* !checksrc! disable COPYRIGHT all */' > tool_ca_embed.c
CC curl-var.o
echo 'extern const void *curl_ca_embed; const void *curl_ca_embed;' >> tool_ca_embed.c
CC curlinfo.o
CC libcurltool_la-config2setopts.lo
CC libcurltool_la-slist_wc.lo
CC libcurltool_la-terminal.lo
CC libcurltool_la-tool_bname.lo
CC libcurltool_la-tool_cb_dbg.lo
CC libcurltool_la-tool_cb_hdr.lo
CC libcurltool_la-tool_cb_prg.lo
CC libcurltool_la-tool_cb_rea.lo
CC libcurltool_la-tool_cb_see.lo
CC libcurltool_la-tool_cb_soc.lo
CC libcurltool_la-tool_cb_wrt.lo
CC libcurltool_la-tool_cfgable.lo
CC libcurltool_la-tool_dirhie.lo
CC libcurltool_la-tool_doswin.lo
CC libcurltool_la-tool_easysrc.lo
CC libcurltool_la-tool_filetime.lo
CC libcurltool_la-tool_findfile.lo
CC libcurltool_la-tool_formparse.lo
CC libcurltool_la-tool_getparam.lo
CC libcurltool_la-tool_getpass.lo
CC libcurltool_la-tool_help.lo
CC libcurltool_la-tool_helpers.lo
CC libcurltool_la-tool_ipfs.lo
CC libcurltool_la-tool_libinfo.lo
CC libcurltool_la-tool_listhelp.lo
CC libcurltool_la-tool_main.lo
CC libcurltool_la-tool_msgs.lo
CC libcurltool_la-tool_operate.lo
CC libcurltool_la-tool_operhlp.lo
CC libcurltool_la-tool_paramhlp.lo
CC libcurltool_la-tool_parsecfg.lo
CC libcurltool_la-tool_progress.lo
CC libcurltool_la-tool_setopt.lo
CC libcurltool_la-tool_ssls.lo
CC libcurltool_la-tool_stderr.lo
CC libcurltool_la-tool_strdup.lo
CC libcurltool_la-tool_urlglob.lo
CC libcurltool_la-tool_util.lo
CC libcurltool_la-tool_vms.lo
CC libcurltool_la-tool_writeout.lo
CC libcurltool_la-tool_writeout_json.lo
CC libcurltool_la-tool_xattr.lo
CC libcurltool_la-var.lo
CC curl-tool_hugehelp.o
CC curl-tool_ca_embed.o
CCLD curlinfo
CCLD libcurltool.la
CCLD curl
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in scripts
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'
Commit Diff GitHub →
src/config2setopts.c +28 -49src/config2setopts.h +1 -2src/tool_getparam.c +49 -58src/tool_getparam.h +1 -2src/tool_operate.c +36 -38src/tool_parsecfg.c +12 -12src/tool_setopt.c +25 -27src/tool_setopt.h +18 -18src/tool_ssls.c +10 -10src/tool_ssls.h +2 -4
src/config2setopts.c+28 -49
| @@ -171,10 +171,9 @@ static CURLcode url_proto_and_rewrite(char **url, | |
| return result; | |
| } | |
| - | static CURLcode ssh_setopts(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| - | CURL *curl) |
| + | static CURLcode ssh_setopts(struct OperationConfig *config, CURL *curl) |
| { | |
| + | struct GlobalConfig *global = config->global; |
| CURLcode result; | |
| /* SSH and SSL private key uses same command-line option */ | |
| @@ -231,10 +230,9 @@ extern const unsigned char curl_ca_embed[]; | |
| #endif | |
| /* only called if libcurl supports TLS */ | |
| - | static CURLcode ssl_setopts(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| - | CURL *curl) |
| + | static CURLcode ssl_setopts(struct OperationConfig *config, CURL *curl) |
| { | |
| + | struct GlobalConfig *global = config->global; |
| CURLcode result = CURLE_OK; | |
| if(config->cacert) | |
| @@ -461,12 +459,10 @@ static CURLcode ssl_setopts(struct GlobalConfig *global, | |
| } | |
| /* only called for HTTP transfers */ | |
| - | static CURLcode http_setopts(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static CURLcode http_setopts(struct OperationConfig *config, |
| CURL *curl) | |
| { | |
| long postRedir = 0; | |
| - | (void) global; /* for builds without --libcurl */ |
| my_setopt_long(curl, CURLOPT_FOLLOWLOCATION, | |
| config->followlocation); | |
| @@ -521,9 +517,7 @@ static CURLcode http_setopts(struct GlobalConfig *global, | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode cookie_setopts(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| - | CURL *curl) |
| + | static CURLcode cookie_setopts(struct OperationConfig *config, CURL *curl) |
| { | |
| CURLcode result = CURLE_OK; | |
| if(config->cookies) { | |
| @@ -540,7 +534,7 @@ static CURLcode cookie_setopts(struct GlobalConfig *global, | |
| result = curlx_dyn_addf(&cookies, ";%s", cl->data); | |
| if(result) { | |
| - | warnf(global, |
| + | warnf(config->global, |
| "skipped provided cookie, the cookie header " | |
| "would go over %u bytes", MAX_COOKIE_LINE); | |
| return result; | |
| @@ -568,11 +562,9 @@ static CURLcode cookie_setopts(struct GlobalConfig *global, | |
| return result; | |
| } | |
| - | static CURLcode tcp_setopts(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static CURLcode tcp_setopts(struct OperationConfig *config, |
| CURL *curl) | |
| { | |
| - | (void) global; /* for builds without --libcurl */ |
| if(!config->tcp_nodelay) | |
| my_setopt_long(curl, CURLOPT_TCP_NODELAY, 0); | |
| @@ -597,11 +589,8 @@ static CURLcode tcp_setopts(struct GlobalConfig *global, | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode ftp_setopts(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| - | CURL *curl) |
| + | static CURLcode ftp_setopts(struct OperationConfig *config, CURL *curl) |
| { | |
| - | (void) global; /* for builds without --libcurl */ |
| my_setopt_str(curl, CURLOPT_FTPPORT, config->ftpport); | |
| /* new in libcurl 7.9.2: */ | |
| @@ -637,23 +626,20 @@ static CURLcode ftp_setopts(struct GlobalConfig *global, | |
| return CURLE_OK; | |
| } | |
| - | static void gen_trace_setopts(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| - | CURL *curl) |
| + | static void gen_trace_setopts(struct OperationConfig *config, CURL *curl) |
| { | |
| - | if(global->tracetype != TRACE_NONE) { |
| + | if(config->global->tracetype != TRACE_NONE) { |
| my_setopt(curl, CURLOPT_DEBUGFUNCTION, tool_debug_cb); | |
| my_setopt(curl, CURLOPT_DEBUGDATA, config); | |
| my_setopt_long(curl, CURLOPT_VERBOSE, 1L); | |
| } | |
| } | |
| - | static void gen_cb_setopts(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static void gen_cb_setopts(struct OperationConfig *config, |
| struct per_transfer *per, | |
| CURL *curl) | |
| { | |
| - | (void) global; /* for builds without --libcurl */ |
| + | struct GlobalConfig *global = config->global; |
| (void) config; | |
| /* where to store */ | |
| my_setopt(curl, CURLOPT_WRITEDATA, per); | |
| @@ -690,17 +676,13 @@ static void gen_cb_setopts(struct GlobalConfig *global, | |
| my_setopt(curl, CURLOPT_HEADERDATA, per); | |
| } | |
| - | static CURLcode proxy_setopts(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| - | CURL *curl) |
| + | static CURLcode proxy_setopts(struct OperationConfig *config, CURL *curl) |
| { | |
| - | (void) global; /* for builds without --libcurl */ |
| - | |
| if(config->proxy) { | |
| CURLcode result = my_setopt_str(curl, CURLOPT_PROXY, config->proxy); | |
| if(result) { | |
| - | errorf(global, "proxy support is disabled in this libcurl"); |
| + | errorf(config->global, "proxy support is disabled in this libcurl"); |
| config->synthetic_error = TRUE; | |
| return CURLE_NOT_BUILT_IN; | |
| } | |
| @@ -753,11 +735,8 @@ static CURLcode proxy_setopts(struct GlobalConfig *global, | |
| return CURLE_OK; | |
| } | |
| - | static void tls_srp_setopts(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| - | CURL *curl) |
| + | static void tls_srp_setopts(struct OperationConfig *config, CURL *curl) |
| { | |
| - | (void) global; /* for builds without --libcurl */ |
| if(config->tls_username) | |
| my_setopt_str(curl, CURLOPT_TLSAUTH_USERNAME, config->tls_username); | |
| if(config->tls_password) | |
| @@ -775,12 +754,12 @@ static void tls_srp_setopts(struct GlobalConfig *global, | |
| config->proxy_tls_authtype); | |
| } | |
| - | CURLcode config2setopts(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | CURLcode config2setopts(struct OperationConfig *config, |
| struct per_transfer *per, | |
| CURL *curl, | |
| CURLSH *share) | |
| { | |
| + | struct GlobalConfig *global = config->global; |
| const char *use_proto; | |
| CURLcode result = url_proto_and_rewrite(&per->url, config, &use_proto); | |
| @@ -801,7 +780,7 @@ CURLcode config2setopts(struct GlobalConfig *global, | |
| return result; | |
| #endif | |
| - | gen_trace_setopts(global, config, curl); |
| + | gen_trace_setopts(config, curl); |
| { | |
| #ifdef DEBUGBUILD | |
| @@ -825,7 +804,7 @@ CURLcode config2setopts(struct GlobalConfig *global, | |
| my_setopt_long(curl, CURLOPT_NOPROGRESS, | |
| global->noprogress || global->silent); | |
| /* call after the line above. It may override CURLOPT_NOPROGRESS */ | |
| - | gen_cb_setopts(global, config, per, curl); |
| + | gen_cb_setopts(config, per, curl); |
| if(config->no_body) | |
| my_setopt_long(curl, CURLOPT_NOBODY, 1); | |
| @@ -833,7 +812,7 @@ CURLcode config2setopts(struct GlobalConfig *global, | |
| if(config->oauth_bearer) | |
| my_setopt_str(curl, CURLOPT_XOAUTH2_BEARER, config->oauth_bearer); | |
| - | result = proxy_setopts(global, config, curl); |
| + | result = proxy_setopts(config, curl); |
| if(result) | |
| return result; | |
| @@ -913,15 +892,15 @@ CURLcode config2setopts(struct GlobalConfig *global, | |
| } | |
| if(use_proto == proto_http || use_proto == proto_https) { | |
| - | result = http_setopts(global, config, curl); |
| + | result = http_setopts(config, curl); |
| if(!result) | |
| - | result = cookie_setopts(global, config, curl); |
| + | result = cookie_setopts(config, curl); |
| if(result) | |
| return result; | |
| } | |
| if(use_proto == proto_ftp || use_proto == proto_ftps) { | |
| - | result = ftp_setopts(global, config, curl); |
| + | result = ftp_setopts(config, curl); |
| if(result) | |
| return result; | |
| } | |
| @@ -940,13 +919,13 @@ CURLcode config2setopts(struct GlobalConfig *global, | |
| my_setopt_str(curl, CURLOPT_PROXY_KEYPASSWD, config->proxy_key_passwd); | |
| if(use_proto == proto_scp || use_proto == proto_sftp) { | |
| - | result = ssh_setopts(global, config, curl); |
| + | result = ssh_setopts(config, curl); |
| if(result) | |
| return result; | |
| } | |
| if(feature_ssl) { | |
| - | result = ssl_setopts(global, config, curl); |
| + | result = ssl_setopts(config, curl); |
| if(result) | |
| return result; | |
| } | |
| @@ -1036,7 +1015,7 @@ CURLcode config2setopts(struct GlobalConfig *global, | |
| my_setopt_long(curl, CURLOPT_HTTP_TRANSFER_DECODING, 0); | |
| } | |
| - | result = tcp_setopts(global, config, curl); |
| + | result = tcp_setopts(config, curl); |
| if(result) | |
| return result; | |
| @@ -1072,7 +1051,7 @@ CURLcode config2setopts(struct GlobalConfig *global, | |
| /* new in 7.21.4 */ | |
| if(feature_tls_srp) | |
| - | tls_srp_setopts(global, config, curl); |
| + | tls_srp_setopts(config, curl); |
| /* new in 7.22.0 */ | |
| if(config->gssapi_delegation) | |
src/config2setopts.h+1 -2
| @@ -24,8 +24,7 @@ | |
| * | |
| ***************************************************************************/ | |
| - | CURLcode config2setopts(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | CURLcode config2setopts(struct OperationConfig *config, |
| struct per_transfer *per, | |
| CURL *curl, | |
| CURLSH *share); | |
src/tool_getparam.c+49 -58
| @@ -690,13 +690,12 @@ error: | |
| return err; | |
| } | |
| - | static void sethttpver(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static void sethttpver(struct OperationConfig *config, |
| long httpversion) | |
| { | |
| if(config->httpversion && | |
| (config->httpversion != httpversion)) | |
| - | warnf(global, "Overrides previous HTTP version option"); |
| + | warnf(config->global, "Overrides previous HTTP version option"); |
| config->httpversion = httpversion; | |
| } | |
| @@ -841,7 +840,6 @@ static int find_tos(const void *a, const void *b) | |
| #define MAX_QUERY_LEN 100000 /* larger is not likely to ever work */ | |
| static ParameterError url_query(const char *nextarg, | |
| - | struct GlobalConfig *global, |
| struct OperationConfig *config) | |
| { | |
| size_t size = 0; | |
| @@ -857,7 +855,7 @@ static ParameterError url_query(const char *nextarg, | |
| err = PARAM_NO_MEM; | |
| } | |
| else | |
| - | err = data_urlencode(global, nextarg, &query, &size); |
| + | err = data_urlencode(config->global, nextarg, &query, &size); |
| if(!err) { | |
| if(config->query) { | |
| @@ -878,13 +876,13 @@ static ParameterError url_query(const char *nextarg, | |
| static ParameterError set_data(cmdline_t cmd, | |
| const char *nextarg, | |
| - | struct GlobalConfig *global, |
| struct OperationConfig *config) | |
| { | |
| char *postdata = NULL; | |
| FILE *file; | |
| size_t size = 0; | |
| ParameterError err = PARAM_OK; | |
| + | struct GlobalConfig *global = config->global; |
| if(cmd == C_DATA_URLENCODE) { /* --data-urlencode */ | |
| err = data_urlencode(global, nextarg, &postdata, &size); | |
| @@ -1039,8 +1037,7 @@ const struct LongShort *findlongopt(const char *opt) | |
| sizeof(aliases[0]), findarg); | |
| } | |
| - | static ParameterError add_url(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static ParameterError add_url(struct OperationConfig *config, |
| const char *thisurl, | |
| bool remote_noglob) | |
| { | |
| @@ -1076,15 +1073,14 @@ static ParameterError add_url(struct GlobalConfig *global, | |
| url->useremote = url->noglob = TRUE; | |
| if(!err && (++config->num_urls > 1) && | |
| (config->etag_save_file || config->etag_compare_file)) { | |
| - | errorf(global, "The etag options only work on a single URL"); |
| + | errorf(config->global, "The etag options only work on a single URL"); |
| return PARAM_BAD_USE; | |
| } | |
| } | |
| return err; | |
| } | |
| - | static ParameterError parse_url(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static ParameterError parse_url(struct OperationConfig *config, |
| const char *nextarg) | |
| { | |
| /* nextarg is never NULL here */ | |
| @@ -1104,7 +1100,7 @@ static ParameterError parse_url(struct GlobalConfig *global, | |
| curlx_dyn_init(&line, 8092); | |
| while(my_get_line(f, &line, &error)) { | |
| const char *ptr = curlx_dyn_ptr(&line); | |
| - | err = add_url(global, config, ptr, TRUE); |
| + | err = add_url(config, ptr, TRUE); |
| if(err) | |
| break; | |
| } | |
| @@ -1117,7 +1113,7 @@ static ParameterError parse_url(struct GlobalConfig *global, | |
| } | |
| return PARAM_READ_ERROR; /* file not found */ | |
| } | |
| - | return add_url(global, config, nextarg, FALSE); |
| + | return add_url(config, nextarg, FALSE); |
| } | |
| @@ -1157,10 +1153,10 @@ static ParameterError parse_localport(struct OperationConfig *config, | |
| return PARAM_OK; | |
| } | |
| - | static ParameterError parse_continue_at(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static ParameterError parse_continue_at(struct OperationConfig *config, |
| const char *nextarg) | |
| { | |
| + | struct GlobalConfig *global = config->global; |
| ParameterError err = PARAM_OK; | |
| if(config->range) { | |
| errorf(global, "--continue-at is mutually exclusive with --range"); | |
| @@ -1189,8 +1185,7 @@ static ParameterError parse_continue_at(struct GlobalConfig *global, | |
| return err; | |
| } | |
| - | static ParameterError parse_ech(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static ParameterError parse_ech(struct OperationConfig *config, |
| const char *nextarg) | |
| { | |
| ParameterError err = PARAM_OK; | |
| @@ -1218,7 +1213,7 @@ static ParameterError parse_ech(struct GlobalConfig *global, | |
| file = fopen(nextarg, FOPEN_READTEXT); | |
| } | |
| if(!file) { | |
| - | warnf(global, |
| + | warnf(config->global, |
| "Couldn't read file \"%s\" " | |
| "specified for \"--ech ecl:\" option", | |
| nextarg); | |
| @@ -1242,8 +1237,7 @@ static ParameterError parse_ech(struct GlobalConfig *global, | |
| return err; | |
| } | |
| - | static ParameterError parse_header(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static ParameterError parse_header(struct OperationConfig *config, |
| cmdline_t cmd, | |
| const char *nextarg) | |
| { | |
| @@ -1255,7 +1249,7 @@ static ParameterError parse_header(struct GlobalConfig *global, | |
| bool use_stdin = !strcmp(&nextarg[1], "-"); | |
| FILE *file = use_stdin ? stdin : fopen(&nextarg[1], FOPEN_READTEXT); | |
| if(!file) { | |
| - | errorf(global, "Failed to open %s", &nextarg[1]); |
| + | errorf(config->global, "Failed to open %s", &nextarg[1]); |
| err = PARAM_READ_ERROR; | |
| } | |
| else { | |
| @@ -1384,13 +1378,13 @@ static ParameterError parse_quote(struct OperationConfig *config, | |
| return err; | |
| } | |
| - | static ParameterError parse_range(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static ParameterError parse_range(struct OperationConfig *config, |
| const char *nextarg) | |
| { | |
| ParameterError err = PARAM_OK; | |
| curl_off_t value; | |
| const char *orig = nextarg; | |
| + | struct GlobalConfig *global = config->global; |
| if(config->use_resume) { | |
| errorf(global, "--continue-at is mutually exclusive with --range"); | |
| @@ -1527,8 +1521,7 @@ static ParameterError parse_verbose(struct GlobalConfig *global, | |
| return err; | |
| } | |
| - | static ParameterError parse_writeout(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static ParameterError parse_writeout(struct OperationConfig *config, |
| const char *nextarg) | |
| { | |
| ParameterError err = PARAM_OK; | |
| @@ -1548,7 +1541,7 @@ static ParameterError parse_writeout(struct GlobalConfig *global, | |
| fname = nextarg; | |
| file = fopen(fname, FOPEN_READTEXT); | |
| if(!file) { | |
| - | errorf(global, "Failed to open %s", fname); |
| + | errorf(config->global, "Failed to open %s", fname); |
| return PARAM_READ_ERROR; | |
| } | |
| } | |
| @@ -1559,7 +1552,7 @@ static ParameterError parse_writeout(struct GlobalConfig *global, | |
| if(err) | |
| return err; | |
| if(!config->writeout) | |
| - | warnf(global, "Failed to read %s", fname); |
| + | warnf(config->global, "Failed to read %s", fname); |
| } | |
| else | |
| err = getstr(&config->writeout, nextarg, ALLOW_BLANK); | |
| @@ -1567,8 +1560,7 @@ static ParameterError parse_writeout(struct GlobalConfig *global, | |
| return err; | |
| } | |
| - | static ParameterError parse_time_cond(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static ParameterError parse_time_cond(struct OperationConfig *config, |
| const char *nextarg) | |
| { | |
| ParameterError err = PARAM_OK; | |
| @@ -1596,14 +1588,14 @@ static ParameterError parse_time_cond(struct GlobalConfig *global, | |
| if(-1 == config->condtime) { | |
| curl_off_t value; | |
| /* now let's see if it is a filename to get the time from instead! */ | |
| - | int rc = getfiletime(nextarg, global, &value); |
| + | int rc = getfiletime(nextarg, config->global, &value); |
| if(!rc) | |
| /* pull the time out from the file */ | |
| config->condtime = value; | |
| else { | |
| /* failed, remove time condition */ | |
| config->timecond = CURL_TIMECOND_NONE; | |
| - | warnf(global, |
| + | warnf(config->global, |
| "Illegal date format for -z, --time-cond (and not " | |
| "a filename). Disabling time condition. " | |
| "See curl_getdate(3) for valid date syntax."); | |
| @@ -1691,8 +1683,7 @@ static void opt_depr(struct GlobalConfig *global, | |
| } | |
| /* opt_none is the function that handles ARG_NONE options */ | |
| - | static ParameterError opt_none(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static ParameterError opt_none(struct OperationConfig *config, |
| const struct LongShort *a) | |
| { | |
| switch(a->cmd) { | |
| @@ -1707,37 +1698,37 @@ static ParameterError opt_none(struct GlobalConfig *global, | |
| case C_HTTP1_0: /* --http1.0 */ | |
| /* HTTP version 1.0 */ | |
| - | sethttpver(global, config, CURL_HTTP_VERSION_1_0); |
| + | sethttpver(config, CURL_HTTP_VERSION_1_0); |
| break; | |
| case C_HTTP1_1: /* --http1.1 */ | |
| /* HTTP version 1.1 */ | |
| - | sethttpver(global, config, CURL_HTTP_VERSION_1_1); |
| + | sethttpver(config, CURL_HTTP_VERSION_1_1); |
| break; | |
| case C_HTTP2: /* --http2 */ | |
| /* HTTP version 2.0 */ | |
| if(!feature_http2) | |
| return PARAM_LIBCURL_DOESNT_SUPPORT; | |
| - | sethttpver(global, config, CURL_HTTP_VERSION_2_0); |
| + | sethttpver(config, CURL_HTTP_VERSION_2_0); |
| break; | |
| case C_HTTP2_PRIOR_KNOWLEDGE: /* --http2-prior-knowledge */ | |
| /* HTTP version 2.0 over clean TCP */ | |
| if(!feature_http2) | |
| return PARAM_LIBCURL_DOESNT_SUPPORT; | |
| - | sethttpver(global, config, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE); |
| + | sethttpver(config, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE); |
| break; | |
| case C_HTTP3: /* --http3: */ | |
| /* Try HTTP/3, allow fallback */ | |
| if(!feature_http3) | |
| return PARAM_LIBCURL_DOESNT_SUPPORT; | |
| else | |
| - | sethttpver(global, config, CURL_HTTP_VERSION_3); |
| + | sethttpver(config, CURL_HTTP_VERSION_3); |
| break; | |
| case C_HTTP3_ONLY: /* --http3-only */ | |
| /* Try HTTP/3 without fallback */ | |
| if(!feature_http3) | |
| return PARAM_LIBCURL_DOESNT_SUPPORT; | |
| else | |
| - | sethttpver(global, config, CURL_HTTP_VERSION_3ONLY); |
| + | sethttpver(config, CURL_HTTP_VERSION_3ONLY); |
| break; | |
| case C_TLSV1: /* --tlsv1 */ | |
| config->ssl_version = CURL_SSLVERSION_TLSv1; | |
| @@ -1771,11 +1762,11 @@ static ParameterError opt_none(struct GlobalConfig *global, | |
| } | |
| /* opt_bool is the function that handles boolean options */ | |
| - | static ParameterError opt_bool(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static ParameterError opt_bool(struct OperationConfig *config, |
| const struct LongShort *a, | |
| bool toggle) | |
| { | |
| + | struct GlobalConfig *global = config->global; |
| switch(a->cmd) { | |
| case C_ALPN: /* --alpn */ | |
| config->noalpn = !toggle; | |
| @@ -2161,13 +2152,13 @@ static ParameterError opt_bool(struct GlobalConfig *global, | |
| /* opt_filestring handles string and file options */ | |
| - | static ParameterError opt_filestring(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static ParameterError opt_filestring(struct OperationConfig *config, |
| const struct LongShort *a, | |
| const char *nextarg) | |
| { | |
| ParameterError err = PARAM_OK; | |
| curl_off_t value; | |
| + | struct GlobalConfig *global = config->global; |
| static const char *redir_protos[] = { | |
| "http", | |
| "https", | |
| @@ -2292,7 +2283,7 @@ static ParameterError opt_filestring(struct GlobalConfig *global, | |
| config->max_filesize = value; | |
| break; | |
| case C_URL: /* --url */ | |
| - | err = parse_url(global, config, nextarg); |
| + | err = parse_url(config, nextarg); |
| break; | |
| case C_SOCKS5: /* --socks5 */ | |
| /* socks5 proxy to use, and resolves the name locally and passes on the | |
| @@ -2480,7 +2471,7 @@ static ParameterError opt_filestring(struct GlobalConfig *global, | |
| err = getstr(&config->cookiejar, nextarg, DENY_BLANK); | |
| break; | |
| case C_CONTINUE_AT: /* --continue-at */ | |
| - | err = parse_continue_at(global, config, nextarg); |
| + | err = parse_continue_at(config, nextarg); |
| break; | |
| case C_DATA: /* --data */ | |
| case C_DATA_ASCII: /* --data-ascii */ | |
| @@ -2488,10 +2479,10 @@ static ParameterError opt_filestring(struct GlobalConfig *global, | |
| case C_DATA_URLENCODE: /* --data-urlencode */ | |
| case C_JSON: /* --json */ | |
| case C_DATA_RAW: /* --data-raw */ | |
| - | err = set_data((cmdline_t)a->cmd, nextarg, global, config); |
| + | err = set_data((cmdline_t)a->cmd, nextarg, config); |
| break; | |
| case C_URL_QUERY: /* --url-query */ | |
| - | err = url_query(nextarg, global, config); |
| + | err = url_query(nextarg, config); |
| break; | |
| case C_DUMP_HEADER: /* --dump-header */ | |
| err = getstr(&config->headerfile, nextarg, DENY_BLANK); | |
| @@ -2540,7 +2531,7 @@ static ParameterError opt_filestring(struct GlobalConfig *global, | |
| } | |
| break; | |
| case C_ECH: /* --ech */ | |
| - | err = parse_ech(global, config, nextarg); |
| + | err = parse_ech(config, nextarg); |
| break; | |
| case C_CAPATH: /* --capath */ | |
| err = getstr(&config->capath, nextarg, DENY_BLANK); | |
| @@ -2690,7 +2681,7 @@ static ParameterError opt_filestring(struct GlobalConfig *global, | |
| break; | |
| case C_HEADER: /* --header */ | |
| case C_PROXY_HEADER: /* --proxy-header */ | |
| - | err = parse_header(global, config, (cmdline_t)a->cmd, nextarg); |
| + | err = parse_header(config, (cmdline_t)a->cmd, nextarg); |
| break; | |
| case C_CONFIG: /* --config */ | |
| if(parseconfig(nextarg, global)) { | |
| @@ -2727,7 +2718,7 @@ static ParameterError opt_filestring(struct GlobalConfig *global, | |
| err = parse_quote(config, nextarg); | |
| break; | |
| case C_RANGE: /* --range */ | |
| - | err = parse_range(global, config, nextarg); |
| + | err = parse_range(config, nextarg); |
| break; | |
| case C_TELNET_OPTION: /* --telnet-option */ | |
| /* Telnet options */ | |
| @@ -2745,7 +2736,7 @@ static ParameterError opt_filestring(struct GlobalConfig *global, | |
| err = getstr(&config->proxyuserpwd, nextarg, ALLOW_BLANK); | |
| break; | |
| case C_WRITE_OUT: /* --write-out */ | |
| - | err = parse_writeout(global, config, nextarg); |
| + | err = parse_writeout(config, nextarg); |
| break; | |
| case C_PREPROXY: /* --preproxy */ | |
| err = getstr(&config->preproxy, nextarg, DENY_BLANK); | |
| @@ -2786,7 +2777,7 @@ static ParameterError opt_filestring(struct GlobalConfig *global, | |
| break; | |
| } | |
| case C_TIME_COND: /* --time-cond */ | |
| - | err = parse_time_cond(global, config, nextarg); |
| + | err = parse_time_cond(config, nextarg); |
| break; | |
| case C_UPLOAD_FLAGS: /* --upload-flags */ | |
| err = parse_upload_flags(config, nextarg); | |
| @@ -2799,7 +2790,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| const char *nextarg, /* NULL if unset */ | |
| bool *usedarg, /* set to TRUE if the arg | |
| has been used */ | |
| - | struct GlobalConfig *global, |
| struct OperationConfig *config) | |
| { | |
| const char *parse = NULL; | |
| @@ -2810,6 +2800,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| by using --OPTION or --no-OPTION */ | |
| bool nextalloc = FALSE; /* if nextarg is allocated */ | |
| const struct LongShort *a = NULL; | |
| + | struct GlobalConfig *global = config->global; |
| verbose_nopts = 0; /* options processed in `flag`*/ | |
| *usedarg = FALSE; /* default is that we do not use the arg */ | |
| @@ -2921,7 +2912,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| nextarg); | |
| } | |
| /* ARG_FILE | ARG_STRG */ | |
| - | err = opt_filestring(global, config, a, nextarg); |
| + | err = opt_filestring(config, a, nextarg); |
| if(a->desc & ARG_CLEAR) | |
| cleanarg(CURL_UNCONST(nextarg)); | |
| } | |
| @@ -2932,9 +2923,9 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| } | |
| /* ARG_NONE | ARG_BOOL */ | |
| if(ARGTYPE(a->desc) == ARG_BOOL) | |
| - | err = opt_bool(global, config, a, toggle); |
| + | err = opt_bool(config, a, toggle); |
| else | |
| - | err = opt_none(global, config, a); |
| + | err = opt_none(config, a); |
| } | |
| ++verbose_nopts; /* processed one option from `flag` input, loop for | |
| @@ -2978,7 +2969,7 @@ ParameterError parse_args(struct GlobalConfig *global, int argc, | |
| } | |
| } | |
| - | result = getparameter(orig_opt, nextarg, &passarg, global, config); |
| + | result = getparameter(orig_opt, nextarg, &passarg, config); |
| unicodefree(nextarg); | |
| config = global->last; | |
| @@ -3014,7 +3005,7 @@ ParameterError parse_args(struct GlobalConfig *global, int argc, | |
| bool used; | |
| /* Just add the URL please */ | |
| - | result = getparameter("--url", orig_opt, &used, global, config); |
| + | result = getparameter("--url", orig_opt, &used, config); |
| } | |
| if(!result) { | |
src/tool_getparam.h+1 -2
| @@ -365,8 +365,7 @@ const struct LongShort *findshortopt(char letter); | |
| ParameterError getparameter(const char *flag, const char *nextarg, | |
| bool *usedarg, | |
| - | struct GlobalConfig *global, |
| - | struct OperationConfig *operation); |
| + | struct OperationConfig *config); |
| #ifdef UNITTESTS | |
| void parse_cert_parameter(const char *cert_parameter, | |
src/tool_operate.c+36 -38
| @@ -110,8 +110,7 @@ extern const unsigned char curl_ca_embed[]; | |
| "this situation and\nhow to fix it, please visit the webpage mentioned " \ | |
| "above.\n" | |
| - | static CURLcode single_transfer(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static CURLcode single_transfer(struct OperationConfig *config, |
| CURLSH *share, | |
| bool *added, | |
| bool *skipped); | |
| @@ -273,6 +272,8 @@ static CURLcode pre_transfer(struct GlobalConfig *global, | |
| CURLcode result = CURLE_OK; | |
| #ifdef CURL_DISABLE_LIBCURL_OPTION | |
| (void)global; /* otherwise used in the my_setopt macros */ | |
| + | #else |
| + | struct OperationConfig *config = global->current; |
| #endif | |
| if(per->uploadfile && !stdin_upload(per->uploadfile)) { | |
| @@ -772,8 +773,7 @@ static CURLcode set_cert_types(struct OperationConfig *config) | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode append2query(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static CURLcode append2query(struct OperationConfig *config, |
| struct per_transfer *per, | |
| const char *q) | |
| { | |
| @@ -785,7 +785,7 @@ static CURLcode append2query(struct GlobalConfig *global, | |
| CURLU_GUESS_SCHEME); | |
| if(uerr) { | |
| result = urlerr_cvt(uerr); | |
| - | errorf(global, "(%d) Could not parse the URL, " |
| + | errorf(config->global, "(%d) Could not parse the URL, " |
| "failed to set query", result); | |
| config->synthetic_error = TRUE; | |
| } | |
| @@ -807,8 +807,7 @@ static CURLcode append2query(struct GlobalConfig *global, | |
| return result; | |
| } | |
| - | static CURLcode etag_compare(struct GlobalConfig *global, |
| - | struct OperationConfig *config) |
| + | static CURLcode etag_compare(struct OperationConfig *config) |
| { | |
| CURLcode result = CURLE_OK; | |
| char *etag_from_file = NULL; | |
| @@ -818,7 +817,7 @@ static CURLcode etag_compare(struct GlobalConfig *global, | |
| /* open file for reading: */ | |
| FILE *file = fopen(config->etag_compare_file, FOPEN_READTEXT); | |
| if(!file) | |
| - | warnf(global, "Failed to open %s: %s", config->etag_compare_file, |
| + | warnf(config->global, "Failed to open %s: %s", config->etag_compare_file, |
| strerror(errno)); | |
| if((PARAM_OK == file2string(&etag_from_file, file)) && | |
| @@ -832,7 +831,7 @@ static CURLcode etag_compare(struct GlobalConfig *global, | |
| if(!header) { | |
| if(file) | |
| fclose(file); | |
| - | errorf(global, |
| + | errorf(config->global, |
| "Failed to allocate memory for custom etag header"); | |
| return CURLE_OUT_OF_MEMORY; | |
| } | |
| @@ -848,13 +847,13 @@ static CURLcode etag_compare(struct GlobalConfig *global, | |
| return result; | |
| } | |
| - | static CURLcode etag_store(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static CURLcode etag_store(struct OperationConfig *config, |
| struct OutStruct *etag_save, | |
| bool *skip) | |
| { | |
| if(config->create_dirs) { | |
| - | CURLcode result = create_dir_hierarchy(config->etag_save_file, global); |
| + | CURLcode result = create_dir_hierarchy(config->etag_save_file, |
| + | config->global); |
| if(result) | |
| return result; | |
| } | |
| @@ -864,7 +863,7 @@ static CURLcode etag_store(struct GlobalConfig *global, | |
| FILE *newfile = fopen(config->etag_save_file, "ab"); | |
| if(!newfile) { | |
| struct State *state = &config->state; | |
| - | warnf(global, "Failed creating file for saving etags: \"%s\". " |
| + | warnf(config->global, "Failed creating file for saving etags: \"%s\". " |
| "Skip this transfer", config->etag_save_file); | |
| tool_safefree(state->outfiles); | |
| glob_cleanup(&state->urls); | |
| @@ -885,8 +884,7 @@ static CURLcode etag_store(struct GlobalConfig *global, | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode setup_headerfile(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static CURLcode setup_headerfile(struct OperationConfig *config, |
| struct per_transfer *per, | |
| struct OutStruct *heads) | |
| { | |
| @@ -909,7 +907,8 @@ static CURLcode setup_headerfile(struct GlobalConfig *global, | |
| * that it does not need to be opened/closed for every transfer. | |
| */ | |
| if(config->create_dirs) { | |
| - | CURLcode result = create_dir_hierarchy(config->headerfile, global); |
| + | CURLcode result = create_dir_hierarchy(config->headerfile, |
| + | config->global); |
| /* create_dir_hierarchy shows error upon CURLE_WRITE_ERROR */ | |
| if(result) | |
| return result; | |
| @@ -922,7 +921,7 @@ static CURLcode setup_headerfile(struct GlobalConfig *global, | |
| newfile = fopen(config->headerfile, "ab"); | |
| if(!newfile) { | |
| - | errorf(global, "Failed to open %s", config->headerfile); |
| + | errorf(config->global, "Failed to open %s", config->headerfile); |
| return CURLE_WRITE_ERROR; | |
| } | |
| else { | |
| @@ -939,8 +938,7 @@ static CURLcode setup_headerfile(struct GlobalConfig *global, | |
| return CURLE_OK; | |
| } | |
| - | static CURLcode setup_outfile(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static CURLcode setup_outfile(struct OperationConfig *config, |
| struct per_transfer *per, | |
| struct OutStruct *outs, | |
| bool *skipped) | |
| @@ -950,6 +948,7 @@ static CURLcode setup_outfile(struct GlobalConfig *global, | |
| * decided we want to use the remote filename. | |
| */ | |
| struct State *state = &config->state; | |
| + | struct GlobalConfig *global = config->global; |
| if(!per->outfile) { | |
| /* extract the filename from the URL */ | |
| @@ -1044,10 +1043,10 @@ static CURLcode setup_outfile(struct GlobalConfig *global, | |
| return CURLE_OK; | |
| } | |
| - | static void check_stdin_upload(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static void check_stdin_upload(struct OperationConfig *config, |
| struct per_transfer *per) | |
| { | |
| + | struct GlobalConfig *global = config->global; |
| /* count to see if there are more than one auth bit set | |
| in the authtype field */ | |
| int authbits = 0; | |
| @@ -1105,14 +1104,14 @@ static void check_stdin_upload(struct GlobalConfig *global, | |
| } | |
| /* create the next (singular) transfer */ | |
| - | static CURLcode single_transfer(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static CURLcode single_transfer(struct OperationConfig *config, |
| CURLSH *share, | |
| bool *added, | |
| bool *skipped) | |
| { | |
| CURLcode result = CURLE_OK; | |
| struct getout *urlnode; | |
| + | struct GlobalConfig *global = config->global; |
| bool orig_noprogress = global->noprogress; | |
| bool orig_isatty = global->isatty; | |
| struct State *state = &config->state; | |
| @@ -1239,14 +1238,14 @@ static CURLcode single_transfer(struct GlobalConfig *global, | |
| /* --etag-compare */ | |
| if(config->etag_compare_file) { | |
| - | result = etag_compare(global, config); |
| + | result = etag_compare(config); |
| if(result) | |
| break; | |
| } | |
| if(config->etag_save_file) { | |
| bool badetag = FALSE; | |
| - | result = etag_store(global, config, etag_save, &badetag); |
| + | result = etag_store(config, etag_save, &badetag); |
| if(result || badetag) | |
| break; | |
| } | |
| @@ -1288,7 +1287,7 @@ static CURLcode single_transfer(struct GlobalConfig *global, | |
| /* Single header file for all URLs */ | |
| if(config->headerfile) { | |
| - | result = setup_headerfile(global, config, per, heads); |
| + | result = setup_headerfile(config, per, heads); |
| if(result) | |
| break; | |
| } | |
| @@ -1330,7 +1329,7 @@ static CURLcode single_transfer(struct GlobalConfig *global, | |
| if((urlnode->useremote || | |
| (per->outfile && strcmp("-", per->outfile)))) { | |
| - | result = setup_outfile(global, config, per, outs, skipped); |
| + | result = setup_outfile(config, per, outs, skipped); |
| if(result) | |
| break; | |
| } | |
| @@ -1338,7 +1337,7 @@ static CURLcode single_transfer(struct GlobalConfig *global, | |
| if(per->uploadfile) { | |
| if(stdin_upload(per->uploadfile)) | |
| - | check_stdin_upload(global, config, per); |
| + | check_stdin_upload(config, per); |
| else { | |
| /* | |
| * We have specified a file to upload and it is not "-". | |
| @@ -1366,7 +1365,7 @@ static CURLcode single_transfer(struct GlobalConfig *global, | |
| } | |
| if(httpgetfields || config->query) { | |
| - | result = append2query(global, config, per, |
| + | result = append2query(config, per, |
| httpgetfields ? httpgetfields : config->query); | |
| if(result) | |
| break; | |
| @@ -1394,7 +1393,7 @@ static CURLcode single_transfer(struct GlobalConfig *global, | |
| hdrcbdata->global = global; | |
| hdrcbdata->config = config; | |
| - | result = config2setopts(global, config, per, curl, share); |
| + | result = config2setopts(config, per, curl, share); |
| if(result) | |
| break; | |
| @@ -1847,7 +1846,8 @@ static CURLcode check_finished(struct parastate *s) | |
| } | |
| if(checkmore) { | |
| /* one or more transfers completed, add more! */ | |
| - | CURLcode tres = add_parallel_transfers(global, s->multi, s->share, |
| + | CURLcode tres = add_parallel_transfers(global, |
| + | s->multi, s->share, |
| &s->more_transfers, | |
| &s->added_transfers); | |
| if(tres) | |
| @@ -2132,8 +2132,7 @@ fail: | |
| } | |
| /* setup a transfer for the given config */ | |
| - | static CURLcode transfer_per_config(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static CURLcode transfer_per_config(struct OperationConfig *config, |
| CURLSH *share, | |
| bool *added, | |
| bool *skipped) | |
| @@ -2173,7 +2172,7 @@ static CURLcode transfer_per_config(struct GlobalConfig *global, | |
| } | |
| if(!result) | |
| - | result = single_transfer(global, config, share, added, skipped); |
| + | result = single_transfer(config, share, added, skipped); |
| return result; | |
| } | |
| @@ -2190,8 +2189,7 @@ static CURLcode create_transfer(struct GlobalConfig *global, | |
| CURLcode result = CURLE_OK; | |
| *added = FALSE; | |
| while(global->current) { | |
| - | result = transfer_per_config(global, global->current, share, added, |
| - | skipped); |
| + | result = transfer_per_config(global->current, share, added, skipped); |
| if(!result && !*added) { | |
| /* when one set is drained, continue to next */ | |
| global->current = global->current->next; | |
| @@ -2341,7 +2339,7 @@ CURLcode operate(struct GlobalConfig *global, int argc, argv_item_t argv[]) | |
| curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_HSTS); | |
| if(global->ssl_sessions && feature_ssls_export) | |
| - | result = tool_ssls_load(global, global->first, share, |
| + | result = tool_ssls_load(global->first, share, |
| global->ssl_sessions); | |
| if(!result) { | |
| @@ -2359,7 +2357,7 @@ CURLcode operate(struct GlobalConfig *global, int argc, argv_item_t argv[]) | |
| result = run_all_transfers(global, share, result); | |
| if(global->ssl_sessions && feature_ssls_export) { | |
| - | CURLcode r2 = tool_ssls_save(global, global->first, share, |
| + | CURLcode r2 = tool_ssls_save(global->first, share, |
| global->ssl_sessions); | |
| if(r2 && !result) | |
| result = r2; | |
src/tool_parsecfg.c+12 -12
| @@ -46,7 +46,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global) | |
| FILE *file = NULL; | |
| bool usedarg = FALSE; | |
| int rc = 0; | |
| - | struct OperationConfig *operation = global->last; |
| + | struct OperationConfig *config = global->last; |
| char *pathalloc = NULL; | |
| if(!filename) { | |
| @@ -156,9 +156,9 @@ int parseconfig(const char *filename, struct GlobalConfig *global) | |
| case '#': /* comment */ | |
| break; | |
| default: | |
| - | warnf(operation->global, "%s:%d: warning: '%s' uses unquoted " |
| + | warnf(config->global, "%s:%d: warning: '%s' uses unquoted " |
| "whitespace", filename, lineno, option); | |
| - | warnf(operation->global, "This may cause side-effects. " |
| + | warnf(config->global, "This may cause side-effects. " |
| "Consider using double quotes?"); | |
| } | |
| } | |
| @@ -171,24 +171,24 @@ int parseconfig(const char *filename, struct GlobalConfig *global) | |
| #ifdef DEBUG_CONFIG | |
| fprintf(tool_stderr, "PARAM: \"%s\"\n",(param ? param : "(null)")); | |
| #endif | |
| - | res = getparameter(option, param, &usedarg, global, operation); |
| - | operation = global->last; |
| + | res = getparameter(option, param, &usedarg, config); |
| + | config = global->last; |
| if(!res && param && *param && !usedarg) | |
| /* we passed in a parameter that was not used! */ | |
| res = PARAM_GOT_EXTRA_PARAMETER; | |
| if(res == PARAM_NEXT_OPERATION) { | |
| - | if(operation->url_list && operation->url_list->url) { |
| + | if(config->url_list && config->url_list->url) { |
| /* Allocate the next config */ | |
| - | operation->next = config_alloc(global); |
| - | if(operation->next) { |
| + | config->next = config_alloc(global); |
| + | if(config->next) { |
| /* Update the last operation pointer */ | |
| - | global->last = operation->next; |
| + | global->last = config->next; |
| /* Move onto the new config */ | |
| - | operation->next->prev = operation; |
| - | operation = operation->next; |
| + | config->next->prev = config; |
| + | config = config->next; |
| } | |
| else | |
| res = PARAM_NO_MEM; | |
| @@ -206,7 +206,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global) | |
| res != PARAM_ENGINES_REQUESTED && | |
| res != PARAM_CA_EMBED_REQUESTED) { | |
| const char *reason = param2text(res); | |
| - | errorf(operation->global, "%s:%d: '%s' %s", |
| + | errorf(config->global, "%s:%d: '%s' %s", |
| filename, lineno, option, reason); | |
| rc = (int)res; | |
| } | |
src/tool_setopt.c+25 -27
| @@ -223,7 +223,7 @@ static char *c_escape(const char *str, curl_off_t len) | |
| } | |
| /* setopt wrapper for enum types */ | |
| - | CURLcode tool_setopt_enum(CURL *curl, struct GlobalConfig *global, |
| + | CURLcode tool_setopt_enum(CURL *curl, struct OperationConfig *config, |
| const char *name, CURLoption tag, | |
| const struct NameValue *nvlist, long lval) | |
| { | |
| @@ -234,7 +234,7 @@ CURLcode tool_setopt_enum(CURL *curl, struct GlobalConfig *global, | |
| if(!lval) | |
| skip = TRUE; | |
| - | if(global->libcurl && !skip && !ret) { |
| + | if(config->global->libcurl && !skip && !ret) { |
| /* we only use this for real if --libcurl was used */ | |
| const struct NameValue *nv = NULL; | |
| for(nv = nvlist; nv->name; nv++) { | |
| @@ -256,13 +256,13 @@ CURLcode tool_setopt_enum(CURL *curl, struct GlobalConfig *global, | |
| #ifdef DEBUGBUILD | |
| if(ret) | |
| - | warnf(global, "option %s returned error (%d)", name, (int)ret); |
| + | warnf(config->global, "option %s returned error (%d)", name, (int)ret); |
| #endif | |
| return ret; | |
| } | |
| /* setopt wrapper for CURLOPT_SSLVERSION */ | |
| - | CURLcode tool_setopt_SSLVERSION(CURL *curl, struct GlobalConfig *global, |
| + | CURLcode tool_setopt_SSLVERSION(CURL *curl, struct OperationConfig *config, |
| const char *name, CURLoption tag, | |
| long lval) | |
| { | |
| @@ -273,7 +273,7 @@ CURLcode tool_setopt_SSLVERSION(CURL *curl, struct GlobalConfig *global, | |
| if(!lval) | |
| skip = TRUE; | |
| - | if(global->libcurl && !skip && !ret) { |
| + | if(config->global->libcurl && !skip && !ret) { |
| /* we only use this for real if --libcurl was used */ | |
| const struct NameValue *nv = NULL; | |
| const struct NameValue *nv2 = NULL; | |
| @@ -301,13 +301,13 @@ CURLcode tool_setopt_SSLVERSION(CURL *curl, struct GlobalConfig *global, | |
| #ifdef DEBUGBUILD | |
| if(ret) | |
| - | warnf(global, "option %s returned error (%d)", name, (int)ret); |
| + | warnf(config->global, "option %s returned error (%d)", name, (int)ret); |
| #endif | |
| return ret; | |
| } | |
| /* setopt wrapper for bitmasks */ | |
| - | CURLcode tool_setopt_bitmask(CURL *curl, struct GlobalConfig *global, |
| + | CURLcode tool_setopt_bitmask(CURL *curl, struct OperationConfig *config, |
| const char *name, CURLoption tag, | |
| const struct NameValueUnsigned *nvlist, | |
| long lval) | |
| @@ -317,7 +317,7 @@ CURLcode tool_setopt_bitmask(CURL *curl, struct GlobalConfig *global, | |
| if(!lval) | |
| skip = TRUE; | |
| - | if(global->libcurl && !skip && !ret) { |
| + | if(config->global->libcurl && !skip && !ret) { |
| /* we only use this for real if --libcurl was used */ | |
| char preamble[80]; | |
| unsigned long rest = (unsigned long)lval; | |
| @@ -379,13 +379,13 @@ static CURLcode libcurl_generate_slist(struct curl_slist *slist, int *slistno) | |
| } | |
| static CURLcode libcurl_generate_mime(CURL *curl, | |
| - | struct GlobalConfig *global, |
| + | struct OperationConfig *config, |
| struct tool_mime *toolmime, | |
| int *mimeno); /* Forward. */ | |
| /* Wrapper to generate source code for a mime part. */ | |
| static CURLcode libcurl_generate_mime_part(CURL *curl, | |
| - | struct GlobalConfig *global, |
| + | struct OperationConfig *config, |
| struct tool_mime *part, | |
| int mimeno) | |
| { | |
| @@ -396,7 +396,7 @@ static CURLcode libcurl_generate_mime_part(CURL *curl, | |
| /* Parts are linked in reverse order. */ | |
| if(part->prev) | |
| - | ret = libcurl_generate_mime_part(curl, global, part->prev, mimeno); |
| + | ret = libcurl_generate_mime_part(curl, config, part->prev, mimeno); |
| /* Create the part. */ | |
| if(!ret) | |
| @@ -407,7 +407,7 @@ static CURLcode libcurl_generate_mime_part(CURL *curl, | |
| switch(part->kind) { | |
| case TOOLMIME_PARTS: | |
| - | ret = libcurl_generate_mime(curl, global, part, &submimeno); |
| + | ret = libcurl_generate_mime(curl, config, part, &submimeno); |
| if(!ret) { | |
| ret = easysrc_addf(&easysrc_code, "curl_mime_subparts(part%d, mime%d);", | |
| mimeno, submimeno); | |
| @@ -507,7 +507,7 @@ static CURLcode libcurl_generate_mime_part(CURL *curl, | |
| /* Wrapper to generate source code for a mime structure. */ | |
| static CURLcode libcurl_generate_mime(CURL *curl, | |
| - | struct GlobalConfig *global, |
| + | struct OperationConfig *config, |
| struct tool_mime *toolmime, | |
| int *mimeno) | |
| { | |
| @@ -529,7 +529,7 @@ static CURLcode libcurl_generate_mime(CURL *curl, | |
| if(toolmime->subparts && !ret) { | |
| ret = easysrc_addf(&easysrc_decl, "curl_mimepart *part%d;", *mimeno); | |
| if(!ret) | |
| - | ret = libcurl_generate_mime_part(curl, global, |
| + | ret = libcurl_generate_mime_part(curl, config, |
| toolmime->subparts, *mimeno); | |
| } | |
| @@ -537,16 +537,15 @@ static CURLcode libcurl_generate_mime(CURL *curl, | |
| } | |
| /* setopt wrapper for CURLOPT_MIMEPOST */ | |
| - | CURLcode tool_setopt_mimepost(CURL *curl, struct GlobalConfig *global, |
| + | CURLcode tool_setopt_mimepost(CURL *curl, struct OperationConfig *config, |
| const char *name, CURLoption tag, | |
| curl_mime *mimepost) | |
| { | |
| CURLcode ret = curl_easy_setopt(curl, tag, mimepost); | |
| int mimeno = 0; | |
| - | if(!ret && global->libcurl) { |
| - | ret = libcurl_generate_mime(curl, global, |
| - | global->current->mimeroot, &mimeno); |
| + | if(!ret && config->global->libcurl) { |
| + | ret = libcurl_generate_mime(curl, config, config->mimeroot, &mimeno); |
| if(!ret) | |
| ret = easysrc_addf(&easysrc_code, "curl_easy_setopt(hnd, %s, mime%d);", | |
| @@ -557,7 +556,7 @@ CURLcode tool_setopt_mimepost(CURL *curl, struct GlobalConfig *global, | |
| } | |
| /* setopt wrapper for curl_slist options */ | |
| - | CURLcode tool_setopt_slist(CURL *curl, struct GlobalConfig *global, |
| + | CURLcode tool_setopt_slist(CURL *curl, struct OperationConfig *config, |
| const char *name, CURLoption tag, | |
| struct curl_slist *list) | |
| { | |
| @@ -565,7 +564,7 @@ CURLcode tool_setopt_slist(CURL *curl, struct GlobalConfig *global, | |
| ret = curl_easy_setopt(curl, tag, list); | |
| - | if(global->libcurl && list && !ret) { |
| + | if(config->global->libcurl && list && !ret) { |
| int i; | |
| ret = libcurl_generate_slist(list, &i); | |
| @@ -578,7 +577,7 @@ CURLcode tool_setopt_slist(CURL *curl, struct GlobalConfig *global, | |
| } | |
| /* options that set long */ | |
| - | CURLcode tool_setopt_long(CURL *curl, struct GlobalConfig *global, |
| + | CURLcode tool_setopt_long(CURL *curl, struct OperationConfig *config, |
| const char *name, CURLoption tag, | |
| long lval) | |
| { | |
| @@ -595,7 +594,7 @@ CURLcode tool_setopt_long(CURL *curl, struct GlobalConfig *global, | |
| } | |
| ret = curl_easy_setopt(curl, tag, lval); | |
| - | if((lval != defval) && global->libcurl && !ret) { |
| + | if((lval != defval) && config->global->libcurl && !ret) { |
| /* we only use this for real if --libcurl was used */ | |
| ret = easysrc_addf(&easysrc_code, "curl_easy_setopt(hnd, %s, %ldL);", | |
| name, lval); | |
| @@ -604,7 +603,7 @@ CURLcode tool_setopt_long(CURL *curl, struct GlobalConfig *global, | |
| } | |
| /* options that set curl_off_t */ | |
| - | CURLcode tool_setopt_offt(CURL *curl, struct GlobalConfig *global, |
| + | CURLcode tool_setopt_offt(CURL *curl, struct OperationConfig *config, |
| const char *name, CURLoption tag, | |
| curl_off_t lval) | |
| { | |
| @@ -612,7 +611,7 @@ CURLcode tool_setopt_offt(CURL *curl, struct GlobalConfig *global, | |
| DEBUGASSERT((tag >= CURLOPTTYPE_OFF_T) && (tag < CURLOPTTYPE_BLOB)); | |
| ret = curl_easy_setopt(curl, tag, lval); | |
| - | if(global->libcurl && !ret && lval) { |
| + | if(config->global->libcurl && !ret && lval) { |
| /* we only use this for real if --libcurl was used */ | |
| ret = easysrc_addf(&easysrc_code, "curl_easy_setopt(hnd, %s, (curl_off_t)%" | |
| CURL_FORMAT_CURL_OFF_T ");", name, lval); | |
| @@ -622,8 +621,7 @@ CURLcode tool_setopt_offt(CURL *curl, struct GlobalConfig *global, | |
| } | |
| /* setopt wrapper for setting object and function pointer options */ | |
| - | CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | CURLcode tool_setopt(CURL *curl, bool str, struct OperationConfig *config, |
| const char *name, CURLoption tag, ...) | |
| { | |
| va_list arg; | |
| @@ -645,7 +643,7 @@ CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global, | |
| va_end(arg); | |
| - | if(global->libcurl && pval && !ret) { |
| + | if(config->global->libcurl && pval && !ret) { |
| /* we only use this if --libcurl was used */ | |
| if(!str) { | |
src/tool_setopt.h+18 -18
| @@ -75,60 +75,60 @@ extern const struct NameValueUnsigned setopt_nv_CURLHSTS[]; | |
| /* Intercept setopt calls for --libcurl */ | |
| - | CURLcode tool_setopt_enum(CURL *curl, struct GlobalConfig *global, |
| + | CURLcode tool_setopt_enum(CURL *curl, struct OperationConfig *config, |
| const char *name, CURLoption tag, | |
| const struct NameValue *nv, long lval); | |
| - | CURLcode tool_setopt_SSLVERSION(CURL *curl, struct GlobalConfig *global, |
| + | CURLcode tool_setopt_SSLVERSION(CURL *curl, struct OperationConfig *config, |
| const char *name, CURLoption tag, | |
| long lval); | |
| - | CURLcode tool_setopt_flags(CURL *curl, struct GlobalConfig *global, |
| + | CURLcode tool_setopt_flags(CURL *curl, struct OperationConfig *config, |
| const char *name, CURLoption tag, | |
| const struct NameValue *nv, long lval); | |
| - | CURLcode tool_setopt_bitmask(CURL *curl, struct GlobalConfig *global, |
| + | CURLcode tool_setopt_bitmask(CURL *curl, struct OperationConfig *config, |
| const char *name, CURLoption tag, | |
| const struct NameValueUnsigned *nv, long lval); | |
| - | CURLcode tool_setopt_mimepost(CURL *curl, struct GlobalConfig *global, |
| + | CURLcode tool_setopt_mimepost(CURL *curl, struct OperationConfig *config, |
| const char *name, CURLoption tag, | |
| curl_mime *mimepost); | |
| - | CURLcode tool_setopt_slist(CURL *curl, struct GlobalConfig *global, |
| + | CURLcode tool_setopt_slist(CURL *curl, struct OperationConfig *config, |
| const char *name, CURLoption tag, | |
| struct curl_slist *list); | |
| - | CURLcode tool_setopt_long(CURL *curl, struct GlobalConfig *global, |
| + | CURLcode tool_setopt_long(CURL *curl, struct OperationConfig *config, |
| const char *name, CURLoption tag, | |
| long lval); | |
| - | CURLcode tool_setopt_offt(CURL *curl, struct GlobalConfig *global, |
| + | CURLcode tool_setopt_offt(CURL *curl, struct OperationConfig *config, |
| const char *name, CURLoption tag, | |
| curl_off_t lval); | |
| - | CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global, |
| + | CURLcode tool_setopt(CURL *curl, bool str, |
| struct OperationConfig *config, | |
| const char *name, CURLoption tag, ...); | |
| #define my_setopt(x,y,z) \ | |
| - | tool_setopt(x, FALSE, global, config, #y, y, z) |
| + | tool_setopt(x, FALSE, config, #y, y, z) |
| #define my_setopt_long(x,y,z) \ | |
| - | tool_setopt_long(x, global, #y, y, z) |
| + | tool_setopt_long(x, config, #y, y, z) |
| #define my_setopt_offt(x,y,z) \ | |
| - | tool_setopt_offt(x, global, #y, y, z) |
| + | tool_setopt_offt(x, config, #y, y, z) |
| #define my_setopt_str(x,y,z) \ | |
| - | tool_setopt(x, TRUE, global, config, #y, y, z) |
| + | tool_setopt(x, TRUE, config, #y, y, z) |
| #define my_setopt_enum(x,y,z) \ | |
| - | tool_setopt_enum(x, global, #y, y, setopt_nv_ ## y, z) |
| + | tool_setopt_enum(x, config, #y, y, setopt_nv_ ## y, z) |
| #define my_setopt_SSLVERSION(x,y,z) \ | |
| - | tool_setopt_SSLVERSION(x, global, #y, y, z) |
| + | tool_setopt_SSLVERSION(x, config, #y, y, z) |
| #define my_setopt_bitmask(x,y,z) \ | |
| - | tool_setopt_bitmask(x, global, #y, y, setopt_nv_ ## y, z) |
| + | tool_setopt_bitmask(x, config, #y, y, setopt_nv_ ## y, z) |
| #define my_setopt_mimepost(x,y,z) \ | |
| - | tool_setopt_mimepost(x, global, #y, y, z) |
| + | tool_setopt_mimepost(x, config, #y, y, z) |
| #define my_setopt_slist(x,y,z) \ | |
| - | tool_setopt_slist(x, global, #y, y, z) |
| + | tool_setopt_slist(x, config, #y, y, z) |
| #else /* CURL_DISABLE_LIBCURL_OPTION */ | |
src/tool_ssls.c+10 -10
| @@ -34,11 +34,11 @@ | |
| #define MAX_SSLS_LINE (64 * 1024) | |
| - | static CURLcode tool_ssls_easy(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | static CURLcode tool_ssls_easy(struct OperationConfig *config, |
| CURLSH *share, CURL **peasy) | |
| { | |
| CURLcode result = CURLE_OK; | |
| + | struct GlobalConfig *global = config->global; |
| *peasy = curl_easy_init(); | |
| if(!*peasy) | |
| @@ -53,8 +53,7 @@ static CURLcode tool_ssls_easy(struct GlobalConfig *global, | |
| return result; | |
| } | |
| - | CURLcode tool_ssls_load(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | CURLcode tool_ssls_load(struct OperationConfig *config, |
| CURLSH *share, const char *filename) | |
| { | |
| FILE *fp; | |
| @@ -66,6 +65,7 @@ CURLcode tool_ssls_load(struct GlobalConfig *global, | |
| CURLcode r = CURLE_OK; | |
| int i, imported; | |
| bool error = FALSE; | |
| + | struct GlobalConfig *global = config->global; |
| curlx_dyn_init(&buf, MAX_SSLS_LINE); | |
| fp = fopen(filename, FOPEN_READTEXT); | |
| @@ -74,7 +74,7 @@ CURLcode tool_ssls_load(struct GlobalConfig *global, | |
| goto out; | |
| } | |
| - | r = tool_ssls_easy(global, config, share, &easy); |
| + | r = tool_ssls_easy(config, share, &easy); |
| if(r) | |
| goto out; | |
| @@ -187,23 +187,23 @@ out: | |
| return r; | |
| } | |
| - | CURLcode tool_ssls_save(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | CURLcode tool_ssls_save(struct OperationConfig *config, |
| CURLSH *share, const char *filename) | |
| { | |
| struct tool_ssls_ctx ctx; | |
| CURL *easy = NULL; | |
| CURLcode r = CURLE_OK; | |
| - | ctx.global = global; |
| + | ctx.global = config->global; |
| ctx.exported = 0; | |
| ctx.fp = fopen(filename, FOPEN_WRITETEXT); | |
| if(!ctx.fp) { | |
| - | warnf(global, "Warning: Failed to create SSL session file %s", filename); |
| + | warnf(config->global, "Warning: Failed to create SSL session file %s", |
| + | filename); |
| goto out; | |
| } | |
| - | r = tool_ssls_easy(global, config, share, &easy); |
| + | r = tool_ssls_easy(config, share, &easy); |
| if(r) | |
| goto out; | |
src/tool_ssls.h+2 -4
| @@ -27,11 +27,9 @@ | |
| #include "tool_operate.h" | |
| - | CURLcode tool_ssls_load(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | CURLcode tool_ssls_load(struct OperationConfig *config, |
| CURLSH *share, const char *filename); | |
| - | CURLcode tool_ssls_save(struct GlobalConfig *global, |
| - | struct OperationConfig *config, |
| + | CURLcode tool_ssls_save(struct OperationConfig *config, |
| CURLSH *share, const char *filename); | |
| #endif /* HEADER_CURL_TOOL_SSLS_H */ | |