tool_getparam: unify the cmdline switch() into a single one
—
$ git checkout -f f6e97effb6d6b7b6cd5f30ba2525d9e20bd70cc1
Previous HEAD position was 8aecfad9e6 tool_getparam: move the --data logic into set_data()
HEAD is now at f6e97effb6 tool_getparam: unify the cmdline switch() into a single one
$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
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/curl.1
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/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/base64.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curl_multibyte.o
Removing lib/dynbuf.o
Removing lib/libcurl.la
Removing lib/libcurl.plist
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-thread.lo
Removing lib/libcurl_la-asyn-thread.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.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-c-hyper.lo
Removing lib/libcurl_la-c-hyper.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-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_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_ntlm_wb.lo
Removing lib/libcurl_la-curl_ntlm_wb.o
Removing lib/libcurl_la-curl_path.lo
Removing lib/libcurl_la-curl_path.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_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-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.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-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-hostasyn.lo
Removing lib/libcurl_la-hostasyn.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-hostsyn.lo
Removing lib/libcurl_la-hostsyn.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-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-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-inet_pton.lo
Removing lib/libcurl_la-inet_pton.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-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-nonblock.lo
Removing lib/libcurl_la-nonblock.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-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-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strtok.lo
Removing lib/libcurl_la-strtok.o
Removing lib/libcurl_la-strtoofft.lo
Removing lib/libcurl_la-strtoofft.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-timediff.lo
Removing lib/libcurl_la-timediff.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.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-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/nonblock.o
Removing lib/stamp-h1
Removing lib/strtoofft.o
Removing lib/timediff.o
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/version_win32.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_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
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/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.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-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.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/warnless.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/slist_wc.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_cb_dbg.o
Removing src/tool_cb_hdr.o
Removing src/tool_cb_prg.o
Removing src/tool_cb_rea.o
Removing src/tool_cb_see.o
Removing src/tool_cb_wrt.o
Removing src/tool_cfgable.o
Removing src/tool_dirhie.o
Removing src/tool_doswin.o
Removing src/tool_easysrc.o
Removing src/tool_filetime.o
Removing src/tool_findfile.o
Removing src/tool_formparse.o
Removing src/tool_getparam.o
Removing src/tool_getpass.o
Removing src/tool_help.o
Removing src/tool_helpers.o
Removing src/tool_hugehelp.c
Removing src/tool_hugehelp.o
Removing src/tool_ipfs.o
Removing src/tool_libinfo.o
Removing src/tool_listhelp.o
Removing src/tool_main.o
Removing src/tool_msgs.o
Removing src/tool_operate.o
Removing src/tool_operhlp.o
Removing src/tool_paramhlp.o
Removing src/tool_parsecfg.o
Removing src/tool_progress.o
Removing src/tool_setopt.o
Removing src/tool_sleep.o
Removing src/tool_stderr.o
Removing src/tool_strdup.o
Removing src/tool_urlglob.o
Removing src/tool_util.o
Removing src/tool_vms.o
Removing src/tool_writeout.o
Removing src/tool_writeout_json.o
Removing src/tool_xattr.o
Removing src/var.o
Removing test-driver
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile
Removing tests/certs/scripts/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/clients/.deps/
Removing tests/http/clients/Makefile
Removing tests/http/clients/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/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:123: installing './compile'
configure.ac:424: installing './config.guess'
configure.ac:424: installing './config.sub'
configure.ac:123: installing './install-sh'
configure.ac:129: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
parallel-tests: installing './test-driver'
$ 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 ECH 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.6.0-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... 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 for inline... inline
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 SGI MIPSpro C... no
checking if compiler is SGI MIPS C... no
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 file API... no
checking whether build target supports WIN32 crypto API... no
checking for good-to-use Darwin CFLAGS... no
checking whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
checking to see if the compiler supports __builtin_available()... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... 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 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 sys/time.h... 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 sys/time.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 Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for library containing psl_builtin... -lpsl
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to enable Windows native IDN (Windows native builds only)... 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 pkg-config... (cached) /usr/bin/pkg-config
checking for fish options with pkg-config... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for unistd.h... (cached) yes
checking for stdlib.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/stat.h... (cached) yes
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 socket.h... no
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/socket.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 in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.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 for sys/types.h... (cached) yes
checking for socket.h... (cached) no
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.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 can be linked... yes
checking if gethostbyname is prototyped... yes
checking if gethostbyname is compilable... yes
checking if gethostbyname usage allowed... yes
checking if gethostbyname might be used... 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 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 net/if.h... (cached) yes
checking if if_nametoindex can be linked... yes
checking if if_nametoindex is prototyped... yes
checking if if_nametoindex is compilable... yes
checking if if_nametoindex usage allowed... yes
checking if if_nametoindex might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.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 for sys/types.h... (cached) yes
checking for sys/time.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 sys/socket.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 for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/socket.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... no
checking if memrchr might be used... no
checking for sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
checking if poll can be linked... yes
checking if poll is prototyped... yes
checking if poll is compilable... yes
checking if poll seems to work... yes
checking if poll usage allowed... yes
checking if poll 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 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 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... no
checking if strerror_r is POSIX 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 if stricmp can be linked... no
checking if stricmp might be used... no
checking if strtok_r can be linked... yes
checking if strtok_r is prototyped... yes
checking if strtok_r is compilable... yes
checking if strtok_r usage allowed... yes
checking if strtok_r might be used... yes
checking if strtoll can be linked... yes
checking if strtoll is prototyped... yes
checking if strtoll is compilable... yes
checking if strtoll usage allowed... yes
checking if strtoll might be used... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for _fseeki64... no
checking deeper for _fseeki64... but still no
checking for arc4random... no
checking deeper for arc4random... but still no
checking for fnmatch... yes
checking for fseeko... yes
checking for geteuid... yes
checking for getpass_r... no
checking deeper for getpass_r... but still 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 deeper for mach_absolute_time... but still no
checking for pipe... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setmode... no
checking deeper for setmode... but still no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
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 for gnroff... no
checking for nroff... /usr/bin/nroff
checking how to use *nroff to get plain text from man pages... -man
checking whether to enable the threaded resolver... yes
checking whether to use POSIX threads for threaded resolver... auto
checking for pthread.h... yes
checking for pthread_create... 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 NTLM delegation to winbind's helper... no
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 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 support WebSockets... no
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 lib/libcurl.plist
config.status: creating tests/Makefile
config.status: creating tests/config
config.status: creating tests/certs/Makefile
config.status: creating tests/certs/scripts/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/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating tests/http/clients/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
CPPFLAGS:
LDFLAGS:
LIBS: -lpsl -lz
curl version: 8.6.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,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 libcurl: Shared=no, Static=yes
Built-in manual: enabled
--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 fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
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-msh3)
ECH: no (--enable-ech)
WebSockets: no (--enable-websockets)
Protocols: DICT FILE FTP GOPHER HTTP IMAP IPFS IPNS MQTT POP3 RTSP SMTP TELNET TFTP
Features: AsynchDNS IPv6 Largefile PSL UnixSockets alt-svc libz threadsafe
configure: WARNING: unrecognized options: --disable-docs
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libraries for IDN support: IDN disabled
configure: WARNING: unrecognized options: --disable-docs
$ 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-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-base64.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.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-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_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_ntlm_wb.lo
CC libcurl_la-curl_path.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-dict.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynhds.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-file.lo
CC libcurl_la-fopen.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-hostasyn.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hostsyn.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_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.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-netrc.lo
CC libcurl_la-nonblock.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-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-strerror.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-ws.lo
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-bearssl.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-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.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_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-wolfssh.lo
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 src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in ../docs
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
if test "..x" != "..x" -a -e "./curl.1"; then \
/usr/bin/install -c -m 644 "./curl.1" /root/asi_db/builds/curl/_worktrees/w0/docs/curl.1 \
&& touch -r "./curl.1" /root/asi_db/builds/curl/_worktrees/w0/docs/curl.1; fi
cd cmdline-opts && make
make[4]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
GENERATE ../../docs/curl.1
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC slist_wc.o
CC tool_binmode.o
CC tool_bname.o
CC tool_cb_dbg.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_rea.o
CC tool_cb_see.o
CC tool_cb_wrt.o
CC tool_cfgable.o
CC tool_dirhie.o
CC tool_doswin.o
CC tool_easysrc.o
CC tool_findfile.o
CC tool_filetime.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
CC tool_helpers.o
HUGE tool_hugehelp.c
CC tool_ipfs.o
CC tool_libinfo.o
CC tool_listhelp.o
CC tool_main.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_stderr.o
CC tool_strdup.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
CC tool_hugehelp.o
CC ../lib/base64.o
CC ../lib/curl_multibyte.o
CC ../lib/dynbuf.o
CC ../lib/nonblock.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/version_win32.o
CC ../lib/warnless.o
CCLD curl
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
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'
| @@ -760,6 +760,8 @@ static const struct LongShort *single(char letter) | |
| return singles[letter - ' ']; | |
| } | |
| + | #define ONEOPT(x,y) (((int)x << 8) | y) |
| + | |
| ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| char *nextarg, /* NULL if unset */ | |
| argv_item_t cleararg, | |
| @@ -788,6 +790,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| NULL | |
| }; | |
| const struct LongShort *a = NULL; | |
| + | curl_off_t value; |
| #ifdef HAVE_WRITABLE_ARGV | |
| argv_item_t clearthis = NULL; | |
| #else | |
| @@ -913,802 +916,745 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| that aware of that state */ | |
| nextarg = (char *)""; | |
| - | switch(letter) { |
| - | case '*': /* options without a short option */ |
| - | switch(subletter) { |
| - | case '4': /* --dns-ipv4-addr */ |
| - | if(!curlinfo->ares_num) /* c-ares is needed for this */ |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | else |
| - | /* addr in dot notation */ |
| - | err = getstr(&config->dns_ipv4_addr, nextarg, DENY_BLANK); |
| - | break; |
| - | case '6': /* --dns-ipv6-addr */ |
| - | if(!curlinfo->ares_num) /* c-ares is needed for this */ |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | else |
| - | /* addr in dot notation */ |
| - | err = getstr(&config->dns_ipv6_addr, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'a': /* random-file */ |
| - | break; |
| - | case 'b': /* egd-file */ |
| - | break; |
| - | case 'B': /* OAuth 2.0 bearer token */ |
| - | err = getstr(&config->oauth_bearer, nextarg, DENY_BLANK); |
| - | if(!err) { |
| - | cleanarg(clearthis); |
| - | config->authtype |= CURLAUTH_BEARER; |
| - | } |
| - | break; |
| - | case 'c': /* connect-timeout */ |
| - | err = secs2ms(&config->connecttimeout_ms, nextarg); |
| - | break; |
| - | case 'C': /* doh-url */ |
| - | err = getstr(&config->doh_url, nextarg, ALLOW_BLANK); |
| - | if(!err && config->doh_url && !config->doh_url[0]) |
| - | /* if given a blank string, make it NULL again */ |
| - | Curl_safefree(config->doh_url); |
| - | break; |
| - | case 'd': /* ciphers */ |
| - | err = getstr(&config->cipher_list, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'D': /* --dns-interface */ |
| - | if(!curlinfo->ares_num) /* c-ares is needed for this */ |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | else |
| - | /* interface name */ |
| - | err = getstr(&config->dns_interface, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'e': /* --disable-epsv */ |
| - | config->disable_epsv = toggle; |
| - | break; |
| - | case 'f': /* --disallow-username-in-url */ |
| - | config->disallow_username_in_url = toggle; |
| - | break; |
| - | case 'E': /* --epsv */ |
| - | config->disable_epsv = (!toggle)?TRUE:FALSE; |
| - | break; |
| - | case 'F': /* --dns-servers */ |
| - | if(!curlinfo->ares_num) /* c-ares is needed for this */ |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | else |
| - | /* IP addrs of DNS servers */ |
| - | err = getstr(&config->dns_servers, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'g': /* --trace */ |
| - | err = getstr(&global->trace_dump, nextarg, DENY_BLANK); |
| - | if(!err) { |
| - | if(global->tracetype && (global->tracetype != TRACE_BIN)) |
| - | warnf(global, "--trace overrides an earlier trace/verbose option"); |
| - | global->tracetype = TRACE_BIN; |
| - | } |
| - | break; |
| - | case 'G': /* --npn */ |
| - | warnf(global, "--npn is no longer supported"); |
| - | break; |
| - | case 'h': /* --trace-ascii */ |
| - | err = getstr(&global->trace_dump, nextarg, DENY_BLANK); |
| - | if(!err) { |
| - | if(global->tracetype && (global->tracetype != TRACE_ASCII)) |
| - | warnf(global, |
| - | "--trace-ascii overrides an earlier trace/verbose option"); |
| - | global->tracetype = TRACE_ASCII; |
| - | } |
| - | break; |
| - | case 'H': /* --alpn */ |
| - | config->noalpn = (!toggle)?TRUE:FALSE; |
| - | break; |
| - | case 'i': /* --limit-rate */ |
| - | { |
| - | curl_off_t value; |
| - | err = GetSizeParameter(global, nextarg, "rate", &value); |
| - | if(err) |
| - | break; |
| + | switch(ONEOPT(letter, subletter)) { |
| + | case ONEOPT('*', '4'): /* --dns-ipv4-addr */ |
| + | if(!curlinfo->ares_num) /* c-ares is needed for this */ |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | else |
| + | /* addr in dot notation */ |
| + | err = getstr(&config->dns_ipv4_addr, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('*', '6'): /* --dns-ipv6-addr */ |
| + | if(!curlinfo->ares_num) /* c-ares is needed for this */ |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | else |
| + | /* addr in dot notation */ |
| + | err = getstr(&config->dns_ipv6_addr, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('*', 'a'): /* --random-file */ |
| + | break; |
| + | case ONEOPT('*', 'b'): /* --egd-file */ |
| + | break; |
| + | case ONEOPT('*', 'B'): /* --oauth2-bearer */ |
| + | err = getstr(&config->oauth_bearer, nextarg, DENY_BLANK); |
| + | if(!err) { |
| + | cleanarg(clearthis); |
| + | config->authtype |= CURLAUTH_BEARER; |
| + | } |
| + | break; |
| + | case ONEOPT('*', 'c'): /* --connect-timeout */ |
| + | err = secs2ms(&config->connecttimeout_ms, nextarg); |
| + | break; |
| + | case ONEOPT('*', 'C'): /* --doh-url */ |
| + | err = getstr(&config->doh_url, nextarg, ALLOW_BLANK); |
| + | if(!err && config->doh_url && !config->doh_url[0]) |
| + | /* if given a blank string, make it NULL again */ |
| + | Curl_safefree(config->doh_url); |
| + | break; |
| + | case ONEOPT('*', 'd'): /* -- ciphers */ |
| + | err = getstr(&config->cipher_list, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('*', 'D'): /* --dns-interface */ |
| + | if(!curlinfo->ares_num) /* c-ares is needed for this */ |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | else |
| + | /* interface name */ |
| + | err = getstr(&config->dns_interface, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('*', 'e'): /* --disable-epsv */ |
| + | config->disable_epsv = toggle; |
| + | break; |
| + | case ONEOPT('*', 'f'): /* --disallow-username-in-url */ |
| + | config->disallow_username_in_url = toggle; |
| + | break; |
| + | case ONEOPT('*', 'E'): /* --epsv */ |
| + | config->disable_epsv = (!toggle)?TRUE:FALSE; |
| + | break; |
| + | case ONEOPT('*', 'F'): /* --dns-servers */ |
| + | if(!curlinfo->ares_num) /* c-ares is needed for this */ |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | else |
| + | /* IP addrs of DNS servers */ |
| + | err = getstr(&config->dns_servers, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('*', 'g'): /* --trace */ |
| + | err = getstr(&global->trace_dump, nextarg, DENY_BLANK); |
| + | if(!err) { |
| + | if(global->tracetype && (global->tracetype != TRACE_BIN)) |
| + | warnf(global, "--trace overrides an earlier trace/verbose option"); |
| + | global->tracetype = TRACE_BIN; |
| + | } |
| + | break; |
| + | case ONEOPT('*', 'G'): /* --npn */ |
| + | warnf(global, "--npn is no longer supported"); |
| + | break; |
| + | case ONEOPT('*', 'h'): /* --trace-ascii */ |
| + | err = getstr(&global->trace_dump, nextarg, DENY_BLANK); |
| + | if(!err) { |
| + | if(global->tracetype && (global->tracetype != TRACE_ASCII)) |
| + | warnf(global, |
| + | "--trace-ascii overrides an earlier trace/verbose option"); |
| + | global->tracetype = TRACE_ASCII; |
| + | } |
| + | break; |
| + | case ONEOPT('*', 'H'): /* --alpn */ |
| + | config->noalpn = (!toggle)?TRUE:FALSE; |
| + | break; |
| + | case ONEOPT('*', 'i'): /* --limit-rate */ |
| + | err = GetSizeParameter(global, nextarg, "rate", &value); |
| + | if(!err) { |
| config->recvpersecond = value; | |
| config->sendpersecond = value; | |
| } | |
| break; | |
| - | case 'I': /* --rate (request rate) */ |
| - | { |
| - | /* support a few different suffixes, extract the suffix first, then |
| - | get the number and convert to per hour. |
| - | /s == per second |
| - | /m == per minute |
| - | /h == per hour (default) |
| - | /d == per day (24 hours) |
| - | */ |
| - | char *div = strchr(nextarg, '/'); |
| - | char number[26]; |
| - | long denominator; |
| - | long numerator = 60*60*1000; /* default per hour */ |
| - | size_t numlen = div ? (size_t)(div - nextarg) : strlen(nextarg); |
| - | if(numlen > sizeof(number)-1) { |
| - | err = PARAM_NUMBER_TOO_LARGE; |
| + | case ONEOPT('*', 'I'): { /* --rate */ |
| + | /* support a few different suffixes, extract the suffix first, then |
| + | get the number and convert to per hour. |
| + | /s == per second |
| + | /m == per minute |
| + | /h == per hour (default) |
| + | /d == per day (24 hours) |
| + | */ |
| + | char *div = strchr(nextarg, '/'); |
| + | char number[26]; |
| + | long denominator; |
| + | long numerator = 60*60*1000; /* default per hour */ |
| + | size_t numlen = div ? (size_t)(div - nextarg) : strlen(nextarg); |
| + | if(numlen > sizeof(number)-1) { |
| + | err = PARAM_NUMBER_TOO_LARGE; |
| + | break; |
| + | } |
| + | strncpy(number, nextarg, numlen); |
| + | number[numlen] = 0; |
| + | err = str2unum(&denominator, number); |
| + | if(err) |
| + | break; |
| + | |
| + | if(denominator < 1) { |
| + | err = PARAM_BAD_USE; |
| + | break; |
| + | } |
| + | if(div) { |
| + | char unit = div[1]; |
| + | switch(unit) { |
| + | case 's': /* per second */ |
| + | numerator = 1000; |
| break; | |
| - | } |
| - | strncpy(number, nextarg, numlen); |
| - | number[numlen] = 0; |
| - | err = str2unum(&denominator, number); |
| - | if(err) |
| + | case 'm': /* per minute */ |
| + | numerator = 60*1000; |
| break; | |
| - | |
| - | if(denominator < 1) { |
| - | err = PARAM_BAD_USE; |
| + | case 'h': /* per hour */ |
| break; | |
| - | } |
| - | if(div) { |
| - | char unit = div[1]; |
| - | switch(unit) { |
| - | case 's': /* per second */ |
| - | numerator = 1000; |
| - | break; |
| - | case 'm': /* per minute */ |
| - | numerator = 60*1000; |
| - | break; |
| - | case 'h': /* per hour */ |
| - | break; |
| - | case 'd': /* per day */ |
| - | numerator = 24*60*60*1000; |
| - | break; |
| - | default: |
| - | errorf(global, "unsupported --rate unit"); |
| - | err = PARAM_BAD_USE; |
| - | break; |
| - | } |
| - | } |
| - | |
| - | if(denominator > numerator) { |
| - | err = PARAM_NUMBER_TOO_LARGE; |
| + | case 'd': /* per day */ |
| + | numerator = 24*60*60*1000; |
| + | break; |
| + | default: |
| + | errorf(global, "unsupported --rate unit"); |
| + | err = PARAM_BAD_USE; |
| break; | |
| } | |
| + | } |
| + | if(err) |
| + | ; |
| + | else if(denominator > numerator) |
| + | err = PARAM_NUMBER_TOO_LARGE; |
| + | else |
| global->ms_per_transfer = numerator/denominator; | |
| - | } |
| + | } |
| break; | |
| - | case 'j': /* --compressed */ |
| - | if(toggle && !(feature_libz || feature_brotli || feature_zstd)) { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| + | case ONEOPT('*', 'j'): /* --compressed */ |
| + | if(toggle && !(feature_libz || feature_brotli || feature_zstd)) |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | else |
| config->encoding = toggle; | |
| - | break; |
| + | break; |
| - | case 'J': /* --tr-encoding */ |
| - | config->tr_encoding = toggle; |
| - | break; |
| + | case ONEOPT('*', 'J'): /* --tr-encoding */ |
| + | config->tr_encoding = toggle; |
| + | break; |
| - | case 'k': /* --digest */ |
| - | if(toggle) |
| - | config->authtype |= CURLAUTH_DIGEST; |
| - | else |
| - | config->authtype &= ~CURLAUTH_DIGEST; |
| - | break; |
| + | case ONEOPT('*', 'k'): /* --digest */ |
| + | if(toggle) |
| + | config->authtype |= CURLAUTH_DIGEST; |
| + | else |
| + | config->authtype &= ~CURLAUTH_DIGEST; |
| + | break; |
| - | case 'l': /* --negotiate */ |
| - | if(!toggle) |
| - | config->authtype &= ~CURLAUTH_NEGOTIATE; |
| - | else if(feature_spnego) |
| - | config->authtype |= CURLAUTH_NEGOTIATE; |
| - | else { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| - | break; |
| + | case ONEOPT('*', 'l'): /* --negotiate */ |
| + | if(!toggle) |
| + | config->authtype &= ~CURLAUTH_NEGOTIATE; |
| + | else if(feature_spnego) |
| + | config->authtype |= CURLAUTH_NEGOTIATE; |
| + | else |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | break; |
| - | case 'm': /* --ntlm */ |
| - | if(!toggle) |
| - | config->authtype &= ~CURLAUTH_NTLM; |
| - | else if(feature_ntlm) |
| - | config->authtype |= CURLAUTH_NTLM; |
| - | else { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| - | break; |
| + | case ONEOPT('*', 'm'): /* --ntlm */ |
| + | if(!toggle) |
| + | config->authtype &= ~CURLAUTH_NTLM; |
| + | else if(feature_ntlm) |
| + | config->authtype |= CURLAUTH_NTLM; |
| + | else |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | break; |
| - | case 'M': /* --ntlm-wb */ |
| - | if(!toggle) |
| - | config->authtype &= ~CURLAUTH_NTLM_WB; |
| - | else if(feature_ntlm_wb) |
| - | config->authtype |= CURLAUTH_NTLM_WB; |
| - | else { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| - | break; |
| + | case ONEOPT('*', 'M'): /* --ntlm-wb */ |
| + | if(!toggle) |
| + | config->authtype &= ~CURLAUTH_NTLM_WB; |
| + | else if(feature_ntlm_wb) |
| + | config->authtype |= CURLAUTH_NTLM_WB; |
| + | else |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | break; |
| - | case 'n': /* --basic for completeness */ |
| - | if(toggle) |
| - | config->authtype |= CURLAUTH_BASIC; |
| - | else |
| - | config->authtype &= ~CURLAUTH_BASIC; |
| - | break; |
| + | case ONEOPT('*', 'n'): /* --basic */ |
| + | if(toggle) |
| + | config->authtype |= CURLAUTH_BASIC; |
| + | else |
| + | config->authtype &= ~CURLAUTH_BASIC; |
| + | break; |
| - | case 'o': /* --anyauth, let libcurl pick it */ |
| - | if(toggle) |
| - | config->authtype = CURLAUTH_ANY; |
| - | /* --no-anyauth simply doesn't touch it */ |
| - | break; |
| + | case ONEOPT('*', 'o'): /* --anyauth */ |
| + | if(toggle) |
| + | config->authtype = CURLAUTH_ANY; |
| + | /* --no-anyauth simply doesn't touch it */ |
| + | break; |
| #ifdef USE_WATT32 | |
| - | case 'p': /* --wdebug */ |
| - | dbug_init(); |
| - | break; |
| + | case ONEOPT('*', 'p'): /* --wdebug */ |
| + | dbug_init(); |
| + | break; |
| #endif | |
| - | case 'q': /* --ftp-create-dirs */ |
| - | config->ftp_create_dirs = toggle; |
| - | break; |
| + | case ONEOPT('*', 'q'): /* --ftp-create-dirs */ |
| + | config->ftp_create_dirs = toggle; |
| + | break; |
| - | case 'r': /* --create-dirs */ |
| - | config->create_dirs = toggle; |
| - | break; |
| + | case ONEOPT('*', 'r'): /* --create-dirs */ |
| + | config->create_dirs = toggle; |
| + | break; |
| - | case 'R': /* --create-file-mode */ |
| - | err = oct2nummax(&config->create_file_mode, nextarg, 0777); |
| - | break; |
| + | case ONEOPT('*', 'R'): /* --create-file-mode */ |
| + | err = oct2nummax(&config->create_file_mode, nextarg, 0777); |
| + | break; |
| - | case 's': /* --max-redirs */ |
| - | /* specified max no of redirects (http(s)), this accepts -1 as a |
| - | special condition */ |
| - | err = str2num(&config->maxredirs, nextarg); |
| - | if(err) |
| - | break; |
| - | if(config->maxredirs < -1) |
| - | err = PARAM_BAD_NUMERIC; |
| - | break; |
| + | case ONEOPT('*', 's'): /* --max-redirs */ |
| + | /* specified max no of redirects (http(s)), this accepts -1 as a |
| + | special condition */ |
| + | err = str2num(&config->maxredirs, nextarg); |
| + | if(!err && (config->maxredirs < -1)) |
| + | err = PARAM_BAD_NUMERIC; |
| + | break; |
| - | case 'S': /* ipfs gateway url */ |
| - | err = getstr(&config->ipfs_gateway, nextarg, DENY_BLANK); |
| - | break; |
| + | case ONEOPT('*', 'S'): /* --ipfs-gateway */ |
| + | err = getstr(&config->ipfs_gateway, nextarg, DENY_BLANK); |
| + | break; |
| - | case 't': /* --proxy-ntlm */ |
| - | if(!feature_ntlm) { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| + | case ONEOPT('*', 't'): /* --proxy-ntlm */ |
| + | if(!feature_ntlm) |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | else |
| config->proxyntlm = toggle; | |
| - | break; |
| + | break; |
| - | case 'u': /* --crlf */ |
| - | /* LF -> CRLF conversion? */ |
| - | config->crlf = toggle; |
| - | break; |
| + | case ONEOPT('*', 'u'): /* --crlf */ |
| + | /* LF -> CRLF conversion? */ |
| + | config->crlf = toggle; |
| + | break; |
| - | case 'V': /* --aws-sigv4 */ |
| - | config->authtype |= CURLAUTH_AWS_SIGV4; |
| - | err = getstr(&config->aws_sigv4, nextarg, DENY_BLANK); |
| - | break; |
| + | case ONEOPT('*', 'V'): /* --aws-sigv4 */ |
| + | config->authtype |= CURLAUTH_AWS_SIGV4; |
| + | err = getstr(&config->aws_sigv4, nextarg, DENY_BLANK); |
| + | break; |
| - | case 'v': /* --stderr */ |
| - | tool_set_stderr_file(global, nextarg); |
| - | break; |
| - | case 'w': /* --interface */ |
| - | /* interface */ |
| - | err = getstr(&config->iface, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'x': /* --krb */ |
| - | /* kerberos level string */ |
| - | if(!feature_spnego) { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| + | case ONEOPT('*', 'v'): /* --stderr */ |
| + | tool_set_stderr_file(global, nextarg); |
| + | break; |
| + | case ONEOPT('*', 'w'): /* --interface */ |
| + | /* interface */ |
| + | err = getstr(&config->iface, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('*', 'x'): /* --krb */ |
| + | /* kerberos level string */ |
| + | if(!feature_spnego) |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | else |
| err = getstr(&config->krblevel, nextarg, DENY_BLANK); | |
| - | break; |
| - | case 'X': /* --haproxy-protocol */ |
| - | config->haproxy_protocol = toggle; |
| - | break; |
| - | case 'P': /* --haproxy-clientip */ |
| - | err = getstr(&config->haproxy_clientip, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'y': /* --max-filesize */ |
| - | { |
| - | curl_off_t value; |
| - | err = |
| - | GetSizeParameter(global, nextarg, "max-filesize", &value); |
| - | if(err) |
| - | break; |
| - | config->max_filesize = value; |
| - | } |
| - | break; |
| - | case 'z': /* --disable-eprt */ |
| - | config->disable_eprt = toggle; |
| - | break; |
| - | case 'Z': /* --eprt */ |
| - | config->disable_eprt = (!toggle)?TRUE:FALSE; |
| - | break; |
| - | case '~': /* --xattr */ |
| - | config->xattr = toggle; |
| - | break; |
| - | case '@': /* the URL! */ |
| - | if(!config->url_get) |
| - | config->url_get = config->url_list; |
| - | |
| - | if(config->url_get) { |
| - | /* there's a node here, if it already is filled-in continue to find |
| - | an "empty" node */ |
| - | while(config->url_get && (config->url_get->flags & GETOUT_URL)) |
| - | config->url_get = config->url_get->next; |
| - | } |
| + | break; |
| + | case ONEOPT('*', 'X'): /* --haproxy-protocol */ |
| + | config->haproxy_protocol = toggle; |
| + | break; |
| + | case ONEOPT('*', 'P'): /* --haproxy-clientip */ |
| + | err = getstr(&config->haproxy_clientip, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('*', 'y'): /* --max-filesize */ |
| + | err = GetSizeParameter(global, nextarg, "max-filesize", &value); |
| + | if(!err) |
| + | config->max_filesize = value; |
| + | break; |
| + | case ONEOPT('*', 'z'): /* --disable-eprt */ |
| + | config->disable_eprt = toggle; |
| + | break; |
| + | case ONEOPT('*', 'Z'): /* --eprt */ |
| + | config->disable_eprt = (!toggle)?TRUE:FALSE; |
| + | break; |
| + | case ONEOPT('*', '~'): /* --xattr */ |
| + | config->xattr = toggle; |
| + | break; |
| + | case ONEOPT('*', '@'): /* --url */ |
| + | if(!config->url_get) |
| + | config->url_get = config->url_list; |
| - | /* now there might or might not be an available node to fill in! */ |
| + | if(config->url_get) { |
| + | /* there's a node here, if it already is filled-in continue to find |
| + | an "empty" node */ |
| + | while(config->url_get && (config->url_get->flags & GETOUT_URL)) |
| + | config->url_get = config->url_get->next; |
| + | } |
| - | if(config->url_get) |
| - | /* existing node */ |
| - | url = config->url_get; |
| - | else |
| - | /* there was no free node, create one! */ |
| - | config->url_get = url = new_getout(config); |
| + | /* now there might or might not be an available node to fill in! */ |
| - | if(!url) { |
| - | err = PARAM_NO_MEM; |
| - | break; |
| - | } |
| + | if(config->url_get) |
| + | /* existing node */ |
| + | url = config->url_get; |
| + | else |
| + | /* there was no free node, create one! */ |
| + | config->url_get = url = new_getout(config); |
| - | /* fill in the URL */ |
| - | err = getstr(&url->url, nextarg, DENY_BLANK); |
| - | url->flags |= GETOUT_URL; |
| + | if(!url) { |
| + | err = PARAM_NO_MEM; |
| + | break; |
| } | |
| + | |
| + | /* fill in the URL */ |
| + | err = getstr(&url->url, nextarg, DENY_BLANK); |
| + | url->flags |= GETOUT_URL; |
| break; | |
| - | case '$': /* more options without a short option */ |
| - | switch(subletter) { |
| - | case 'a': /* --ssl */ |
| - | if(toggle && !feature_ssl) { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| - | config->ftp_ssl = toggle; |
| - | if(config->ftp_ssl) |
| - | warnf(global, |
| - | "--ssl is an insecure option, consider --ssl-reqd instead"); |
| - | break; |
| - | case 'b': /* --ftp-pasv */ |
| - | Curl_safefree(config->ftpport); |
| - | break; |
| - | case 'c': /* --socks5 specifies a socks5 proxy to use, and resolves |
| - | the name locally and passes on the resolved address */ |
| - | err = getstr(&config->proxy, nextarg, DENY_BLANK); |
| - | config->proxyver = CURLPROXY_SOCKS5; |
| - | break; |
| - | case 't': /* --socks4 specifies a socks4 proxy to use */ |
| - | err = getstr(&config->proxy, nextarg, DENY_BLANK); |
| - | config->proxyver = CURLPROXY_SOCKS4; |
| - | break; |
| - | case 'T': /* --socks4a specifies a socks4a proxy to use */ |
| - | err = getstr(&config->proxy, nextarg, DENY_BLANK); |
| - | config->proxyver = CURLPROXY_SOCKS4A; |
| - | break; |
| - | case '2': /* --socks5-hostname specifies a socks5 proxy and enables name |
| - | resolving with the proxy */ |
| - | err = getstr(&config->proxy, nextarg, DENY_BLANK); |
| - | config->proxyver = CURLPROXY_SOCKS5_HOSTNAME; |
| - | break; |
| - | case 'd': /* --tcp-nodelay option */ |
| - | config->tcp_nodelay = toggle; |
| - | break; |
| - | case 'e': /* --proxy-digest */ |
| - | config->proxydigest = toggle; |
| - | break; |
| - | case 'f': /* --proxy-basic */ |
| - | config->proxybasic = toggle; |
| - | break; |
| - | case 'g': /* --retry */ |
| - | err = str2unum(&config->req_retry, nextarg); |
| - | break; |
| - | case 'V': /* --retry-connrefused */ |
| - | config->retry_connrefused = toggle; |
| - | break; |
| - | case 'h': /* --retry-delay */ |
| - | err = str2unummax(&config->retry_delay, nextarg, LONG_MAX/1000); |
| - | break; |
| - | case 'i': /* --retry-max-time */ |
| - | err = str2unummax(&config->retry_maxtime, nextarg, LONG_MAX/1000); |
| - | break; |
| - | case '!': /* --retry-all-errors */ |
| - | config->retry_all_errors = toggle; |
| - | break; |
| - | case 'k': /* --proxy-negotiate */ |
| - | if(!feature_spnego) { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| - | config->proxynegotiate = toggle; |
| + | case ONEOPT('$', 'a'): /* --ssl */ |
| + | if(toggle && !feature_ssl) { |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| break; | |
| + | } |
| + | config->ftp_ssl = toggle; |
| + | if(config->ftp_ssl) |
| + | warnf(global, |
| + | "--ssl is an insecure option, consider --ssl-reqd instead"); |
| + | break; |
| + | case ONEOPT('$', 'b'): /* --ftp-pasv */ |
| + | Curl_safefree(config->ftpport); |
| + | break; |
| + | case ONEOPT('$', 'c'): /* --socks5 */ |
| + | /* socks5 proxy to use, and resolves the name locally and passes on the |
| + | resolved address */ |
| + | err = getstr(&config->proxy, nextarg, DENY_BLANK); |
| + | config->proxyver = CURLPROXY_SOCKS5; |
| + | break; |
| + | case ONEOPT('$', 't'): /* --socks4 */ |
| + | err = getstr(&config->proxy, nextarg, DENY_BLANK); |
| + | config->proxyver = CURLPROXY_SOCKS4; |
| + | break; |
| + | case ONEOPT('$', 'T'): /* --socks4a */ |
| + | err = getstr(&config->proxy, nextarg, DENY_BLANK); |
| + | config->proxyver = CURLPROXY_SOCKS4A; |
| + | break; |
| + | case ONEOPT('$', '2'): /* --socks5-hostname */ |
| + | err = getstr(&config->proxy, nextarg, DENY_BLANK); |
| + | config->proxyver = CURLPROXY_SOCKS5_HOSTNAME; |
| + | break; |
| + | case ONEOPT('$', 'd'): /* --tcp-nodelay */ |
| + | config->tcp_nodelay = toggle; |
| + | break; |
| + | case ONEOPT('$', 'e'): /* --proxy-digest */ |
| + | config->proxydigest = toggle; |
| + | break; |
| + | case ONEOPT('$', 'f'): /* --proxy-basic */ |
| + | config->proxybasic = toggle; |
| + | break; |
| + | case ONEOPT('$', 'g'): /* --retry */ |
| + | err = str2unum(&config->req_retry, nextarg); |
| + | break; |
| + | case ONEOPT('$', 'V'): /* --retry-connrefused */ |
| + | config->retry_connrefused = toggle; |
| + | break; |
| + | case ONEOPT('$', 'h'): /* --retry-delay */ |
| + | err = str2unummax(&config->retry_delay, nextarg, LONG_MAX/1000); |
| + | break; |
| + | case ONEOPT('$', 'i'): /* --retry-max-time */ |
| + | err = str2unummax(&config->retry_maxtime, nextarg, LONG_MAX/1000); |
| + | break; |
| + | case ONEOPT('$', '!'): /* --retry-all-errors */ |
| + | config->retry_all_errors = toggle; |
| + | break; |
| - | case 'l': /* --form-escape */ |
| - | config->mime_options &= ~CURLMIMEOPT_FORMESCAPE; |
| - | if(toggle) |
| - | config->mime_options |= CURLMIMEOPT_FORMESCAPE; |
| + | case ONEOPT('$', 'k'): /* --proxy-negotiate */ |
| + | if(!feature_spnego) { |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| break; | |
| + | } |
| + | config->proxynegotiate = toggle; |
| + | break; |
| - | case 'm': /* --ftp-account */ |
| - | err = getstr(&config->ftp_account, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'n': /* --proxy-anyauth */ |
| - | config->proxyanyauth = toggle; |
| - | break; |
| - | case 'o': /* --trace-time */ |
| - | global->tracetime = toggle; |
| - | break; |
| - | case 'p': /* --ignore-content-length */ |
| - | config->ignorecl = toggle; |
| - | break; |
| - | case 'q': /* --ftp-skip-pasv-ip */ |
| - | config->ftp_skip_ip = toggle; |
| - | break; |
| - | case 'r': /* --ftp-method (undocumented at this point) */ |
| - | config->ftp_filemethod = ftpfilemethod(config, nextarg); |
| - | break; |
| - | case 's': { /* --local-port */ |
| - | /* 16bit base 10 is 5 digits, but we allow 6 so that this catches |
| - | overflows, not just truncates */ |
| - | char lrange[7]=""; |
| - | char *p = nextarg; |
| - | while(ISDIGIT(*p)) |
| - | p++; |
| - | if(*p) { |
| - | /* if there's anything more than a plain decimal number */ |
| - | rc = sscanf(p, " - %6s", lrange); |
| - | *p = 0; /* null-terminate to make str2unum() work below */ |
| - | } |
| - | else |
| - | rc = 0; |
| + | case ONEOPT('$', 'l'): /* --form-escape */ |
| + | config->mime_options &= ~CURLMIMEOPT_FORMESCAPE; |
| + | if(toggle) |
| + | config->mime_options |= CURLMIMEOPT_FORMESCAPE; |
| + | break; |
| + | |
| + | case ONEOPT('$', 'm'): /* --ftp-account */ |
| + | err = getstr(&config->ftp_account, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('$', 'n'): /* --proxy-anyauth */ |
| + | config->proxyanyauth = toggle; |
| + | break; |
| + | case ONEOPT('$', 'o'): /* --trace-time */ |
| + | global->tracetime = toggle; |
| + | break; |
| + | case ONEOPT('$', 'p'): /* --ignore-content-length */ |
| + | config->ignorecl = toggle; |
| + | break; |
| + | case ONEOPT('$', 'q'): /* --ftp-skip-pasv-ip */ |
| + | config->ftp_skip_ip = toggle; |
| + | break; |
| + | case ONEOPT('$', 'r'): /* --ftp-method */ |
| + | config->ftp_filemethod = ftpfilemethod(config, nextarg); |
| + | break; |
| + | case ONEOPT('$', 's'): { /* --local-port */ |
| + | /* 16bit base 10 is 5 digits, but we allow 6 so that this catches |
| + | overflows, not just truncates */ |
| + | char lrange[7]=""; |
| + | char *p = nextarg; |
| + | while(ISDIGIT(*p)) |
| + | p++; |
| + | if(*p) { |
| + | /* if there's anything more than a plain decimal number */ |
| + | rc = sscanf(p, " - %6s", lrange); |
| + | *p = 0; /* null-terminate to make str2unum() work below */ |
| + | } |
| + | else |
| + | rc = 0; |
| - | err = str2unum(&config->localport, nextarg); |
| - | if(err || (config->localport > 65535)) { |
| + | err = str2unum(&config->localport, nextarg); |
| + | if(err || (config->localport > 65535)) { |
| + | err = PARAM_BAD_USE; |
| + | break; |
| + | } |
| + | if(!rc) |
| + | config->localportrange = 1; /* default number of ports to try */ |
| + | else { |
| + | err = str2unum(&config->localportrange, lrange); |
| + | if(err || (config->localportrange > 65535)) |
| err = PARAM_BAD_USE; | |
| - | break; |
| - | } |
| - | if(!rc) |
| - | config->localportrange = 1; /* default number of ports to try */ |
| else { | |
| - | err = str2unum(&config->localportrange, lrange); |
| - | if(err || (config->localportrange > 65535)) |
| + | config->localportrange -= (config->localport-1); |
| + | if(config->localportrange < 1) |
| err = PARAM_BAD_USE; | |
| - | else { |
| - | config->localportrange -= (config->localport-1); |
| - | if(config->localportrange < 1) |
| - | err = PARAM_BAD_USE; |
| - | } |
| } | |
| - | break; |
| } | |
| - | case 'u': /* --ftp-alternative-to-user */ |
| - | err = getstr(&config->ftp_alternative_to_user, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'v': /* --ssl-reqd */ |
| - | if(toggle && !feature_ssl) { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| - | config->ftp_ssl_reqd = toggle; |
| - | break; |
| - | case 'w': /* --no-sessionid */ |
| - | config->disable_sessionid = (!toggle)?TRUE:FALSE; |
| - | break; |
| - | case 'x': /* --ftp-ssl-control */ |
| - | if(toggle && !feature_ssl) { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| - | config->ftp_ssl_control = toggle; |
| - | break; |
| - | case 'y': /* --ftp-ssl-ccc */ |
| - | config->ftp_ssl_ccc = toggle; |
| - | if(!config->ftp_ssl_ccc_mode) |
| - | config->ftp_ssl_ccc_mode = CURLFTPSSL_CCC_PASSIVE; |
| + | break; |
| + | } |
| + | case ONEOPT('$', 'u'): /* --ftp-alternative-to-user */ |
| + | err = getstr(&config->ftp_alternative_to_user, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('$', 'v'): /* --ssl-reqd */ |
| + | if(toggle && !feature_ssl) { |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| break; | |
| - | case 'j': /* --ftp-ssl-ccc-mode */ |
| - | config->ftp_ssl_ccc = TRUE; |
| - | config->ftp_ssl_ccc_mode = ftpcccmethod(config, nextarg); |
| + | } |
| + | config->ftp_ssl_reqd = toggle; |
| + | break; |
| + | case ONEOPT('$', 'w'): /* --no-sessionid */ |
| + | config->disable_sessionid = (!toggle)?TRUE:FALSE; |
| + | break; |
| + | case ONEOPT('$', 'x'): /* --ftp-ssl-control */ |
| + | if(toggle && !feature_ssl) { |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| break; | |
| - | case 'z': /* --libcurl */ |
| + | } |
| + | config->ftp_ssl_control = toggle; |
| + | break; |
| + | case ONEOPT('$', 'y'): /* --ftp-ssl-ccc */ |
| + | config->ftp_ssl_ccc = toggle; |
| + | if(!config->ftp_ssl_ccc_mode) |
| + | config->ftp_ssl_ccc_mode = CURLFTPSSL_CCC_PASSIVE; |
| + | break; |
| + | case ONEOPT('$', 'j'): /* --ftp-ssl-ccc-mode */ |
| + | config->ftp_ssl_ccc = TRUE; |
| + | config->ftp_ssl_ccc_mode = ftpcccmethod(config, nextarg); |
| + | break; |
| + | case ONEOPT('$', 'z'): /* --libcurl */ |
| #ifdef CURL_DISABLE_LIBCURL_OPTION | |
| - | warnf(global, |
| - | "--libcurl option was disabled at build-time"); |
| - | err = PARAM_OPTION_UNKNOWN; |
| + | warnf(global, |
| + | "--libcurl option was disabled at build-time"); |
| + | err = PARAM_OPTION_UNKNOWN; |
| #else | |
| - | err = getstr(&global->libcurl, nextarg, DENY_BLANK); |
| + | err = getstr(&global->libcurl, nextarg, DENY_BLANK); |
| #endif | |
| - | break; |
| - | case '#': /* --raw */ |
| - | config->raw = toggle; |
| - | break; |
| - | case '0': /* --post301 */ |
| - | config->post301 = toggle; |
| - | break; |
| - | case '1': /* --no-keepalive */ |
| - | config->nokeepalive = (!toggle)?TRUE:FALSE; |
| - | break; |
| - | case '3': /* --keepalive-time */ |
| - | err = str2unum(&config->alivetime, nextarg); |
| - | break; |
| - | case '4': /* --post302 */ |
| - | config->post302 = toggle; |
| - | break; |
| - | case 'I': /* --post303 */ |
| - | config->post303 = toggle; |
| - | break; |
| - | case '5': /* --noproxy */ |
| - | /* This specifies the noproxy list */ |
| - | err = getstr(&config->noproxy, nextarg, ALLOW_BLANK); |
| - | break; |
| - | case '7': /* --socks5-gssapi-nec */ |
| - | config->socks5_gssapi_nec = toggle; |
| - | break; |
| - | case '8': /* --proxy1.0 */ |
| - | /* http 1.0 proxy */ |
| - | err = getstr(&config->proxy, nextarg, DENY_BLANK); |
| - | config->proxyver = CURLPROXY_HTTP_1_0; |
| - | break; |
| - | case '9': /* --tftp-blksize */ |
| - | err = str2unum(&config->tftp_blksize, nextarg); |
| - | break; |
| - | case 'A': /* --mail-from */ |
| - | err = getstr(&config->mail_from, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'B': /* --mail-rcpt */ |
| - | /* append receiver to a list */ |
| - | err = add2list(&config->mail_rcpt, nextarg); |
| - | break; |
| - | case 'C': /* --ftp-pret */ |
| - | config->ftp_pret = toggle; |
| - | break; |
| - | case 'D': /* --proto */ |
| - | config->proto_present = TRUE; |
| - | err = proto2num(config, built_in_protos, &config->proto_str, nextarg); |
| - | break; |
| - | case 'E': /* --proto-redir */ |
| - | config->proto_redir_present = TRUE; |
| - | if(proto2num(config, redir_protos, &config->proto_redir_str, |
| - | nextarg)) { |
| - | err = PARAM_BAD_USE; |
| - | break; |
| - | } |
| - | break; |
| - | case 'F': /* --resolve */ |
| - | err = add2list(&config->resolve, nextarg); |
| - | break; |
| - | case 'G': /* --delegation LEVEL */ |
| - | config->gssapi_delegation = delegation(config, nextarg); |
| - | break; |
| - | case 'H': /* --mail-auth */ |
| - | err = getstr(&config->mail_auth, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'J': /* --metalink */ |
| - | errorf(global, "--metalink is disabled"); |
| + | break; |
| + | case ONEOPT('$', '#'): /* --raw */ |
| + | config->raw = toggle; |
| + | break; |
| + | case ONEOPT('$', '0'): /* --post301 */ |
| + | config->post301 = toggle; |
| + | break; |
| + | case ONEOPT('$', '1'): /* --no-keepalive */ |
| + | config->nokeepalive = (!toggle)?TRUE:FALSE; |
| + | break; |
| + | case ONEOPT('$', '3'): /* --keepalive-time */ |
| + | err = str2unum(&config->alivetime, nextarg); |
| + | break; |
| + | case ONEOPT('$', '4'): /* --post302 */ |
| + | config->post302 = toggle; |
| + | break; |
| + | case ONEOPT('$', 'I'): /* --post303 */ |
| + | config->post303 = toggle; |
| + | break; |
| + | case ONEOPT('$', '5'): /* --noproxy */ |
| + | /* This specifies the noproxy list */ |
| + | err = getstr(&config->noproxy, nextarg, ALLOW_BLANK); |
| + | break; |
| + | case ONEOPT('$', '7'): /* --socks5-gssapi-nec */ |
| + | config->socks5_gssapi_nec = toggle; |
| + | break; |
| + | case ONEOPT('$', '8'): /* --proxy1.0 */ |
| + | /* http 1.0 proxy */ |
| + | err = getstr(&config->proxy, nextarg, DENY_BLANK); |
| + | config->proxyver = CURLPROXY_HTTP_1_0; |
| + | break; |
| + | case ONEOPT('$', '9'): /* --tftp-blksize */ |
| + | err = str2unum(&config->tftp_blksize, nextarg); |
| + | break; |
| + | case ONEOPT('$', 'A'): /* --mail-from */ |
| + | err = getstr(&config->mail_from, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('$', 'B'): /* --mail-rcpt */ |
| + | /* append receiver to a list */ |
| + | err = add2list(&config->mail_rcpt, nextarg); |
| + | break; |
| + | case ONEOPT('$', 'C'): /* --ftp-pret */ |
| + | config->ftp_pret = toggle; |
| + | break; |
| + | case ONEOPT('$', 'D'): /* --proto */ |
| + | config->proto_present = TRUE; |
| + | err = proto2num(config, built_in_protos, &config->proto_str, nextarg); |
| + | break; |
| + | case ONEOPT('$', 'E'): /* --proto-redir */ |
| + | config->proto_redir_present = TRUE; |
| + | if(proto2num(config, redir_protos, &config->proto_redir_str, |
| + | nextarg)) { |
| err = PARAM_BAD_USE; | |
| break; | |
| - | case '6': /* --sasl-authzid */ |
| - | err = getstr(&config->sasl_authzid, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'K': /* --sasl-ir */ |
| - | config->sasl_ir = toggle; |
| - | break; |
| - | case 'L': /* --test-event */ |
| + | } |
| + | break; |
| + | case ONEOPT('$', 'F'): /* --resolve */ |
| + | err = add2list(&config->resolve, nextarg); |
| + | break; |
| + | case ONEOPT('$', 'G'): /* --delegation */ |
| + | config->gssapi_delegation = delegation(config, nextarg); |
| + | break; |
| + | case ONEOPT('$', 'H'): /* --mail-auth */ |
| + | err = getstr(&config->mail_auth, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('$', 'J'): /* --metalink */ |
| + | errorf(global, "--metalink is disabled"); |
| + | err = PARAM_BAD_USE; |
| + | break; |
| + | case ONEOPT('$', '6'): /* --sasl-authzid */ |
| + | err = getstr(&config->sasl_authzid, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('$', 'K'): /* --sasl-ir */ |
| + | config->sasl_ir = toggle; |
| + | break; |
| + | case ONEOPT('$', 'L'): /* --test-event */ |
| #ifdef CURLDEBUG | |
| - | global->test_event_based = toggle; |
| + | global->test_event_based = toggle; |
| #else | |
| - | warnf(global, "--test-event is ignored unless a debug build"); |
| + | warnf(global, "--test-event is ignored unless a debug build"); |
| #endif | |
| - | break; |
| - | case 'M': /* --unix-socket */ |
| - | config->abstract_unix_socket = FALSE; |
| - | err = getstr(&config->unix_socket_path, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'N': /* --path-as-is */ |
| - | config->path_as_is = toggle; |
| - | break; |
| - | case 'O': /* --proxy-service-name */ |
| - | err = getstr(&config->proxy_service_name, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'P': /* --service-name */ |
| - | err = getstr(&config->service_name, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'Q': /* --proto-default */ |
| - | err = getstr(&config->proto_default, nextarg, DENY_BLANK); |
| - | if(!err) |
| - | err = check_protocol(config->proto_default); |
| - | break; |
| - | case 'R': /* --expect100-timeout */ |
| - | err = secs2ms(&config->expect100timeout_ms, nextarg); |
| - | break; |
| - | case 'S': /* --tftp-no-options */ |
| - | config->tftp_no_options = toggle; |
| - | break; |
| - | case 'U': /* --connect-to */ |
| - | err = add2list(&config->connect_to, nextarg); |
| - | break; |
| - | case 'W': /* --abstract-unix-socket */ |
| - | config->abstract_unix_socket = TRUE; |
| - | err = getstr(&config->unix_socket_path, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'X': /* --tls-max */ |
| - | err = str2tls_max(&config->ssl_version_max, nextarg); |
| - | break; |
| - | case 'Y': /* --suppress-connect-headers */ |
| - | config->suppress_connect_headers = toggle; |
| - | break; |
| - | case 'Z': /* --compressed-ssh */ |
| - | config->ssh_compression = toggle; |
| - | break; |
| - | case '~': /* --happy-eyeballs-timeout-ms */ |
| - | err = str2unum(&config->happy_eyeballs_timeout_ms, nextarg); |
| - | /* 0 is a valid value for this timeout */ |
| - | break; |
| - | case '%': /* --trace-ids */ |
| - | global->traceids = toggle; |
| - | break; |
| - | case '&': /* --trace-config */ |
| - | if(set_trace_config(global, nextarg)) { |
| - | err = PARAM_NO_MEM; |
| - | } |
| - | break; |
| - | } |
| break; | |
| - | case '#': |
| - | switch(subletter) { |
| - | case 'm': /* --progress-meter */ |
| - | global->noprogress = !toggle; |
| - | break; |
| - | default: /* --progress-bar */ |
| - | global->progressmode = |
| - | toggle ? CURL_PROGRESS_BAR : CURL_PROGRESS_STATS; |
| - | break; |
| - | } |
| + | case ONEOPT('$', 'M'): /* --unix-socket */ |
| + | config->abstract_unix_socket = FALSE; |
| + | err = getstr(&config->unix_socket_path, nextarg, DENY_BLANK); |
| break; | |
| - | case ':': |
| - | switch(subletter) { |
| - | case 'a': /* --variable */ |
| - | err = setvariable(global, nextarg); |
| - | break; |
| - | default: /* --next */ |
| - | err = PARAM_NEXT_OPERATION; |
| - | break; |
| - | } |
| + | case ONEOPT('$', 'N'): /* --path-as-is */ |
| + | config->path_as_is = toggle; |
| break; | |
| - | case '0': /* --http* options */ |
| - | switch(subletter) { |
| - | case '\0': |
| - | /* HTTP version 1.0 */ |
| - | sethttpver(global, config, CURL_HTTP_VERSION_1_0); |
| - | break; |
| - | case '1': |
| - | /* HTTP version 1.1 */ |
| - | sethttpver(global, config, CURL_HTTP_VERSION_1_1); |
| - | break; |
| - | case '2': |
| - | /* HTTP version 2.0 */ |
| - | if(!feature_http2) |
| - | return PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | sethttpver(global, config, CURL_HTTP_VERSION_2_0); |
| - | break; |
| - | case '3': /* --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); |
| - | break; |
| - | case '4': /* --http3 */ |
| - | /* Try HTTP/3, allow fallback */ |
| - | if(!feature_http3) { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| - | sethttpver(global, config, CURL_HTTP_VERSION_3); |
| - | break; |
| - | case '5': /* --http3-only */ |
| - | /* Try HTTP/3 without fallback */ |
| - | if(!feature_http3) { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| - | sethttpver(global, config, CURL_HTTP_VERSION_3ONLY); |
| - | break; |
| - | case '9': |
| - | /* Allow HTTP/0.9 responses! */ |
| - | config->http09_allowed = toggle; |
| - | break; |
| - | case 'a': |
| - | /* --proxy-http2 */ |
| - | if(!feature_httpsproxy || !feature_http2) |
| - | return PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | config->proxyver = CURLPROXY_HTTPS2; |
| - | break; |
| + | case ONEOPT('$', 'O'): /* --proxy-service-name */ |
| + | err = getstr(&config->proxy_service_name, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('$', 'P'): /* --service-name */ |
| + | err = getstr(&config->service_name, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('$', 'Q'): /* --proto-default */ |
| + | err = getstr(&config->proto_default, nextarg, DENY_BLANK); |
| + | if(!err) |
| + | err = check_protocol(config->proto_default); |
| + | break; |
| + | case ONEOPT('$', 'R'): /* --expect100-timeout */ |
| + | err = secs2ms(&config->expect100timeout_ms, nextarg); |
| + | break; |
| + | case ONEOPT('$', 'S'): /* --tftp-no-options */ |
| + | config->tftp_no_options = toggle; |
| + | break; |
| + | case ONEOPT('$', 'U'): /* --connect-to */ |
| + | err = add2list(&config->connect_to, nextarg); |
| + | break; |
| + | case ONEOPT('$', 'W'): /* --abstract-unix-socket */ |
| + | config->abstract_unix_socket = TRUE; |
| + | err = getstr(&config->unix_socket_path, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('$', 'X'): /* --tls-max */ |
| + | err = str2tls_max(&config->ssl_version_max, nextarg); |
| + | break; |
| + | case ONEOPT('$', 'Y'): /* --suppress-connect-headers */ |
| + | config->suppress_connect_headers = toggle; |
| + | break; |
| + | case ONEOPT('$', 'Z'): /* --compressed-ssh */ |
| + | config->ssh_compression = toggle; |
| + | break; |
| + | case ONEOPT('$', '~'): /* --happy-eyeballs-timeout-ms */ |
| + | err = str2unum(&config->happy_eyeballs_timeout_ms, nextarg); |
| + | /* 0 is a valid value for this timeout */ |
| + | break; |
| + | case ONEOPT('$', '%'): /* --trace-ids */ |
| + | global->traceids = toggle; |
| + | break; |
| + | case ONEOPT('$', '&'): /* --trace-config */ |
| + | if(set_trace_config(global, nextarg)) { |
| + | err = PARAM_NO_MEM; |
| } | |
| break; | |
| - | case '1': /* --tlsv1* options */ |
| - | switch(subletter) { |
| - | case '\0': |
| - | /* TLS version 1.x */ |
| - | config->ssl_version = CURL_SSLVERSION_TLSv1; |
| - | break; |
| - | case '0': |
| - | /* TLS version 1.0 */ |
| - | config->ssl_version = CURL_SSLVERSION_TLSv1_0; |
| - | break; |
| - | case '1': |
| - | /* TLS version 1.1 */ |
| - | config->ssl_version = CURL_SSLVERSION_TLSv1_1; |
| - | break; |
| - | case '2': |
| - | /* TLS version 1.2 */ |
| - | config->ssl_version = CURL_SSLVERSION_TLSv1_2; |
| - | break; |
| - | case '3': |
| - | /* TLS version 1.3 */ |
| - | config->ssl_version = CURL_SSLVERSION_TLSv1_3; |
| - | break; |
| - | case 'A': /* --tls13-ciphers */ |
| - | err = getstr(&config->cipher13_list, nextarg, DENY_BLANK); |
| + | case ONEOPT('#', 'm'): /* --progress-meter */ |
| + | global->noprogress = !toggle; |
| + | break; |
| + | case ONEOPT('#', '\0'): /* --progress-bar */ |
| + | global->progressmode = toggle ? CURL_PROGRESS_BAR : CURL_PROGRESS_STATS; |
| + | break; |
| + | |
| + | case ONEOPT(':', 'a'): /* --variable */ |
| + | err = setvariable(global, nextarg); |
| + | break; |
| + | case ONEOPT(':', '\0'): /* --next */ |
| + | err = PARAM_NEXT_OPERATION; |
| + | break; |
| + | |
| + | case ONEOPT('0', '\0'): /* --http1.0 */ |
| + | /* HTTP version 1.0 */ |
| + | sethttpver(global, config, CURL_HTTP_VERSION_1_0); |
| + | break; |
| + | case ONEOPT('0', '1'): /* --http1.1 */ |
| + | /* HTTP version 1.1 */ |
| + | sethttpver(global, config, CURL_HTTP_VERSION_1_1); |
| + | break; |
| + | case ONEOPT('0', '2'): /* --http2 */ |
| + | /* HTTP version 2.0 */ |
| + | if(!feature_http2) |
| + | return PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | sethttpver(global, config, CURL_HTTP_VERSION_2_0); |
| + | break; |
| + | case ONEOPT('0', '3'): /* --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); |
| + | break; |
| + | case ONEOPT('0', '4'): /* --http3: */ |
| + | /* Try HTTP/3, allow fallback */ |
| + | if(!feature_http3) { |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| break; | |
| - | case 'B': /* --proxy-tls13-ciphers */ |
| - | err = getstr(&config->proxy_cipher13_list, nextarg, DENY_BLANK); |
| + | } |
| + | sethttpver(global, config, CURL_HTTP_VERSION_3); |
| + | break; |
| + | case ONEOPT('0', '5'): /* --http3-only */ |
| + | /* Try HTTP/3 without fallback */ |
| + | if(!feature_http3) { |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| break; | |
| } | |
| + | sethttpver(global, config, CURL_HTTP_VERSION_3ONLY); |
| + | break; |
| + | case ONEOPT('0', '9'): /* --http0.9 */ |
| + | /* Allow HTTP/0.9 responses! */ |
| + | config->http09_allowed = toggle; |
| + | break; |
| + | case ONEOPT('0', 'a'): /* --proxy-http2 */ |
| + | if(!feature_httpsproxy || !feature_http2) |
| + | return PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | config->proxyver = CURLPROXY_HTTPS2; |
| + | break; |
| + | case ONEOPT('1', '\0'): /* --tlsv1 */ |
| + | config->ssl_version = CURL_SSLVERSION_TLSv1; |
| + | break; |
| + | case ONEOPT('1', '0'): /* --tlsv1.0 */ |
| + | config->ssl_version = CURL_SSLVERSION_TLSv1_0; |
| + | break; |
| + | case ONEOPT('1', '1'): /* --tlsv1.1 */ |
| + | config->ssl_version = CURL_SSLVERSION_TLSv1_1; |
| + | break; |
| + | case ONEOPT('1', '2'): /* --tlsv1.2 */ |
| + | config->ssl_version = CURL_SSLVERSION_TLSv1_2; |
| break; | |
| - | case '2': |
| - | /* SSL version 2 */ |
| + | case ONEOPT('1', '3'): /* --tlsv1.3 */ |
| + | config->ssl_version = CURL_SSLVERSION_TLSv1_3; |
| + | break; |
| + | case ONEOPT('1', 'A'): /* --tls13-ciphers */ |
| + | err = getstr(&config->cipher13_list, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('1', 'B'): /* --proxy-tls13-ciphers */ |
| + | err = getstr(&config->proxy_cipher13_list, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('2', '\0'): /* --sslv2 */ |
| warnf(global, "Ignores instruction to use SSLv2"); | |
| break; | |
| - | case '3': |
| - | /* SSL version 3 */ |
| + | case ONEOPT('3', '\0'): /* --sslv3 */ |
| warnf(global, "Ignores instruction to use SSLv3"); | |
| break; | |
| - | case '4': |
| - | /* IPv4 */ |
| + | case ONEOPT('4', '\0'): /* --ipv4 */ |
| config->ip_version = CURL_IPRESOLVE_V4; | |
| break; | |
| - | case '6': |
| - | /* IPv6 */ |
| + | case ONEOPT('6', '\0'): /* --ipv6 */ |
| config->ip_version = CURL_IPRESOLVE_V6; | |
| break; | |
| - | case 'a': |
| + | case ONEOPT('a', '\0'): /* --append */ |
| /* This makes the FTP sessions use APPE instead of STOR */ | |
| config->ftp_append = toggle; | |
| break; | |
| - | case 'A': |
| - | /* This specifies the User-Agent name */ |
| + | case ONEOPT('A', '\0'): /* --user-agent */ |
| err = getstr(&config->useragent, nextarg, ALLOW_BLANK); | |
| break; | |
| - | case 'b': |
| - | switch(subletter) { |
| - | case 'a': /* --alt-svc */ |
| - | if(!feature_altsvc) |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | else |
| - | err = getstr(&config->altsvc, nextarg, ALLOW_BLANK); |
| - | break; |
| - | case 'b': /* --hsts */ |
| - | if(!feature_hsts) |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | else |
| - | err = getstr(&config->hsts, nextarg, ALLOW_BLANK); |
| + | case ONEOPT('b', 'a'): /* --alt-svc */ |
| + | if(!feature_altsvc) |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | else |
| + | err = getstr(&config->altsvc, nextarg, ALLOW_BLANK); |
| + | break; |
| + | case ONEOPT('b', 'b'): /* --hsts */ |
| + | if(!feature_hsts) |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | else |
| + | err = getstr(&config->hsts, nextarg, ALLOW_BLANK); |
| + | break; |
| + | case ONEOPT('b', '\0'): /* --cookie */ |
| + | if(nextarg[0] == '@') { |
| + | nextarg++; |
| + | } |
| + | else if(strchr(nextarg, '=')) { |
| + | /* A cookie string must have a =-letter */ |
| + | err = add2list(&config->cookies, nextarg); |
| break; | |
| - | default: /* --cookie string coming up: */ |
| - | if(nextarg[0] == '@') { |
| - | nextarg++; |
| - | } |
| - | else if(strchr(nextarg, '=')) { |
| - | /* A cookie string must have a =-letter */ |
| - | err = add2list(&config->cookies, nextarg); |
| - | break; |
| - | } |
| - | /* We have a cookie file to read from! */ |
| - | err = add2list(&config->cookiefiles, nextarg); |
| } | |
| + | /* We have a cookie file to read from! */ |
| + | err = add2list(&config->cookiefiles, nextarg); |
| break; | |
| - | case 'B': |
| - | /* use ASCII/text when transferring */ |
| + | case ONEOPT('B', '\0'): /* --use-ascii */ |
| config->use_ascii = toggle; | |
| break; | |
| - | case 'c': |
| - | /* get the file name to dump all cookies in */ |
| + | case ONEOPT('c', '\0'): /* --cookie-jar */ |
| err = getstr(&config->cookiejar, nextarg, DENY_BLANK); | |
| break; | |
| - | case 'C': |
| + | case ONEOPT('C', '\0'): /* --continue-at */ |
| /* This makes us continue an ftp transfer at given position */ | |
| if(strcmp(nextarg, "-")) { | |
| err = str2offset(&config->resume_from, nextarg); | |
| @@ -1722,7 +1668,13 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| } | |
| config->use_resume = TRUE; | |
| break; | |
| - | case 'd': |
| + | case ONEOPT('d', '\0'): /* --data */ |
| + | case ONEOPT('d', 'a'): /* --data-ascii */ |
| + | case ONEOPT('d', 'b'): /* --data-binary */ |
| + | case ONEOPT('d', 'e'): /* --data-urlencode */ |
| + | case ONEOPT('d', 'f'): /* --json */ |
| + | case ONEOPT('d', 'g'): /* --url-query */ |
| + | case ONEOPT('d', 'r'): /* --data-raw */ |
| /* postfield data */ | |
| { | |
| char *postdata = NULL; | |
| @@ -1865,17 +1817,15 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| a simple GET if -G is used. Already or soon. | |
| if(SetHTTPrequest(HTTPREQ_SIMPLEPOST, &config->httpreq)) { | |
| - | Curl_safefree(postdata); |
| - | return PARAM_BAD_USE; |
| + | Curl_safefree(postdata); |
| + | return PARAM_BAD_USE; |
| } | |
| */ | |
| break; | |
| - | case 'D': |
| - | /* dump-header to given file name */ |
| + | case ONEOPT('D', '\0'): /* --dump-header */ |
| err = getstr(&config->headerfile, nextarg, DENY_BLANK); | |
| break; | |
| - | case 'e': |
| - | { |
| + | case ONEOPT('e', '\0'): { /* --referer */ |
| char *ptr = strstr(nextarg, ";auto"); | |
| if(ptr) { | |
| /* Automatic referer requested, this may be combined with a | |
| @@ -1888,284 +1838,271 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| ptr = *nextarg ? nextarg : NULL; | |
| err = getstr(&config->referer, ptr, ALLOW_BLANK); | |
| } | |
| - | break; |
| - | case 'E': |
| - | switch(subletter) { |
| - | case '\0': /* certificate file */ |
| - | cleanarg(clearthis); |
| - | GetFileAndPassword(nextarg, &config->cert, &config->key_passwd); |
| - | break; |
| - | case 'a': /* --cacert CA info PEM file */ |
| - | err = getstr(&config->cacert, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'G': /* --ca-native */ |
| - | config->native_ca_store = toggle; |
| - | break; |
| - | case 'H': /* --proxy-ca-native */ |
| - | config->proxy_native_ca_store = toggle; |
| - | break; |
| - | case 'b': /* cert file type */ |
| - | err = getstr(&config->cert_type, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'c': /* private key file */ |
| - | err = getstr(&config->key, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'd': /* private key file type */ |
| - | err = getstr(&config->key_type, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'e': /* private key passphrase */ |
| - | err = getstr(&config->key_passwd, nextarg, DENY_BLANK); |
| - | cleanarg(clearthis); |
| - | break; |
| - | case 'f': /* crypto engine */ |
| - | err = getstr(&config->engine, nextarg, DENY_BLANK); |
| - | if(!err && |
| - | config->engine && !strcmp(config->engine, "list")) { |
| - | err = PARAM_ENGINES_REQUESTED; |
| - | } |
| - | break; |
| - | case 'g': /* CA cert directory */ |
| - | err = getstr(&config->capath, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'h': /* --pubkey public key file */ |
| - | err = getstr(&config->pubkey, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'i': /* --hostpubmd5 md5 of the host public key */ |
| - | err = getstr(&config->hostpubmd5, nextarg, DENY_BLANK); |
| - | if(!err) { |
| - | if(!config->hostpubmd5 || strlen(config->hostpubmd5) != 32) |
| - | err = PARAM_BAD_USE; |
| - | } |
| - | break; |
| - | case 'F': /* --hostpubsha256 sha256 of the host public key */ |
| - | err = getstr(&config->hostpubsha256, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'j': /* CRL file */ |
| - | err = getstr(&config->crlfile, nextarg, DENY_BLANK); |
| - | break; |
| - | case 'k': /* TLS username */ |
| - | if(!feature_tls_srp) { |
| - | cleanarg(clearthis); |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| + | break; |
| + | case ONEOPT('E', '\0'): /* --cert */ |
| + | cleanarg(clearthis); |
| + | GetFileAndPassword(nextarg, &config->cert, &config->key_passwd); |
| + | break; |
| + | case ONEOPT('E', 'a'): /* --cacert */ |
| + | err = getstr(&config->cacert, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('E', 'G'): /* --ca-native */ |
| + | config->native_ca_store = toggle; |
| + | break; |
| + | case ONEOPT('E', 'H'): /* --proxy-ca-native */ |
| + | config->proxy_native_ca_store = toggle; |
| + | break; |
| + | case ONEOPT('E', 'b'): /* --cert-type */ |
| + | err = getstr(&config->cert_type, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('E', 'c'): /* --key */ |
| + | err = getstr(&config->key, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('E', 'd'): /* --key-type */ |
| + | err = getstr(&config->key_type, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('E', 'e'): /* --pass */ |
| + | err = getstr(&config->key_passwd, nextarg, DENY_BLANK); |
| + | cleanarg(clearthis); |
| + | break; |
| + | case ONEOPT('E', 'f'): /* --engine */ |
| + | err = getstr(&config->engine, nextarg, DENY_BLANK); |
| + | if(!err && |
| + | config->engine && !strcmp(config->engine, "list")) { |
| + | err = PARAM_ENGINES_REQUESTED; |
| + | } |
| + | break; |
| + | case ONEOPT('E', 'g'): /* --capath */ |
| + | err = getstr(&config->capath, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('E', 'h'): /* --pubkey */ |
| + | err = getstr(&config->pubkey, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('E', 'i'): /* --hostpubmd5 */ |
| + | err = getstr(&config->hostpubmd5, nextarg, DENY_BLANK); |
| + | if(!err) { |
| + | if(!config->hostpubmd5 || strlen(config->hostpubmd5) != 32) |
| + | err = PARAM_BAD_USE; |
| + | } |
| + | break; |
| + | case ONEOPT('E', 'F'): /* --hostpubsha256 */ |
| + | err = getstr(&config->hostpubsha256, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('E', 'j'): /* --crlfile */ |
| + | err = getstr(&config->crlfile, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('E', 'k'): /* --tlsuser */ |
| + | if(!feature_tls_srp) |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | else |
| err = getstr(&config->tls_username, nextarg, DENY_BLANK); | |
| - | cleanarg(clearthis); |
| - | break; |
| - | case 'l': /* TLS password */ |
| - | if(!feature_tls_srp) { |
| - | cleanarg(clearthis); |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| + | cleanarg(clearthis); |
| + | break; |
| + | case ONEOPT('E', 'l'): /* --tlspassword */ |
| + | if(!feature_tls_srp) |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | else |
| err = getstr(&config->tls_password, nextarg, ALLOW_BLANK); | |
| - | cleanarg(clearthis); |
| - | break; |
| - | case 'm': /* TLS authentication type */ |
| - | if(!feature_tls_srp) { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| + | cleanarg(clearthis); |
| + | break; |
| + | case ONEOPT('E', 'm'): /* --tlsauthtype */ |
| + | if(!feature_tls_srp) |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | else { |
| err = getstr(&config->tls_authtype, nextarg, DENY_BLANK); | |
| if(!err && strcmp(config->tls_authtype, "SRP")) | |
| err = PARAM_LIBCURL_DOESNT_SUPPORT; /* only support TLS-SRP */ | |
| - | break; |
| - | case 'n': /* no empty SSL fragments, --ssl-allow-beast */ |
| - | if(feature_ssl) |
| - | config->ssl_allow_beast = toggle; |
| - | break; |
| + | } |
| + | break; |
| + | case ONEOPT('E', 'n'): /* --ssl-allow-beast */ |
| + | if(feature_ssl) |
| + | config->ssl_allow_beast = toggle; |
| + | break; |
| - | case 'o': /* --ssl-auto-client-cert */ |
| - | if(feature_ssl) |
| - | config->ssl_auto_client_cert = toggle; |
| - | break; |
| + | case ONEOPT('E', 'o'): /* --ssl-auto-client-cert */ |
| + | if(feature_ssl) |
| + | config->ssl_auto_client_cert = toggle; |
| + | break; |
| - | case 'O': /* --proxy-ssl-auto-client-cert */ |
| - | if(feature_ssl) |
| - | config->proxy_ssl_auto_client_cert = toggle; |
| - | break; |
| + | case ONEOPT('E', 'O'): /* --proxy-ssl-auto-client-cert */ |
| + | if(feature_ssl) |
| + | config->proxy_ssl_auto_client_cert = toggle; |
| + | break; |
| - | case 'p': /* Pinned public key DER file */ |
| - | err = getstr(&config->pinnedpubkey, nextarg, DENY_BLANK); |
| - | break; |
| + | case ONEOPT('E', 'p'): /* --pinnedpubkey */ |
| + | err = getstr(&config->pinnedpubkey, nextarg, DENY_BLANK); |
| + | break; |
| - | case 'P': /* proxy pinned public key */ |
| - | err = getstr(&config->proxy_pinnedpubkey, nextarg, DENY_BLANK); |
| - | break; |
| + | case ONEOPT('E', 'P'): /* --proxy-pinnedpubkey */ |
| + | err = getstr(&config->proxy_pinnedpubkey, nextarg, DENY_BLANK); |
| + | break; |
| - | case 'q': /* --cert-status */ |
| - | config->verifystatus = TRUE; |
| - | break; |
| + | case ONEOPT('E', 'q'): /* --cert-status */ |
| + | config->verifystatus = TRUE; |
| + | break; |
| - | case 'Q': /* --doh-cert-status */ |
| - | config->doh_verifystatus = TRUE; |
| - | break; |
| + | case ONEOPT('E', 'Q'): /* --doh-cert-status */ |
| + | config->doh_verifystatus = TRUE; |
| + | break; |
| - | case 'r': /* --false-start */ |
| - | config->falsestart = TRUE; |
| - | break; |
| + | case ONEOPT('E', 'r'): /* --false-start */ |
| + | config->falsestart = TRUE; |
| + | break; |
| - | case 's': /* --ssl-no-revoke */ |
| - | if(feature_ssl) |
| - | config->ssl_no_revoke = TRUE; |
| - | break; |
| + | case ONEOPT('E', 's'): /* --ssl-no-revoke */ |
| + | if(feature_ssl) |
| + | config->ssl_no_revoke = TRUE; |
| + | break; |
| - | case 'S': /* --ssl-revoke-best-effort */ |
| - | if(feature_ssl) |
| - | config->ssl_revoke_best_effort = TRUE; |
| - | break; |
| + | case ONEOPT('E', 'S'): /* --ssl-revoke-best-effort */ |
| + | if(feature_ssl) |
| + | config->ssl_revoke_best_effort = TRUE; |
| + | break; |
| - | case 't': /* --tcp-fastopen */ |
| - | config->tcp_fastopen = TRUE; |
| - | break; |
| + | case ONEOPT('E', 't'): /* --tcp-fastopen */ |
| + | config->tcp_fastopen = TRUE; |
| + | break; |
| - | case 'u': /* TLS username for proxy */ |
| - | cleanarg(clearthis); |
| - | if(!feature_tls_srp) { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| + | case ONEOPT('E', 'u'): /* --proxy-tlsuser */ |
| + | cleanarg(clearthis); |
| + | if(!feature_tls_srp) |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | else |
| err = getstr(&config->proxy_tls_username, nextarg, ALLOW_BLANK); | |
| - | break; |
| + | break; |
| - | case 'v': /* TLS password for proxy */ |
| - | cleanarg(clearthis); |
| - | if(!feature_tls_srp) { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| + | case ONEOPT('E', 'v'): /* --proxy-tlspassword */ |
| + | cleanarg(clearthis); |
| + | if(!feature_tls_srp) |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | else |
| err = getstr(&config->proxy_tls_password, nextarg, DENY_BLANK); | |
| - | break; |
| + | break; |
| - | case 'w': /* TLS authentication type for proxy */ |
| - | if(!feature_tls_srp) { |
| - | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| - | break; |
| - | } |
| + | case ONEOPT('E', 'w'): /* --proxy-tlsauthtype */ |
| + | if(!feature_tls_srp) |
| + | err = PARAM_LIBCURL_DOESNT_SUPPORT; |
| + | else { |
| err = getstr(&config->proxy_tls_authtype, nextarg, DENY_BLANK); | |
| if(!err && strcmp(config->proxy_tls_authtype, "SRP")) | |
| err = PARAM_LIBCURL_DOESNT_SUPPORT; /* only support TLS-SRP */ | |
| - | break; |
| + | } |
| + | break; |
| - | case 'x': /* certificate file for proxy */ |
| - | cleanarg(clearthis); |
| - | GetFileAndPassword(nextarg, &config->proxy_cert, |
| - | &config->proxy_key_passwd); |
| - | break; |
| + | case ONEOPT('E', 'x'): /* --proxy-cert */ |
| + | cleanarg(clearthis); |
| + | GetFileAndPassword(nextarg, &config->proxy_cert, |
| + | &config->proxy_key_passwd); |
| + | break; |
| - | case 'y': /* cert file type for proxy */ |
| - | err = getstr(&config->proxy_cert_type, nextarg, DENY_BLANK); |
| - | break; |
| + | case ONEOPT('E', 'y'): /* --proxy-cert-type */ |
| + | err = getstr(&config->proxy_cert_type, nextarg, DENY_BLANK); |
| + | break; |
| - | case 'z': /* private key file for proxy */ |
| - | err = getstr(&config->proxy_key, nextarg, ALLOW_BLANK); |
| - | break; |
| + | case ONEOPT('E', 'z'): /* --proxy-key */ |
| + | err = getstr(&config->proxy_key, nextarg, ALLOW_BLANK); |
| + | break; |
| - | case '0': /* private key file type for proxy */ |
| - | err = getstr(&config->proxy_key_type, nextarg, DENY_BLANK); |
| - | break; |
| + | case ONEOPT('E', '0'): /* --proxy-key-type */ |
| + | err = getstr(&config->proxy_key_type, nextarg, DENY_BLANK); |
| + | break; |
| - | case '1': /* private key passphrase for proxy */ |
| - | err = getstr(&config->proxy_key_passwd, nextarg, ALLOW_BLANK); |
| - | cleanarg(clearthis); |
| - | break; |
| + | case ONEOPT('E', '1'): /* --proxy-pass */ |
| + | err = getstr(&config->proxy_key_passwd, nextarg, ALLOW_BLANK); |
| + | cleanarg(clearthis); |
| + | break; |
| - | case '2': /* ciphers for proxy */ |
| - | err = getstr(&config->proxy_cipher_list, nextarg, DENY_BLANK); |
| - | break; |
| + | case ONEOPT('E', '2'): /* --proxy-ciphers */ |
| + | err = getstr(&config->proxy_cipher_list, nextarg, DENY_BLANK); |
| + | break; |
| - | case '3': /* CRL file for proxy */ |
| - | err = getstr(&config->proxy_crlfile, nextarg, DENY_BLANK); |
| - | break; |
| + | case ONEOPT('E', '3'): /* --proxy-crlfile */ |
| + | err = getstr(&config->proxy_crlfile, nextarg, DENY_BLANK); |
| + | break; |
| - | case '4': /* no empty SSL fragments for proxy */ |
| - | if(feature_ssl) |
| - | config->proxy_ssl_allow_beast = toggle; |
| - | break; |
| + | case ONEOPT('E', '4'): /* --proxy-allow-beast */ |
| + | if(feature_ssl) |
| + | config->proxy_ssl_allow_beast = toggle; |
| + | break; |
| - | case '5': /* --login-options */ |
| - | err = getstr(&config->login_options, nextarg, ALLOW_BLANK); |
| - | break; |
| + | case ONEOPT('E', '5'): /* --login-options */ |
| + | err = getstr(&config->login_options, nextarg, ALLOW_BLANK); |
| + | break; |
| - | case '6': /* CA info PEM file for proxy */ |
| - | err = getstr(&config->proxy_cacert, nextarg, DENY_BLANK); |
| - | break; |
| + | case ONEOPT('E', '6'): /* --proxy-cacert */ |
| + | err = getstr(&config->proxy_cacert, nextarg, DENY_BLANK); |
| + | break; |
| - | case '7': /* CA cert directory for proxy */ |
| - | err = getstr(&config->proxy_capath, nextarg, DENY_BLANK); |
| - | break; |
| + | case ONEOPT('E', '7'): /* --proxy-cainfo */ |
| + | err = getstr(&config->proxy_capath, nextarg, DENY_BLANK); |
| + | break; |
| - | case '8': /* allow insecure SSL connects for proxy */ |
| - | config->proxy_insecure_ok = toggle; |
| - | break; |
| + | case ONEOPT('E', '8'): /* --proxy-insecure */ |
| + | config->proxy_insecure_ok = toggle; |
| + | break; |
| - | case '9': /* --proxy-tlsv1 */ |
| - | /* TLS version 1 for proxy */ |
| - | config->proxy_ssl_version = CURL_SSLVERSION_TLSv1; |
| - | break; |
| + | case ONEOPT('E', '9'): /* --proxy-tlsv1 */ |
| + | /* TLS version 1 for proxy */ |
| + | config->proxy_ssl_version = CURL_SSLVERSION_TLSv1; |
| + | break; |
| - | case 'A': |
| - | /* --socks5-basic */ |
| - | if(toggle) |
| - | config->socks5_auth |= CURLAUTH_BASIC; |
| - | else |
| - | config->socks5_auth &= ~CURLAUTH_BASIC; |
| - | break; |
| + | case ONEOPT('E', 'A'): /* --socks5-basic */ |
| + | if(toggle) |
| + | config->socks5_auth |= CURLAUTH_BASIC; |
| + | else |
| + | config->socks5_auth &= ~CURLAUTH_BASIC; |
| + | break; |
| - | case 'B': |
| - | /* --socks5-gssapi */ |
| - | if(toggle) |
| - | config->socks5_auth |= CURLAUTH_GSSAPI; |
| - | else |
| - | config->socks5_auth &= ~CURLAUTH_GSSAPI; |
| - | break; |
| + | case ONEOPT('E', 'B'): /* --socks5-gssapi */ |
| + | if(toggle) |
| + | config->socks5_auth |= CURLAUTH_GSSAPI; |
| + | else |
| + | config->socks5_auth &= ~CURLAUTH_GSSAPI; |
| + | break; |
| - | case 'C': |
| - | err = getstr(&config->etag_save_file, nextarg, DENY_BLANK); |
| - | break; |
| + | case ONEOPT('E', 'C'): /* --etag-save */ |
| + | err = getstr(&config->etag_save_file, nextarg, DENY_BLANK); |
| + | break; |
| - | case 'D': |
| - | err = getstr(&config->etag_compare_file, nextarg, DENY_BLANK); |
| - | break; |
| + | case ONEOPT('E', 'D'): /* --etag-compare */ |
| + | err = getstr(&config->etag_compare_file, nextarg, DENY_BLANK); |
| + | break; |
| - | case 'E': |
| - | err = getstr(&config->ssl_ec_curves, nextarg, DENY_BLANK); |
| - | break; |
| + | case ONEOPT('E', 'E'): /* --curves */ |
| + | err = getstr(&config->ssl_ec_curves, nextarg, DENY_BLANK); |
| + | break; |
| - | default: /* unknown flag */ |
| - | err = PARAM_OPTION_UNKNOWN; |
| - | break; |
| - | } |
| + | case ONEOPT('f', 'a'): /* --fail-early */ |
| + | global->fail_early = toggle; |
| break; | |
| - | case 'f': |
| - | switch(subletter) { |
| - | case 'a': /* --fail-early */ |
| - | global->fail_early = toggle; |
| - | break; |
| - | case 'b': /* --styled-output */ |
| - | global->styled_output = toggle; |
| - | break; |
| - | case 'c': /* --mail-rcpt-allowfails */ |
| - | config->mail_rcpt_allowfails = toggle; |
| - | break; |
| - | case 'd': /* --fail-with-body */ |
| - | config->failwithbody = toggle; |
| - | break; |
| - | case 'e': /* --remove-on-error */ |
| - | config->rm_partial = toggle; |
| - | break; |
| - | default: /* --fail (hard on errors) */ |
| - | config->failonerror = toggle; |
| - | break; |
| + | case ONEOPT('f', 'b'): /* --styled-output */ |
| + | global->styled_output = toggle; |
| + | break; |
| + | case ONEOPT('f', 'c'): /* --mail-rcpt-allowfails */ |
| + | config->mail_rcpt_allowfails = toggle; |
| + | break; |
| + | case ONEOPT('f', 'd'): /* --fail-with-body */ |
| + | config->failwithbody = toggle; |
| + | if(config->failonerror && config->failwithbody) { |
| + | errorf(config->global, "You must select either --fail or " |
| + | "--fail-with-body, not both."); |
| + | err = PARAM_BAD_USE; |
| } | |
| + | break; |
| + | case ONEOPT('f', 'e'): /* --remove-on-error */ |
| + | config->rm_partial = toggle; |
| + | break; |
| + | case ONEOPT('f', '\0'): /* --fail */ |
| + | config->failonerror = toggle; |
| if(config->failonerror && config->failwithbody) { | |
| errorf(config->global, "You must select either --fail or " | |
| "--fail-with-body, not both."); | |
| err = PARAM_BAD_USE; | |
| - | break; |
| } | |
| break; | |
| - | case 'F': |
| + | |
| + | case ONEOPT('F', '\0'): /* --form */ |
| + | case ONEOPT('F', 's'): /* --form-string */ |
| /* "form data" simulation, this is a little advanced so lets do our best | |
| to sort this out slowly and carefully */ | |
| if(formparse(config, | |
| @@ -2175,27 +2112,24 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| (subletter == 's')?TRUE:FALSE)) { /* 's' is literal | |
| string */ | |
| err = PARAM_BAD_USE; | |
| - | break; |
| } | |
| - | if(SetHTTPrequest(config, HTTPREQ_MIMEPOST, &config->httpreq)) { |
| + | else if(SetHTTPrequest(config, HTTPREQ_MIMEPOST, &config->httpreq)) |
| err = PARAM_BAD_USE; | |
| - | break; |
| - | } |
| break; | |
| - | case 'g': /* g disables URLglobbing */ |
| + | case ONEOPT('g', '\0'): /* --globoff */ |
| config->globoff = toggle; | |
| break; | |
| - | case 'G': /* HTTP GET */ |
| - | if(subletter == 'a') { /* --request-target */ |
| - | err = getstr(&config->request_target, nextarg, DENY_BLANK); |
| - | } |
| - | else |
| - | config->use_httpget = toggle; |
| + | case ONEOPT('G', '\0'): /* --get */ |
| + | config->use_httpget = toggle; |
| + | break; |
| + | |
| + | case ONEOPT('G', 'a'): /* --request-target */ |
| + | err = getstr(&config->request_target, nextarg, DENY_BLANK); |
| break; | |
| - | case 'h': /* h for help */ |
| + | case ONEOPT('h', '\0'): /* --help */ |
| if(toggle) { | |
| if(*nextarg) { | |
| global->help_category = strdup(nextarg); | |
| @@ -2205,11 +2139,11 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| } | |
| } | |
| err = PARAM_HELP_REQUESTED; | |
| - | break; |
| } | |
| /* we now actually support --no-help too! */ | |
| break; | |
| - | case 'H': |
| + | case ONEOPT('H', '\0'): /* --header */ |
| + | case ONEOPT('H', 'p'): /* --proxy-header */ |
| /* A custom header to append to a list */ | |
| if(nextarg[0] == '@') { | |
| /* read many headers from a file or stdin */ | |
| @@ -2252,101 +2186,93 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| err = add2list(&config->headers, nextarg); | |
| } | |
| break; | |
| - | case 'i': |
| + | case ONEOPT('i', '\0'): /* --include */ |
| config->show_headers = toggle; /* show the headers as well in the | |
| general output stream */ | |
| break; | |
| - | case 'j': |
| + | case ONEOPT('j', '\0'): /* --junk-session-cookies */ |
| config->cookiesession = toggle; | |
| break; | |
| - | case 'I': /* --head */ |
| + | case ONEOPT('I', '\0'): /* --head */ |
| config->no_body = toggle; | |
| config->show_headers = toggle; | |
| if(SetHTTPrequest(config, | |
| (config->no_body)?HTTPREQ_HEAD:HTTPREQ_GET, | |
| - | &config->httpreq)) { |
| + | &config->httpreq)) |
| err = PARAM_BAD_USE; | |
| - | break; |
| - | } |
| break; | |
| - | case 'J': /* --remote-header-name */ |
| + | case ONEOPT('J', '\0'): /* --remote-header-name */ |
| config->content_disposition = toggle; | |
| break; | |
| - | case 'k': /* allow insecure SSL connects */ |
| - | if(subletter == 'd') /* --doh-insecure */ |
| - | config->doh_insecure_ok = toggle; |
| - | else |
| - | config->insecure_ok = toggle; |
| + | case ONEOPT('k', '\0'): /* --insecure */ |
| + | config->insecure_ok = toggle; |
| break; | |
| - | case 'K': /* parse config file */ |
| + | case ONEOPT('k', 'd'): /* --doh-insecure */ |
| + | config->doh_insecure_ok = toggle; |
| + | break; |
| + | case ONEOPT('K', '\0'): /* --config */ |
| if(parseconfig(nextarg, global)) { | |
| errorf(global, "cannot read config from '%s'", nextarg); | |
| err = PARAM_READ_ERROR; | |
| - | break; |
| } | |
| break; | |
| - | case 'l': |
| + | case ONEOPT('l', '\0'): /* --list-only */ |
| config->dirlistonly = toggle; /* only list the names of the FTP dir */ | |
| break; | |
| - | case 'L': |
| + | case ONEOPT('L', '\0'): /* --location */ |
| + | case ONEOPT('L', 't'): /* --location-trusted */ |
| config->followlocation = toggle; /* Follow Location: HTTP headers */ | |
| - | switch(subletter) { |
| - | case 't': |
| + | if(subletter == 't') |
| /* Continue to send authentication (user+password) when following | |
| * locations, even when hostname changed */ | |
| config->unrestricted_auth = toggle; | |
| - | break; |
| - | } |
| break; | |
| - | case 'm': |
| + | case ONEOPT('m', '\0'): /* --max-time */ |
| /* specified max time */ | |
| err = secs2ms(&config->timeout_ms, nextarg); | |
| break; | |
| - | case 'M': /* M for manual, huge help */ |
| + | case ONEOPT('M', '\0'): /* --manual */ |
| if(toggle) { /* --no-manual shows no manual... */ | |
| #ifndef USE_MANUAL | |
| warnf(global, | |
| "built-in manual was disabled at build-time"); | |
| #endif | |
| err = PARAM_MANUAL_REQUESTED; | |
| - | break; |
| } | |
| break; | |
| - | case 'n': |
| - | switch(subletter) { |
| - | case 'o': /* use .netrc or URL */ |
| - | config->netrc_opt = toggle; |
| - | break; |
| - | case 'e': /* netrc-file */ |
| - | err = getstr(&config->netrc_file, nextarg, DENY_BLANK); |
| - | break; |
| - | default: |
| - | /* pick info from .netrc, if this is used for http, curl will |
| - | automatically enforce user+password with the request */ |
| - | config->netrc = toggle; |
| - | break; |
| - | } |
| + | |
| + | case ONEOPT('n', 'o'): /* --netrc-optional */ |
| + | config->netrc_opt = toggle; |
| + | break; |
| + | case ONEOPT('n', 'e'): /* --netrc-file */ |
| + | err = getstr(&config->netrc_file, nextarg, DENY_BLANK); |
| break; | |
| - | case 'N': |
| + | case ONEOPT('n', '\0'): /* --netrc */ |
| + | /* pick info from .netrc, if this is used for http, curl will |
| + | automatically enforce user+password with the request */ |
| + | config->netrc = toggle; |
| + | break; |
| + | |
| + | case ONEOPT('N', '\0'): /* --buffer */ |
| /* disable the output I/O buffering. note that the option is called | |
| --buffer but is mostly used in the negative form: --no-buffer */ | |
| config->nobuffer = longopt ? !toggle : TRUE; | |
| break; | |
| - | case 'O': /* --remote-name */ |
| - | if(subletter == 'a') { /* --remote-name-all */ |
| - | config->default_node_flags = toggle?GETOUT_USEREMOTE:0; |
| - | break; |
| - | } |
| - | else if(subletter == 'b') { /* --output-dir */ |
| - | err = getstr(&config->output_dir, nextarg, DENY_BLANK); |
| - | break; |
| - | } |
| - | else if(subletter == 'c') { /* --clobber / --no-clobber */ |
| - | config->file_clobber_mode = toggle ? CLOBBER_ALWAYS : CLOBBER_NEVER; |
| - | break; |
| - | } |
| - | FALLTHROUGH(); |
| - | case 'o': /* --output */ |
| + | |
| + | case ONEOPT('O', 'a'): /* --remote-name-all */ |
| + | config->default_node_flags = toggle?GETOUT_USEREMOTE:0; |
| + | break; |
| + | |
| + | case ONEOPT('O', 'b'): /* --output-dir */ |
| + | err = getstr(&config->output_dir, nextarg, DENY_BLANK); |
| + | break; |
| + | |
| + | case ONEOPT('O', 'c'): /* --clobber */ |
| + | config->file_clobber_mode = toggle ? CLOBBER_ALWAYS : CLOBBER_NEVER; |
| + | break; |
| + | |
| + | case ONEOPT('o', '\0'): /* --output */ |
| + | case ONEOPT('O', '\0'): /* --remote-name */ |
| /* output file */ | |
| if(!config->url_out) | |
| config->url_out = config->url_list; | |
| @@ -2388,7 +2314,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| } | |
| url->flags |= GETOUT_OUTFILE; | |
| break; | |
| - | case 'P': |
| + | case ONEOPT('P', '\0'): /* --ftp-port */ |
| /* This makes the FTP sessions use PORT instead of PASV */ | |
| /* use <eth0> or <192.168.10.10> style addresses. Anything except | |
| this will make us try to get the "default" address. | |
| @@ -2396,15 +2322,16 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| */ | |
| err = getstr(&config->ftpport, nextarg, DENY_BLANK); | |
| break; | |
| - | case 'p': |
| + | case ONEOPT('p', '\0'): /* --proxytunnel */ |
| /* proxy tunnel for non-http protocols */ | |
| config->proxytunnel = toggle; | |
| break; | |
| - | case 'q': /* if used first, already taken care of, we do it like |
| - | this so we don't cause an error! */ |
| + | case ONEOPT('q', '\0'): /* --disable */ |
| + | /* if used first, already taken care of, we do it like this so we don't |
| + | cause an error! */ |
| break; | |
| - | case 'Q': |
| + | case ONEOPT('Q', '\0'): /* --quote */ |
| /* QUOTE command to send to FTP server */ | |
| switch(nextarg[0]) { | |
| case '-': | |
| @@ -2422,15 +2349,14 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| break; | |
| } | |
| break; | |
| - | case 'r': |
| + | case ONEOPT('r', '\0'): /* --range */ |
| /* Specifying a range WITHOUT A DASH will create an illegal HTTP range | |
| (and won't actually be range by definition). The man page previously | |
| claimed that to be a good way, why this code is added to work-around | |
| it. */ | |
| if(ISDIGIT(*nextarg) && !strchr(nextarg, '-')) { | |
| char buffer[32]; | |
| - | curl_off_t off; |
| - | if(curlx_strtoofft(nextarg, NULL, 10, &off)) { |
| + | if(curlx_strtoofft(nextarg, NULL, 10, &value)) { |
| warnf(global, "unsupported range point"); | |
| err = PARAM_BAD_USE; | |
| break; | |
| @@ -2438,7 +2364,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| warnf(global, | |
| "A specified range MUST include at least one dash (-). " | |
| "Appending one for you"); | |
| - | msnprintf(buffer, sizeof(buffer), "%" CURL_FORMAT_CURL_OFF_T "-", off); |
| + | msnprintf(buffer, sizeof(buffer), "%" CURL_FORMAT_CURL_OFF_T "-", |
| + | value); |
| Curl_safefree(config->range); | |
| config->range = strdup(buffer); | |
| if(!config->range) { | |
| @@ -2462,21 +2389,21 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| err = getstr(&config->range, nextarg, DENY_BLANK); | |
| } | |
| break; | |
| - | case 'R': |
| + | case ONEOPT('R', '\0'): /* --remote-time */ |
| /* use remote file's time */ | |
| config->remote_time = toggle; | |
| break; | |
| - | case 's': /* --silent */ |
| + | case ONEOPT('s', '\0'): /* --silent */ |
| global->silent = toggle; | |
| break; | |
| - | case 'S': /* --show-error */ |
| + | case ONEOPT('S', '\0'): /* --show-error */ |
| global->showerror = toggle; | |
| break; | |
| - | case 't': |
| + | case ONEOPT('t', '\0'): /* --telnet-option */ |
| /* Telnet options */ | |
| err = add2list(&config->telnet_options, nextarg); | |
| break; | |
| - | case 'T': |
| + | case ONEOPT('T', '\0'): /* --upload */ |
| /* we are uploading */ | |
| if(!config->url_ul) | |
| config->url_ul = config->url_list; | |
| @@ -2509,17 +2436,17 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| err = getstr(&url->infile, nextarg, DENY_BLANK); | |
| } | |
| break; | |
| - | case 'u': |
| + | case ONEOPT('u', '\0'): /* --user */ |
| /* user:password */ | |
| err = getstr(&config->userpwd, nextarg, ALLOW_BLANK); | |
| cleanarg(clearthis); | |
| break; | |
| - | case 'U': |
| + | case ONEOPT('U', '\0'): /* --proxy-user */ |
| /* Proxy user:password */ | |
| err = getstr(&config->proxyuserpwd, nextarg, ALLOW_BLANK); | |
| cleanarg(clearthis); | |
| break; | |
| - | case 'v': |
| + | case ONEOPT('v', '\0'): /* --verbose */ |
| if(toggle) { | |
| /* the '%' thing here will cause the trace get sent to stderr */ | |
| Curl_safefree(global->trace_dump); | |
| @@ -2537,14 +2464,12 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| /* verbose is disabled here */ | |
| global->tracetype = TRACE_NONE; | |
| break; | |
| - | case 'V': |
| - | if(toggle) { /* --no-version yields no output! */ |
| + | case ONEOPT('V', '\0'): /* --version */ |
| + | if(toggle) /* --no-version yields no output! */ |
| err = PARAM_VERSION_INFO_REQUESTED; | |
| - | break; |
| - | } |
| break; | |
| - | case 'w': |
| + | case ONEOPT('w', '\0'): /* --write-out */ |
| /* get the output string */ | |
| if('@' == *nextarg) { | |
| /* the data begins with a '@' letter, it means that a file name | |
| @@ -2577,63 +2502,53 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| else | |
| err = getstr(&config->writeout, nextarg, DENY_BLANK); | |
| break; | |
| - | case 'x': |
| - | switch(subletter) { |
| - | case 'a': /* --preproxy */ |
| - | err = getstr(&config->preproxy, nextarg, DENY_BLANK); |
| - | break; |
| - | default: |
| - | /* --proxy */ |
| - | err = getstr(&config->proxy, nextarg, ALLOW_BLANK); |
| - | if(config->proxyver != CURLPROXY_HTTPS2) |
| - | config->proxyver = CURLPROXY_HTTP; |
| - | break; |
| - | } |
| + | case ONEOPT('x', 'a'): /* --preproxy */ |
| + | err = getstr(&config->preproxy, nextarg, DENY_BLANK); |
| + | break; |
| + | case ONEOPT('x', '\0'): /* --proxy */ |
| + | /* --proxy */ |
| + | err = getstr(&config->proxy, nextarg, ALLOW_BLANK); |
| + | if(config->proxyver != CURLPROXY_HTTPS2) |
| + | config->proxyver = CURLPROXY_HTTP; |
| break; | |
| - | case 'X': |
| + | |
| + | case ONEOPT('X', '\0'): /* --request */ |
| /* set custom request */ | |
| err = getstr(&config->customrequest, nextarg, DENY_BLANK); | |
| break; | |
| - | case 'y': |
| + | case ONEOPT('y', '\0'): /* --speed-limit */ |
| /* low speed time */ | |
| err = str2unum(&config->low_speed_time, nextarg); | |
| - | if(err) |
| - | break; |
| - | if(!config->low_speed_limit) |
| + | if(!err && !config->low_speed_limit) |
| config->low_speed_limit = 1; | |
| break; | |
| - | case 'Y': |
| + | case ONEOPT('Y', '\0'): /* --speed-time */ |
| /* low speed limit */ | |
| err = str2unum(&config->low_speed_limit, nextarg); | |
| - | if(err) |
| - | break; |
| - | if(!config->low_speed_time) |
| + | if(!err && !config->low_speed_time) |
| config->low_speed_time = 30; | |
| break; | |
| - | case 'Z': |
| - | switch(subletter) { |
| - | case '\0': /* --parallel */ |
| - | global->parallel = toggle; |
| - | break; |
| - | case 'b': { /* --parallel-max */ |
| - | long val; |
| - | err = str2unum(&val, nextarg); |
| - | if(err) |
| - | break; |
| - | if(val > MAX_PARALLEL) |
| - | global->parallel_max = MAX_PARALLEL; |
| - | else if(val < 1) |
| - | global->parallel_max = PARALLEL_DEFAULT; |
| - | else |
| - | global->parallel_max = (unsigned short)val; |
| - | break; |
| - | } |
| - | case 'c': /* --parallel-immediate */ |
| - | global->parallel_connect = toggle; |
| + | case ONEOPT('Z', '\0'): /* --parallel */ |
| + | global->parallel = toggle; |
| + | break; |
| + | case ONEOPT('Z', 'b'): { /* --parallel-max */ |
| + | long val; |
| + | err = str2unum(&val, nextarg); |
| + | if(err) |
| break; | |
| - | } |
| + | if(val > MAX_PARALLEL) |
| + | global->parallel_max = MAX_PARALLEL; |
| + | else if(val < 1) |
| + | global->parallel_max = PARALLEL_DEFAULT; |
| + | else |
| + | global->parallel_max = (unsigned short)val; |
| + | break; |
| + | } |
| + | case ONEOPT('Z', 'c'): /* --parallel-immediate */ |
| + | global->parallel_connect = toggle; |
| break; | |
| - | case 'z': /* time condition coming up */ |
| + | |
| + | case ONEOPT('z', '\0'): /* --time-cond */ |
| switch(*nextarg) { | |
| case '+': | |
| nextarg++; | |
| @@ -2657,11 +2572,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ | |
| config->condtime = (curl_off_t)curl_getdate(nextarg, &now); | |
| if(-1 == config->condtime) { | |
| /* now let's see if it is a file name to get the time from instead! */ | |
| - | curl_off_t filetime; |
| - | rc = getfiletime(nextarg, global, &filetime); |
| + | rc = getfiletime(nextarg, global, &value); |
| if(!rc) | |
| /* pull the time out from the file */ | |
| - | config->condtime = filetime; |
| + | config->condtime = value; |
| else { | |
| /* failed, remove time condition */ | |
| config->timecond = CURL_TIMECOND_NONE; | |