← Commit list

9e4e527735

Daniel Stenberg
Daniel Stenberg
2024-01-08
SUCCESS Duration: 81s

Subject

tool_getparam: switch to an enum for every option

Binary

Download Binary (846 KB)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

$ git checkout -f 9e4e527735bfd92132d102b2e7d102b8cb4f5a61
Previous HEAD position was fb414370ac tool_getparam: move the --rate logic into set_rate()
HEAD is now at 9e4e527735 tool_getparam: switch to an enum for every option

$ 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-dynbuf.lo
  CC       libcurl_la-dynhds.lo
  CC       libcurl_la-easy.lo
  CC       libcurl_la-easygetopt.lo
  CC       libcurl_la-easyoptions.lo
  CC       libcurl_la-escape.lo
  CC       libcurl_la-file.lo
  CC       libcurl_la-fileinfo.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-http_aws_sigv4.lo
  CC       libcurl_la-http2.lo
  CC       libcurl_la-http_chunks.lo
  CC       libcurl_la-http_digest.lo
  CC       libcurl_la-http_negotiate.lo
  CC       libcurl_la-http_proxy.lo
  CC       libcurl_la-http_ntlm.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-gtls.lo
  CC       vtls/libcurl_la-bearssl.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_prg.o
  CC       tool_cb_hdr.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_filetime.o
  CC       tool_findfile.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'

Commit Diff GitHub →

src/tool_getparam.c +874 -676tests/test1139.pl +4 -4
src/tool_getparam.c+874 -676
@@ -71,287 +71,558 @@ static ParameterError getstr(char **str, const char *val, bool allowblank)
return PARAM_OK;
}
+/* one enum for every command line option. The name is the verbatim long
+ option name, but in uppercase with periods and minuses replaced with
+ underscores using a "C_" prefix. */
+typedef enum {
+ C_ABSTRACT_UNIX_SOCKET,
+ C_ALPN,
+ C_ALT_SVC,
+ C_ANYAUTH,
+ C_APPEND,
+ C_AWS_SIGV4,
+ C_BASIC,
+ C_BUFFER,
+ C_CA_NATIVE,
+ C_CACERT,
+ C_CAPATH,
+ C_CERT,
+ C_CERT_STATUS,
+ C_CERT_TYPE,
+ C_CIPHERS,
+ C_CLOBBER,
+ C_COMPRESSED,
+ C_COMPRESSED_SSH,
+ C_CONFIG,
+ C_CONNECT_TIMEOUT,
+ C_CONNECT_TO,
+ C_CONTINUE_AT,
+ C_COOKIE,
+ C_COOKIE_JAR,
+ C_CREATE_DIRS,
+ C_CREATE_FILE_MODE,
+ C_CRLF,
+ C_CRLFILE,
+ C_CURVES,
+ C_DATA,
+ C_DATA_ASCII,
+ C_DATA_BINARY,
+ C_DATA_RAW,
+ C_DATA_URLENCODE,
+ C_DELEGATION,
+ C_DIGEST,
+ C_DISABLE,
+ C_DISABLE_EPRT,
+ C_DISABLE_EPSV,
+ C_DISALLOW_USERNAME_IN_URL,
+ C_DNS_INTERFACE,
+ C_DNS_IPV4_ADDR,
+ C_DNS_IPV6_ADDR,
+ C_DNS_SERVERS,
+ C_DOH_CERT_STATUS,
+ C_DOH_INSECURE,
+ C_DOH_URL,
+ C_DUMP_HEADER,
+ C_EGD_FILE,
+ C_ENGINE,
+ C_EPRT,
+ C_EPSV,
+ C_ETAG_COMPARE,
+ C_ETAG_SAVE,
+ C_EXPECT100_TIMEOUT,
+ C_FAIL,
+ C_FAIL_EARLY,
+ C_FAIL_WITH_BODY,
+ C_FALSE_START,
+ C_FORM,
+ C_FORM_ESCAPE,
+ C_FORM_STRING,
+ C_FTP_ACCOUNT,
+ C_FTP_ALTERNATIVE_TO_USER,
+ C_FTP_CREATE_DIRS,
+ C_FTP_METHOD,
+ C_FTP_PASV,
+ C_FTP_PORT,
+ C_FTP_PRET,
+ C_FTP_SKIP_PASV_IP,
+ C_FTP_SSL,
+ C_FTP_SSL_CCC,
+ C_FTP_SSL_CCC_MODE,
+ C_FTP_SSL_CONTROL,
+ C_FTP_SSL_REQD,
+ C_GET,
+ C_GLOBOFF,
+ C_HAPPY_EYEBALLS_TIMEOUT_MS,
+ C_HAPROXY_CLIENTIP,
+ C_HAPROXY_PROTOCOL,
+ C_HEAD,
+ C_HEADER,
+ C_HELP,
+ C_HOSTPUBMD5,
+ C_HOSTPUBSHA256,
+ C_HSTS,
+ C_HTTP0_9,
+ C_HTTP1_0,
+ C_HTTP1_1,
+ C_HTTP2,
+ C_HTTP2_PRIOR_KNOWLEDGE,
+ C_HTTP3,
+ C_HTTP3_ONLY,
+ C_IGNORE_CONTENT_LENGTH,
+ C_INCLUDE,
+ C_INSECURE,
+ C_INTERFACE,
+ C_IPFS_GATEWAY,
+ C_IPV4,
+ C_IPV6,
+ C_JSON,
+ C_JUNK_SESSION_COOKIES,
+ C_KEEPALIVE,
+ C_KEEPALIVE_TIME,
+ C_KEY,
+ C_KEY_TYPE,
+ C_KRB,
+ C_KRB4,
+ C_LIBCURL,
+ C_LIMIT_RATE,
+ C_LIST_ONLY,
+ C_LOCAL_PORT,
+ C_LOCATION,
+ C_LOCATION_TRUSTED,
+ C_LOGIN_OPTIONS,
+ C_MAIL_AUTH,
+ C_MAIL_FROM,
+ C_MAIL_RCPT,
+ C_MAIL_RCPT_ALLOWFAILS,
+ C_MANUAL,
+ C_MAX_FILESIZE,
+ C_MAX_REDIRS,
+ C_MAX_TIME,
+ C_METALINK,
+ C_NEGOTIATE,
+ C_NETRC,
+ C_NETRC_FILE,
+ C_NETRC_OPTIONAL,
+ C_NEXT,
+ C_NOPROXY,
+ C_NPN,
+ C_NTLM,
+ C_NTLM_WB,
+ C_OAUTH2_BEARER,
+ C_OUTPUT,
+ C_OUTPUT_DIR,
+ C_PARALLEL,
+ C_PARALLEL_IMMEDIATE,
+ C_PARALLEL_MAX,
+ C_PASS,
+ C_PATH_AS_IS,
+ C_PINNEDPUBKEY,
+ C_POST301,
+ C_POST302,
+ C_POST303,
+ C_PREPROXY,
+ C_PROGRESS_BAR,
+ C_PROGRESS_METER,
+ C_PROTO,
+ C_PROTO_DEFAULT,
+ C_PROTO_REDIR,
+ C_PROXY,
+ C_PROXY_ANYAUTH,
+ C_PROXY_BASIC,
+ C_PROXY_CA_NATIVE,
+ C_PROXY_CACERT,
+ C_PROXY_CAPATH,
+ C_PROXY_CERT,
+ C_PROXY_CERT_TYPE,
+ C_PROXY_CIPHERS,
+ C_PROXY_CRLFILE,
+ C_PROXY_DIGEST,
+ C_PROXY_HEADER,
+ C_PROXY_HTTP2,
+ C_PROXY_INSECURE,
+ C_PROXY_KEY,
+ C_PROXY_KEY_TYPE,
+ C_PROXY_NEGOTIATE,
+ C_PROXY_NTLM,
+ C_PROXY_PASS,
+ C_PROXY_PINNEDPUBKEY,
+ C_PROXY_SERVICE_NAME,
+ C_PROXY_SSL_ALLOW_BEAST,
+ C_PROXY_SSL_AUTO_CLIENT_CERT,
+ C_PROXY_TLS13_CIPHERS,
+ C_PROXY_TLSAUTHTYPE,
+ C_PROXY_TLSPASSWORD,
+ C_PROXY_TLSUSER,
+ C_PROXY_TLSV1,
+ C_PROXY_USER,
+ C_PROXY1_0,
+ C_PROXYTUNNEL,
+ C_PUBKEY,
+ C_QUOTE,
+ C_RANDOM_FILE,
+ C_RANGE,
+ C_RATE,
+ C_RAW,
+ C_REFERER,
+ C_REMOTE_HEADER_NAME,
+ C_REMOTE_NAME,
+ C_REMOTE_NAME_ALL,
+ C_REMOTE_TIME,
+ C_REMOVE_ON_ERROR,
+ C_REQUEST,
+ C_REQUEST_TARGET,
+ C_RESOLVE,
+ C_RETRY,
+ C_RETRY_ALL_ERRORS,
+ C_RETRY_CONNREFUSED,
+ C_RETRY_DELAY,
+ C_RETRY_MAX_TIME,
+ C_SASL_AUTHZID,
+ C_SASL_IR,
+ C_SERVICE_NAME,
+ C_SESSIONID,
+ C_SHOW_ERROR,
+ C_SILENT,
+ C_SOCKS4,
+ C_SOCKS4A,
+ C_SOCKS5,
+ C_SOCKS5_BASIC,
+ C_SOCKS5_GSSAPI,
+ C_SOCKS5_GSSAPI_NEC,
+ C_SOCKS5_GSSAPI_SERVICE,
+ C_SOCKS5_HOSTNAME,
+ C_SPEED_LIMIT,
+ C_SPEED_TIME,
+ C_SSL,
+ C_SSL_ALLOW_BEAST,
+ C_SSL_AUTO_CLIENT_CERT,
+ C_SSL_NO_REVOKE,
+ C_SSL_REQD,
+ C_SSL_REVOKE_BEST_EFFORT,
+ C_SSLV2,
+ C_SSLV3,
+ C_STDERR,
+ C_STYLED_OUTPUT,
+ C_SUPPRESS_CONNECT_HEADERS,
+ C_TCP_FASTOPEN,
+ C_TCP_NODELAY,
+ C_TELNET_OPTION,
+ C_TEST_EVENT,
+ C_TFTP_BLKSIZE,
+ C_TFTP_NO_OPTIONS,
+ C_TIME_COND,
+ C_TLS_MAX,
+ C_TLS13_CIPHERS,
+ C_TLSAUTHTYPE,
+ C_TLSPASSWORD,
+ C_TLSUSER,
+ C_TLSV1,
+ C_TLSV1_0,
+ C_TLSV1_1,
+ C_TLSV1_2,
+ C_TLSV1_3,
+ C_TR_ENCODING,
+ C_TRACE,
+ C_TRACE_ASCII,
+ C_TRACE_CONFIG,
+ C_TRACE_IDS,
+ C_TRACE_TIME,
+ C_UNIX_SOCKET,
+ C_UPLOAD_FILE,
+ C_URL,
+ C_URL_QUERY,
+ C_USE_ASCII,
+ C_USER,
+ C_USER_AGENT,
+ C_VARIABLE,
+ C_VERBOSE,
+ C_VERSION,
+ C_WDEBUG,
+ C_WRITE_OUT,
+ C_XATTR
+} cmdline_t;
+
struct LongShort {
const char *lname; /* long name option */
enum {
- ARG_NONE, /* stand-alone but not a boolean */
- ARG_BOOL, /* accepts a --no-[name] prefix */
- ARG_STRING, /* requires an argument */
- ARG_FILENAME /* requires an argument, usually a file name */
+ ARG_NONE, /* stand-alone but not a boolean */
+ ARG_BOOL, /* accepts a --no-[name] prefix */
+ ARG_STRG, /* requires an argument */
+ ARG_FILE /* requires an argument, usually a file name */
} desc;
- const char *letter; /* short name option */
- /* 'letter' strings with more than one character have *no* short option. */
+ char letter; /* short name option or ' ' */
+ cmdline_t cmd;
};
/* this array MUST be alphasorted based on the 'lname' */
static const struct LongShort aliases[]= {
- {"abstract-unix-socket", ARG_FILENAME, "$W"},
- {"alpn", ARG_BOOL, "*H"},
- {"alt-svc", ARG_STRING, "ba"},
- {"anyauth", ARG_BOOL, "*o"},
- {"append", ARG_BOOL, "a",},
- {"aws-sigv4", ARG_STRING, "*V"},
- {"basic", ARG_BOOL, "*n"},
- {"buffer", ARG_BOOL, "N",},
- {"ca-native", ARG_BOOL, "EG"},
- {"cacert", ARG_FILENAME, "Ea"},
- {"capath", ARG_FILENAME, "Eg"},
- {"cert", ARG_FILENAME, "E",},
- {"cert-status", ARG_BOOL, "Eq"},
- {"cert-type", ARG_STRING, "Eb"},
- {"ciphers", ARG_STRING, "*d"},
- {"clobber", ARG_BOOL, "Oc"},
- {"compressed", ARG_BOOL, "*j"},
- {"compressed-ssh", ARG_BOOL, "$Z"},
- {"config", ARG_FILENAME, "K",},
- {"connect-timeout", ARG_STRING, "*c"},
- {"connect-to", ARG_STRING, "$U"},
- {"continue-at", ARG_STRING, "C",},
- {"cookie", ARG_STRING, "b",},
- {"cookie-jar", ARG_STRING, "c",},
- {"create-dirs", ARG_BOOL, "*r"},
- {"create-file-mode", ARG_STRING, "*R"},
- {"crlf", ARG_BOOL, "*u"},
- {"crlfile", ARG_FILENAME, "Ej"},
- {"curves", ARG_STRING, "EE"},
- {"data", ARG_STRING, "d",},
- {"data-ascii", ARG_STRING, "da"},
- {"data-binary", ARG_STRING, "db"},
- {"data-raw", ARG_STRING, "dr"},
- {"data-urlencode", ARG_STRING, "de"},
- {"delegation", ARG_STRING, "$G"},
- {"digest", ARG_BOOL, "*k"},
- {"disable", ARG_BOOL, "q",},
- {"disable-eprt", ARG_BOOL, "*z"},
- {"disable-epsv", ARG_BOOL, "*e"},
- {"disallow-username-in-url", ARG_BOOL, "*f"},
- {"dns-interface", ARG_STRING, "*D"},
- {"dns-ipv4-addr", ARG_STRING, "*4"},
- {"dns-ipv6-addr", ARG_STRING, "*6"},
- {"dns-servers", ARG_STRING, "*F"},
- {"doh-cert-status", ARG_BOOL, "EQ"},
- {"doh-insecure", ARG_BOOL, "kd"},
- {"doh-url" , ARG_STRING, "*C"},
- {"dump-header", ARG_FILENAME, "D",},
- {"egd-file", ARG_STRING, "*b"},
- {"engine", ARG_STRING, "Ef"},
- {"eprt", ARG_BOOL, "*Z"},
- {"epsv", ARG_BOOL, "*E"},
- {"etag-compare", ARG_FILENAME, "ED"},
- {"etag-save", ARG_FILENAME, "EC"},
- {"expect100-timeout", ARG_STRING, "$R"},
- {"fail", ARG_BOOL, "f",},
- {"fail-early", ARG_BOOL, "fa"},
- {"fail-with-body", ARG_BOOL, "fd"},
- {"false-start", ARG_BOOL, "Er"},
- {"form", ARG_STRING, "F",},
- {"form-escape", ARG_BOOL, "$l"},
- {"form-string", ARG_STRING, "Fs"},
- {"ftp-account", ARG_STRING, "$m"},
- {"ftp-alternative-to-user", ARG_STRING, "$u"},
- {"ftp-create-dirs", ARG_BOOL, "*q"},
- {"ftp-method", ARG_STRING, "$r"},
- {"ftp-pasv", ARG_BOOL, "$b"},
- {"ftp-port", ARG_STRING, "P",},
- {"ftp-pret", ARG_BOOL, "$C"},
- {"ftp-skip-pasv-ip", ARG_BOOL, "$q"},
- {"ftp-ssl", ARG_BOOL, "$a"},
- {"ftp-ssl-ccc", ARG_BOOL, "$y"},
- {"ftp-ssl-ccc-mode", ARG_STRING, "$j"},
- {"ftp-ssl-control", ARG_BOOL, "$x"},
- {"ftp-ssl-reqd", ARG_BOOL, "$v"},
- {"get", ARG_BOOL, "G",},
- {"globoff", ARG_BOOL, "g",},
- {"happy-eyeballs-timeout-ms", ARG_STRING, "$~"},
- {"haproxy-clientip", ARG_STRING, "*P"},
- {"haproxy-protocol", ARG_BOOL, "*X"},
- {"head", ARG_BOOL, "I",},
- {"header", ARG_STRING, "H",},
- {"help", ARG_BOOL, "h",},
- {"hostpubmd5", ARG_STRING, "Ei"},
- {"hostpubsha256", ARG_STRING, "EF"},
- {"hsts", ARG_STRING, "bb"},
- {"http0.9", ARG_BOOL, "09"},
- {"http1.0", ARG_NONE, "0",},
- {"http1.1", ARG_NONE, "01"},
- {"http2", ARG_NONE, "02"},
- {"http2-prior-knowledge", ARG_NONE, "03"},
- {"http3", ARG_NONE, "04"},
- {"http3-only", ARG_NONE, "05"},
- {"ignore-content-length", ARG_BOOL, "$p"},
- {"include", ARG_BOOL, "i",},
- {"insecure", ARG_BOOL, "k",},
- {"interface", ARG_STRING, "*w"},
- {"ipfs-gateway", ARG_STRING, "*S"},
- {"ipv4", ARG_NONE, "4",},
- {"ipv6", ARG_NONE, "6",},
- {"json", ARG_STRING, "df"},
- {"junk-session-cookies", ARG_BOOL, "j",},
- {"keepalive", ARG_BOOL, "$1"},
- {"keepalive-time", ARG_STRING, "$3"},
- {"key", ARG_FILENAME, "Ec"},
- {"key-type", ARG_STRING, "Ed"},
- {"krb", ARG_STRING, "*x"},
- {"krb4", ARG_STRING, "*x"},
- {"libcurl", ARG_STRING, "$z"},
- {"limit-rate", ARG_STRING, "*i"},
- {"list-only", ARG_BOOL, "l",},
- {"local-port", ARG_STRING, "$s"},
- {"location", ARG_BOOL, "L",},
- {"location-trusted", ARG_BOOL, "Lt"},
- {"login-options", ARG_STRING, "E5"},
- {"mail-auth", ARG_STRING, "$H"},
- {"mail-from", ARG_STRING, "$A"},
- {"mail-rcpt", ARG_STRING, "$B"},
- {"mail-rcpt-allowfails", ARG_BOOL, "fc"},
- {"manual", ARG_BOOL, "M",},
- {"max-filesize", ARG_STRING, "*y"},
- {"max-redirs", ARG_STRING, "*s"},
- {"max-time", ARG_STRING, "m",},
- {"metalink", ARG_BOOL, "$J"},
- {"negotiate", ARG_BOOL, "*l"},
- {"netrc", ARG_BOOL, "n",},
- {"netrc-file", ARG_FILENAME, "ne"},
- {"netrc-optional", ARG_BOOL, "no"},
- {"next", ARG_NONE, ":",},
- {"noproxy", ARG_STRING, "$5"},
- {"npn", ARG_BOOL, "*G"},
- {"ntlm", ARG_BOOL, "*m"},
- {"ntlm-wb", ARG_BOOL, "*M"},
- {"oauth2-bearer", ARG_STRING, "*B"},
- {"output", ARG_FILENAME, "o",},
- {"output-dir", ARG_STRING, "Ob"},
- {"parallel", ARG_BOOL, "Z",},
- {"parallel-immediate", ARG_BOOL, "Zc"},
- {"parallel-max", ARG_STRING, "Zb"},
- {"pass", ARG_STRING, "Ee"},
- {"path-as-is", ARG_BOOL, "$N"},
- {"pinnedpubkey", ARG_STRING, "Ep"},
- {"post301", ARG_BOOL, "$0"},
- {"post302", ARG_BOOL, "$4"},
- {"post303", ARG_BOOL, "$I"},
- {"preproxy", ARG_STRING, "xa"},
- {"progress-bar", ARG_BOOL, "#",},
- {"progress-meter", ARG_BOOL, "#m"},
- {"proto", ARG_STRING, "$D"},
- {"proto-default", ARG_STRING, "$Q"},
- {"proto-redir", ARG_STRING, "$E"},
- {"proxy", ARG_STRING, "x",},
- {"proxy-anyauth", ARG_BOOL, "$n"},
- {"proxy-basic", ARG_BOOL, "$f"},
- {"proxy-ca-native", ARG_BOOL, "EH"},
- {"proxy-cacert", ARG_FILENAME, "E6"},
- {"proxy-capath", ARG_FILENAME, "E7"},
- {"proxy-cert", ARG_FILENAME, "Ex"},
- {"proxy-cert-type", ARG_STRING, "Ey"},
- {"proxy-ciphers", ARG_STRING, "E2"},
- {"proxy-crlfile", ARG_FILENAME, "E3"},
- {"proxy-digest", ARG_BOOL, "$e"},
- {"proxy-header", ARG_STRING, "Hp"},
- {"proxy-http2", ARG_BOOL, "0a"},
- {"proxy-insecure", ARG_BOOL, "E8"},
- {"proxy-key", ARG_FILENAME, "Ez"},
- {"proxy-key-type", ARG_STRING, "E0"},
- {"proxy-negotiate", ARG_BOOL, "$k"},
- {"proxy-ntlm", ARG_BOOL, "*t"},
- {"proxy-pass", ARG_STRING, "E1"},
- {"proxy-pinnedpubkey", ARG_STRING, "EP"},
- {"proxy-service-name", ARG_STRING, "$O"},
- {"proxy-ssl-allow-beast", ARG_BOOL, "E4"},
- {"proxy-ssl-auto-client-cert", ARG_BOOL, "EO"},
- {"proxy-tls13-ciphers", ARG_STRING, "1B"},
- {"proxy-tlsauthtype", ARG_STRING, "Ew"},
- {"proxy-tlspassword", ARG_STRING, "Ev"},
- {"proxy-tlsuser", ARG_STRING, "Eu"},
- {"proxy-tlsv1", ARG_NONE, "E9"},
- {"proxy-user", ARG_STRING, "U",},
- {"proxy1.0", ARG_STRING, "$8"},
- {"proxytunnel", ARG_BOOL, "p",},
- {"pubkey", ARG_STRING, "Eh"},
- {"quote", ARG_STRING, "Q",},
- {"random-file", ARG_FILENAME, "*a"},
- {"range", ARG_STRING, "r",},
- {"rate", ARG_STRING, "*I"},
- {"raw", ARG_BOOL, "$#"},
- {"referer", ARG_STRING, "e",},
- {"remote-header-name", ARG_BOOL, "J",},
- {"remote-name", ARG_BOOL, "O",},
- {"remote-name-all", ARG_BOOL, "Oa"},
- {"remote-time", ARG_BOOL, "R",},
- {"remove-on-error", ARG_BOOL, "fe"},
- {"request", ARG_STRING, "X",},
- {"request-target", ARG_STRING, "Ga"},
- {"resolve", ARG_STRING, "$F"},
- {"retry", ARG_STRING, "$g"},
- {"retry-all-errors", ARG_BOOL, "$!"},
- {"retry-connrefused", ARG_BOOL, "$V"},
- {"retry-delay", ARG_STRING, "$h"},
- {"retry-max-time", ARG_STRING, "$i"},
- {"sasl-authzid", ARG_STRING, "$6"},
- {"sasl-ir", ARG_BOOL, "$K"},
- {"service-name", ARG_STRING, "$P"},
- {"sessionid", ARG_BOOL, "$w"},
- {"show-error", ARG_BOOL, "S",},
- {"silent", ARG_BOOL, "s",},
- {"socks4", ARG_STRING, "$t"},
- {"socks4a", ARG_STRING, "$T"},
- {"socks5", ARG_STRING, "$c"},
- {"socks5-basic", ARG_BOOL, "EA"},
- {"socks5-gssapi", ARG_BOOL, "EB"},
- {"socks5-gssapi-nec", ARG_BOOL, "$7"},
- {"socks5-gssapi-service", ARG_STRING, "$O"},
- {"socks5-hostname", ARG_STRING, "$2"},
- {"speed-limit", ARG_STRING, "Y",},
- {"speed-time", ARG_STRING, "y",},
- {"ssl", ARG_BOOL, "$a"},
- {"ssl-allow-beast", ARG_BOOL, "En"},
- {"ssl-auto-client-cert", ARG_BOOL, "Eo"},
- {"ssl-no-revoke", ARG_BOOL, "Es"},
- {"ssl-reqd", ARG_BOOL, "$v"},
- {"ssl-revoke-best-effort", ARG_BOOL, "ES"},
- {"sslv2", ARG_NONE, "2",},
- {"sslv3", ARG_NONE, "3",},
- {"stderr", ARG_FILENAME, "*v"},
- {"styled-output", ARG_BOOL, "fb"},
- {"suppress-connect-headers", ARG_BOOL, "$Y"},
- {"tcp-fastopen", ARG_BOOL, "Et"},
- {"tcp-nodelay", ARG_BOOL, "$d"},
- {"telnet-option", ARG_STRING, "t",},
- {"test-event", ARG_BOOL, "$L"},
- {"tftp-blksize", ARG_STRING, "$9"},
- {"tftp-no-options", ARG_BOOL, "$S"},
- {"time-cond", ARG_STRING, "z",},
- {"tls-max", ARG_STRING, "$X"},
- {"tls13-ciphers", ARG_STRING, "1A"},
- {"tlsauthtype", ARG_STRING, "Em"},
- {"tlspassword", ARG_STRING, "El"},
- {"tlsuser", ARG_STRING, "Ek"},
- {"tlsv1", ARG_NONE, "1",},
- {"tlsv1.0", ARG_NONE, "10"},
- {"tlsv1.1", ARG_NONE, "11"},
- {"tlsv1.2", ARG_NONE, "12"},
- {"tlsv1.3", ARG_NONE, "13"},
- {"tr-encoding", ARG_BOOL, "*J"},
- {"trace", ARG_FILENAME, "*g"},
- {"trace-ascii", ARG_FILENAME, "*h"},
- {"trace-config", ARG_STRING, "$&"},
- {"trace-ids", ARG_BOOL, "$%"},
- {"trace-time", ARG_BOOL, "$o"},
- {"unix-socket", ARG_FILENAME, "$M"},
- {"upload-file", ARG_FILENAME, "T",},
- {"url", ARG_STRING, "*@"},
- {"url-query", ARG_STRING, "dg"},
- {"use-ascii", ARG_BOOL, "B",},
- {"user", ARG_STRING, "u",},
- {"user-agent", ARG_STRING, "A",},
- {"variable", ARG_STRING, ":a"},
- {"verbose", ARG_BOOL, "v",},
- {"version", ARG_BOOL, "V",},
+ {"abstract-unix-socket", ARG_FILE, ' ', C_ABSTRACT_UNIX_SOCKET},
+ {"alpn", ARG_BOOL, ' ', C_ALPN},
+ {"alt-svc", ARG_STRG, ' ', C_ALT_SVC},
+ {"anyauth", ARG_BOOL, ' ', C_ANYAUTH},
+ {"append", ARG_BOOL, 'a', C_APPEND},
+ {"aws-sigv4", ARG_STRG, ' ', C_AWS_SIGV4},
+ {"basic", ARG_BOOL, ' ', C_BASIC},
+ {"buffer", ARG_BOOL, 'N', C_BUFFER},
+ {"ca-native", ARG_BOOL, ' ', C_CA_NATIVE},
+ {"cacert", ARG_FILE, ' ', C_CACERT},
+ {"capath", ARG_FILE, ' ', C_CAPATH},
+ {"cert", ARG_FILE, 'E', C_CERT},
+ {"cert-status", ARG_BOOL, ' ', C_CERT_STATUS},
+ {"cert-type", ARG_STRG, ' ', C_CERT_TYPE},
+ {"ciphers", ARG_STRG, ' ', C_CIPHERS},
+ {"clobber", ARG_BOOL, ' ', C_CLOBBER},
+ {"compressed", ARG_BOOL, ' ', C_COMPRESSED},
+ {"compressed-ssh", ARG_BOOL, ' ', C_COMPRESSED_SSH},
+ {"config", ARG_FILE, 'K', C_CONFIG},
+ {"connect-timeout", ARG_STRG, ' ', C_CONNECT_TIMEOUT},
+ {"connect-to", ARG_STRG, ' ', C_CONNECT_TO},
+ {"continue-at", ARG_STRG, 'C', C_CONTINUE_AT},
+ {"cookie", ARG_STRG, 'b', C_COOKIE},
+ {"cookie-jar", ARG_STRG, 'c', C_COOKIE_JAR},
+ {"create-dirs", ARG_BOOL, ' ', C_CREATE_DIRS},
+ {"create-file-mode", ARG_STRG, ' ', C_CREATE_FILE_MODE},
+ {"crlf", ARG_BOOL, ' ', C_CRLF},
+ {"crlfile", ARG_FILE, ' ', C_CRLFILE},
+ {"curves", ARG_STRG, ' ', C_CURVES},
+ {"data", ARG_STRG, 'd', C_DATA},
+ {"data-ascii", ARG_STRG, ' ', C_DATA_ASCII},
+ {"data-binary", ARG_STRG, ' ', C_DATA_BINARY},
+ {"data-raw", ARG_STRG, ' ', C_DATA_RAW},
+ {"data-urlencode", ARG_STRG, ' ', C_DATA_URLENCODE},
+ {"delegation", ARG_STRG, ' ', C_DELEGATION},
+ {"digest", ARG_BOOL, ' ', C_DIGEST},
+ {"disable", ARG_BOOL, 'q', C_DISABLE},
+ {"disable-eprt", ARG_BOOL, ' ', C_DISABLE_EPRT},
+ {"disable-epsv", ARG_BOOL, ' ', C_DISABLE_EPSV},
+ {"disallow-username-in-url", ARG_BOOL, ' ', C_DISALLOW_USERNAME_IN_URL},
+ {"dns-interface", ARG_STRG, ' ', C_DNS_INTERFACE},
+ {"dns-ipv4-addr", ARG_STRG, ' ', C_DNS_IPV4_ADDR},
+ {"dns-ipv6-addr", ARG_STRG, ' ', C_DNS_IPV6_ADDR},
+ {"dns-servers", ARG_STRG, ' ', C_DNS_SERVERS},
+ {"doh-cert-status", ARG_BOOL, ' ', C_DOH_CERT_STATUS},
+ {"doh-insecure", ARG_BOOL, ' ', C_DOH_INSECURE},
+ {"doh-url" , ARG_STRG, ' ', C_DOH_URL},
+ {"dump-header", ARG_FILE, 'D', C_DUMP_HEADER},
+ {"egd-file", ARG_STRG, ' ', C_EGD_FILE},
+ {"engine", ARG_STRG, ' ', C_ENGINE},
+ {"eprt", ARG_BOOL, ' ', C_EPRT},
+ {"epsv", ARG_BOOL, ' ', C_EPSV},
+ {"etag-compare", ARG_FILE, ' ', C_ETAG_COMPARE},
+ {"etag-save", ARG_FILE, ' ', C_ETAG_SAVE},
+ {"expect100-timeout", ARG_STRG, ' ', C_EXPECT100_TIMEOUT},
+ {"fail", ARG_BOOL, 'f', C_FAIL},
+ {"fail-early", ARG_BOOL, ' ', C_FAIL_EARLY},
+ {"fail-with-body", ARG_BOOL, ' ', C_FAIL_WITH_BODY},
+ {"false-start", ARG_BOOL, ' ', C_FALSE_START},
+ {"form", ARG_STRG, 'F', C_FORM},
+ {"form-escape", ARG_BOOL, ' ', C_FORM_ESCAPE},
+ {"form-string", ARG_STRG, ' ', C_FORM_STRING},
+ {"ftp-account", ARG_STRG, ' ', C_FTP_ACCOUNT},
+ {"ftp-alternative-to-user", ARG_STRG, ' ', C_FTP_ALTERNATIVE_TO_USER},
+ {"ftp-create-dirs", ARG_BOOL, ' ', C_FTP_CREATE_DIRS},
+ {"ftp-method", ARG_STRG, ' ', C_FTP_METHOD},
+ {"ftp-pasv", ARG_BOOL, ' ', C_FTP_PASV},
+ {"ftp-port", ARG_STRG, 'P', C_FTP_PORT},
+ {"ftp-pret", ARG_BOOL, ' ', C_FTP_PRET},
+ {"ftp-skip-pasv-ip", ARG_BOOL, ' ', C_FTP_SKIP_PASV_IP},
+ {"ftp-ssl", ARG_BOOL, ' ', C_FTP_SSL},
+ {"ftp-ssl-ccc", ARG_BOOL, ' ', C_FTP_SSL_CCC},
+ {"ftp-ssl-ccc-mode", ARG_STRG, ' ', C_FTP_SSL_CCC_MODE},
+ {"ftp-ssl-control", ARG_BOOL, ' ', C_FTP_SSL_CONTROL},
+ {"ftp-ssl-reqd", ARG_BOOL, ' ', C_FTP_SSL_REQD},
+ {"get", ARG_BOOL, 'G', C_GET},
+ {"globoff", ARG_BOOL, 'g', C_GLOBOFF},
+ {"happy-eyeballs-timeout-ms", ARG_STRG, ' ', C_HAPPY_EYEBALLS_TIMEOUT_MS},
+ {"haproxy-clientip", ARG_STRG, ' ', C_HAPROXY_CLIENTIP},
+ {"haproxy-protocol", ARG_BOOL, ' ', C_HAPROXY_PROTOCOL},
+ {"head", ARG_BOOL, 'I', C_HEAD},
+ {"header", ARG_STRG, 'H', C_HEADER},
+ {"help", ARG_BOOL, 'h', C_HELP},
+ {"hostpubmd5", ARG_STRG, ' ', C_HOSTPUBMD5},
+ {"hostpubsha256", ARG_STRG, ' ', C_HOSTPUBSHA256},
+ {"hsts", ARG_STRG, ' ', C_HSTS},
+ {"http0.9", ARG_BOOL, ' ', C_HTTP0_9},
+ {"http1.0", ARG_NONE, '0', C_HTTP1_0},
+ {"http1.1", ARG_NONE, ' ', C_HTTP1_1},
+ {"http2", ARG_NONE, ' ', C_HTTP2},
+ {"http2-prior-knowledge", ARG_NONE, ' ', C_HTTP2_PRIOR_KNOWLEDGE},
+ {"http3", ARG_NONE, ' ', C_HTTP3},
+ {"http3-only", ARG_NONE, ' ', C_HTTP3_ONLY},
+ {"ignore-content-length", ARG_BOOL, ' ', C_IGNORE_CONTENT_LENGTH},
+ {"include", ARG_BOOL, 'i', C_INCLUDE},
+ {"insecure", ARG_BOOL, 'k', C_INSECURE},
+ {"interface", ARG_STRG, ' ', C_INTERFACE},
+ {"ipfs-gateway", ARG_STRG, ' ', C_IPFS_GATEWAY},
+ {"ipv4", ARG_NONE, '4', C_IPV4},
+ {"ipv6", ARG_NONE, '6', C_IPV6},
+ {"json", ARG_STRG, ' ', C_JSON},
+ {"junk-session-cookies", ARG_BOOL, 'j', C_JUNK_SESSION_COOKIES},
+ {"keepalive", ARG_BOOL, ' ', C_KEEPALIVE},
+ {"keepalive-time", ARG_STRG, ' ', C_KEEPALIVE_TIME},
+ {"key", ARG_FILE, ' ', C_KEY},
+ {"key-type", ARG_STRG, ' ', C_KEY_TYPE},
+ {"krb", ARG_STRG, ' ', C_KRB},
+ {"krb4", ARG_STRG, ' ', C_KRB4},
+ {"libcurl", ARG_STRG, ' ', C_LIBCURL},
+ {"limit-rate", ARG_STRG, ' ', C_LIMIT_RATE},
+ {"list-only", ARG_BOOL, 'l', C_LIST_ONLY},
+ {"local-port", ARG_STRG, ' ', C_LOCAL_PORT},
+ {"location", ARG_BOOL, 'L', C_LOCATION},
+ {"location-trusted", ARG_BOOL, ' ', C_LOCATION_TRUSTED},
+ {"login-options", ARG_STRG, ' ', C_LOGIN_OPTIONS},
+ {"mail-auth", ARG_STRG, ' ', C_MAIL_AUTH},
+ {"mail-from", ARG_STRG, ' ', C_MAIL_FROM},
+ {"mail-rcpt", ARG_STRG, ' ', C_MAIL_RCPT},
+ {"mail-rcpt-allowfails", ARG_BOOL, ' ', C_MAIL_RCPT_ALLOWFAILS},
+ {"manual", ARG_BOOL, 'M', C_MANUAL},
+ {"max-filesize", ARG_STRG, ' ', C_MAX_FILESIZE},
+ {"max-redirs", ARG_STRG, ' ', C_MAX_REDIRS},
+ {"max-time", ARG_STRG, 'm', C_MAX_TIME},
+ {"metalink", ARG_BOOL, ' ', C_METALINK},
+ {"negotiate", ARG_BOOL, ' ', C_NEGOTIATE},
+ {"netrc", ARG_BOOL, 'n', C_NETRC},
+ {"netrc-file", ARG_FILE, ' ', C_NETRC_FILE},
+ {"netrc-optional", ARG_BOOL, ' ', C_NETRC_OPTIONAL},
+ {"next", ARG_NONE, ':', C_NEXT},
+ {"noproxy", ARG_STRG, ' ', C_NOPROXY},
+ {"npn", ARG_BOOL, ' ', C_NPN},
+ {"ntlm", ARG_BOOL, ' ', C_NTLM},
+ {"ntlm-wb", ARG_BOOL, ' ', C_NTLM_WB},
+ {"oauth2-bearer", ARG_STRG, ' ', C_OAUTH2_BEARER},
+ {"output", ARG_FILE, 'o', C_OUTPUT},
+ {"output-dir", ARG_STRG, ' ', C_OUTPUT_DIR},
+ {"parallel", ARG_BOOL, 'Z', C_PARALLEL},
+ {"parallel-immediate", ARG_BOOL, ' ', C_PARALLEL_IMMEDIATE},
+ {"parallel-max", ARG_STRG, ' ', C_PARALLEL_MAX},
+ {"pass", ARG_STRG, ' ', C_PASS},
+ {"path-as-is", ARG_BOOL, ' ', C_PATH_AS_IS},
+ {"pinnedpubkey", ARG_STRG, ' ', C_PINNEDPUBKEY},
+ {"post301", ARG_BOOL, ' ', C_POST301},
+ {"post302", ARG_BOOL, ' ', C_POST302},
+ {"post303", ARG_BOOL, ' ', C_POST303},
+ {"preproxy", ARG_STRG, ' ', C_PREPROXY},
+ {"progress-bar", ARG_BOOL, '#', C_PROGRESS_BAR},
+ {"progress-meter", ARG_BOOL, ' ', C_PROGRESS_METER},
+ {"proto", ARG_STRG, ' ', C_PROTO},
+ {"proto-default", ARG_STRG, ' ', C_PROTO_DEFAULT},
+ {"proto-redir", ARG_STRG, ' ', C_PROTO_REDIR},
+ {"proxy", ARG_STRG, 'x', C_PROXY},
+ {"proxy-anyauth", ARG_BOOL, ' ', C_PROXY_ANYAUTH},
+ {"proxy-basic", ARG_BOOL, ' ', C_PROXY_BASIC},
+ {"proxy-ca-native", ARG_BOOL, ' ', C_PROXY_CA_NATIVE},
+ {"proxy-cacert", ARG_FILE, ' ', C_PROXY_CACERT},
+ {"proxy-capath", ARG_FILE, ' ', C_PROXY_CAPATH},
+ {"proxy-cert", ARG_FILE, ' ', C_PROXY_CERT},
+ {"proxy-cert-type", ARG_STRG, ' ', C_PROXY_CERT_TYPE},
+ {"proxy-ciphers", ARG_STRG, ' ', C_PROXY_CIPHERS},
+ {"proxy-crlfile", ARG_FILE, ' ', C_PROXY_CRLFILE},
+ {"proxy-digest", ARG_BOOL, ' ', C_PROXY_DIGEST},
+ {"proxy-header", ARG_STRG, ' ', C_PROXY_HEADER},
+ {"proxy-http2", ARG_BOOL, ' ', C_PROXY_HTTP2},
+ {"proxy-insecure", ARG_BOOL, ' ', C_PROXY_INSECURE},
+ {"proxy-key", ARG_FILE, ' ', C_PROXY_KEY},
+ {"proxy-key-type", ARG_STRG, ' ', C_PROXY_KEY_TYPE},
+ {"proxy-negotiate", ARG_BOOL, ' ', C_PROXY_NEGOTIATE},
+ {"proxy-ntlm", ARG_BOOL, ' ', C_PROXY_NTLM},
+ {"proxy-pass", ARG_STRG, ' ', C_PROXY_PASS},
+ {"proxy-pinnedpubkey", ARG_STRG, ' ', C_PROXY_PINNEDPUBKEY},
+ {"proxy-service-name", ARG_STRG, ' ', C_PROXY_SERVICE_NAME},
+ {"proxy-ssl-allow-beast", ARG_BOOL, ' ', C_PROXY_SSL_ALLOW_BEAST},
+ {"proxy-ssl-auto-client-cert", ARG_BOOL, ' ', C_PROXY_SSL_AUTO_CLIENT_CERT},
+ {"proxy-tls13-ciphers", ARG_STRG, ' ', C_PROXY_TLS13_CIPHERS},
+ {"proxy-tlsauthtype", ARG_STRG, ' ', C_PROXY_TLSAUTHTYPE},
+ {"proxy-tlspassword", ARG_STRG, ' ', C_PROXY_TLSPASSWORD},
+ {"proxy-tlsuser", ARG_STRG, ' ', C_PROXY_TLSUSER},
+ {"proxy-tlsv1", ARG_NONE, ' ', C_PROXY_TLSV1},
+ {"proxy-user", ARG_STRG, 'U', C_PROXY_USER},
+ {"proxy1.0", ARG_STRG, ' ', C_PROXY1_0},
+ {"proxytunnel", ARG_BOOL, 'p', C_PROXYTUNNEL},
+ {"pubkey", ARG_STRG, ' ', C_PUBKEY},
+ {"quote", ARG_STRG, 'Q', C_QUOTE},
+ {"random-file", ARG_FILE, ' ', C_RANDOM_FILE},
+ {"range", ARG_STRG, 'r', C_RANGE},
+ {"rate", ARG_STRG, ' ', C_RATE},
+ {"raw", ARG_BOOL, ' ', C_RAW},
+ {"referer", ARG_STRG, 'e', C_REFERER},
+ {"remote-header-name", ARG_BOOL, 'J', C_REMOTE_HEADER_NAME},
+ {"remote-name", ARG_BOOL, 'O', C_REMOTE_NAME},
+ {"remote-name-all", ARG_BOOL, ' ', C_REMOTE_NAME_ALL},
+ {"remote-time", ARG_BOOL, 'R', C_REMOTE_TIME},
+ {"remove-on-error", ARG_BOOL, ' ', C_REMOVE_ON_ERROR},
+ {"request", ARG_STRG, 'X', C_REQUEST},
+ {"request-target", ARG_STRG, ' ', C_REQUEST_TARGET},
+ {"resolve", ARG_STRG, ' ', C_RESOLVE},
+ {"retry", ARG_STRG, ' ', C_RETRY},
+ {"retry-all-errors", ARG_BOOL, ' ', C_RETRY_ALL_ERRORS},
+ {"retry-connrefused", ARG_BOOL, ' ', C_RETRY_CONNREFUSED},
+ {"retry-delay", ARG_STRG, ' ', C_RETRY_DELAY},
+ {"retry-max-time", ARG_STRG, ' ', C_RETRY_MAX_TIME},
+ {"sasl-authzid", ARG_STRG, ' ', C_SASL_AUTHZID},
+ {"sasl-ir", ARG_BOOL, ' ', C_SASL_IR},
+ {"service-name", ARG_STRG, ' ', C_SERVICE_NAME},
+ {"sessionid", ARG_BOOL, ' ', C_SESSIONID},
+ {"show-error", ARG_BOOL, 'S', C_SHOW_ERROR},
+ {"silent", ARG_BOOL, 's', C_SILENT},
+ {"socks4", ARG_STRG, ' ', C_SOCKS4},
+ {"socks4a", ARG_STRG, ' ', C_SOCKS4A},
+ {"socks5", ARG_STRG, ' ', C_SOCKS5},
+ {"socks5-basic", ARG_BOOL, ' ', C_SOCKS5_BASIC},
+ {"socks5-gssapi", ARG_BOOL, ' ', C_SOCKS5_GSSAPI},
+ {"socks5-gssapi-nec", ARG_BOOL, ' ', C_SOCKS5_GSSAPI_NEC},
+ {"socks5-gssapi-service", ARG_STRG, ' ', C_SOCKS5_GSSAPI_SERVICE},
+ {"socks5-hostname", ARG_STRG, ' ', C_SOCKS5_HOSTNAME},
+ {"speed-limit", ARG_STRG, 'Y', C_SPEED_LIMIT},
+ {"speed-time", ARG_STRG, 'y', C_SPEED_TIME},
+ {"ssl", ARG_BOOL, ' ', C_SSL},
+ {"ssl-allow-beast", ARG_BOOL, ' ', C_SSL_ALLOW_BEAST},
+ {"ssl-auto-client-cert", ARG_BOOL, ' ', C_SSL_AUTO_CLIENT_CERT},
+ {"ssl-no-revoke", ARG_BOOL, ' ', C_SSL_NO_REVOKE},
+ {"ssl-reqd", ARG_BOOL, ' ', C_SSL_REQD},
+ {"ssl-revoke-best-effort", ARG_BOOL, ' ', C_SSL_REVOKE_BEST_EFFORT},
+ {"sslv2", ARG_NONE, '2', C_SSLV2},
+ {"sslv3", ARG_NONE, '3', C_SSLV3},
+ {"stderr", ARG_FILE, ' ', C_STDERR},
+ {"styled-output", ARG_BOOL, ' ', C_STYLED_OUTPUT},
+ {"suppress-connect-headers", ARG_BOOL, ' ', C_SUPPRESS_CONNECT_HEADERS},
+ {"tcp-fastopen", ARG_BOOL, ' ', C_TCP_FASTOPEN},
+ {"tcp-nodelay", ARG_BOOL, ' ', C_TCP_NODELAY},
+ {"telnet-option", ARG_STRG, 't', C_TELNET_OPTION},
+ {"test-event", ARG_BOOL, ' ', C_TEST_EVENT},
+ {"tftp-blksize", ARG_STRG, ' ', C_TFTP_BLKSIZE},
+ {"tftp-no-options", ARG_BOOL, ' ', C_TFTP_NO_OPTIONS},
+ {"time-cond", ARG_STRG, 'z', C_TIME_COND},
+ {"tls-max", ARG_STRG, ' ', C_TLS_MAX},
+ {"tls13-ciphers", ARG_STRG, ' ', C_TLS13_CIPHERS},
+ {"tlsauthtype", ARG_STRG, ' ', C_TLSAUTHTYPE},
+ {"tlspassword", ARG_STRG, ' ', C_TLSPASSWORD},
+ {"tlsuser", ARG_STRG, ' ', C_TLSUSER},
+ {"tlsv1", ARG_NONE, '1', C_TLSV1},
+ {"tlsv1.0", ARG_NONE, ' ', C_TLSV1_0},
+ {"tlsv1.1", ARG_NONE, ' ', C_TLSV1_1},
+ {"tlsv1.2", ARG_NONE, ' ', C_TLSV1_2},
+ {"tlsv1.3", ARG_NONE, ' ', C_TLSV1_3},
+ {"tr-encoding", ARG_BOOL, ' ', C_TR_ENCODING},
+ {"trace", ARG_FILE, ' ', C_TRACE},
+ {"trace-ascii", ARG_FILE, ' ', C_TRACE_ASCII},
+ {"trace-config", ARG_STRG, ' ', C_TRACE_CONFIG},
+ {"trace-ids", ARG_BOOL, ' ', C_TRACE_IDS},
+ {"trace-time", ARG_BOOL, ' ', C_TRACE_TIME},
+ {"unix-socket", ARG_FILE, ' ', C_UNIX_SOCKET},
+ {"upload-file", ARG_FILE, 'T', C_UPLOAD_FILE},
+ {"url", ARG_STRG, ' ', C_URL},
+ {"url-query", ARG_STRG, ' ', C_URL_QUERY},
+ {"use-ascii", ARG_BOOL, 'B', C_USE_ASCII},
+ {"user", ARG_STRG, 'u', C_USER},
+ {"user-agent", ARG_STRG, 'A', C_USER_AGENT},
+ {"variable", ARG_STRG, ' ', C_VARIABLE},
+ {"verbose", ARG_BOOL, 'v', C_VERBOSE},
+ {"version", ARG_BOOL, 'V', C_VERSION},
#ifdef USE_WATT32
- {"wdebug", ARG_BOOL, "*p"},
+ {"wdebug", ARG_BOOL, ' ', C_WDEBUG},
#endif
- {"write-out", ARG_STRING, "w",},
- {"xattr", ARG_BOOL, "*~"},
+ {"write-out", ARG_STRG, 'w', C_WRITE_OUT},
+ {"xattr", ARG_BOOL, ' ', C_XATTR},
};
/* Split the argument of -E to 'certname' and 'passphrase' separated by colon.
@@ -743,8 +1014,8 @@ static const struct LongShort *single(char letter)
if(!singles_done) {
unsigned int j;
for(j = 0; j < sizeof(aliases)/sizeof(aliases[0]); j++) {
- if(!aliases[j].letter[1]) {
- unsigned char l = aliases[j].letter[0];
+ if(aliases[j].letter != ' ') {
+ unsigned char l = aliases[j].letter;
singles[l - ' '] = &aliases[j];
}
}
@@ -790,7 +1061,7 @@ static ParameterError url_query(char *nextarg,
return err;
}
-static ParameterError set_data(char subletter,
+static ParameterError set_data(cmdline_t cmd,
char *nextarg,
struct GlobalConfig *global,
struct OperationConfig *config)
@@ -800,19 +1071,19 @@ static ParameterError set_data(char subletter,
size_t size = 0;
ParameterError err = PARAM_OK;
- if(subletter == 'e') { /* --data-urlencode */
+ if(cmd == C_DATA_URLENCODE) { /* --data-urlencode */
err = data_urlencode(global, nextarg, &postdata, &size);
if(err)
return err;
}
- else if('@' == *nextarg && (subletter != 'r')) {
+ else if('@' == *nextarg && (cmd != C_DATA_RAW)) {
/* the data begins with a '@' letter, it means that a file name
or - (stdin) follows */
nextarg++; /* pass the @ */
if(!strcmp("-", nextarg)) {
file = stdin;
- if(subletter == 'b') /* forced data-binary */
+ if(cmd == C_DATA_BINARY) /* forced data-binary */
set_binmode(stdin);
}
else {
@@ -823,8 +1094,8 @@ static ParameterError set_data(char subletter,
}
}
- if((subletter == 'b') || /* --data-binary */
- (subletter == 'f') /* --json */)
+ if((cmd == C_DATA_BINARY) || /* --data-binary */
+ (cmd == C_JSON) /* --json */)
/* forced binary */
err = file2memory(&postdata, &size, file);
else {
@@ -853,12 +1124,12 @@ static ParameterError set_data(char subletter,
if(postdata)
size = strlen(postdata);
}
- if(subletter == 'f')
+ if(cmd == C_JSON)
config->jsoned = TRUE;
if(curlx_dyn_len(&config->postdata)) {
/* skip separator append for --json */
- if(!err && (subletter != 'f') &&
+ if(!err && (cmd != C_JSON) &&
curlx_dyn_addn(&config->postdata, "&", 1))
err = PARAM_NO_MEM;
}
@@ -873,8 +1144,6 @@ static ParameterError set_data(char subletter,
}
-#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,
@@ -883,8 +1152,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
struct GlobalConfig *global,
struct OperationConfig *config)
{
- char letter;
- char subletter = '\0'; /* subletters can only occur on long options */
int rc;
const char *parse = NULL;
time_t now;
@@ -936,7 +1203,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
sizeof(aliases[0]), findarg);
if(a) {
longopt = TRUE;
- parse = a->letter;
}
else {
err = PARAM_OPTION_UNKNOWN;
@@ -951,8 +1217,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
struct curlx_dynbuf nbuf;
bool replaced;
- if((a->desc != ARG_STRING) &&
- (a->desc != ARG_FILENAME)) {
+ if((a->desc != ARG_STRG) &&
+ (a->desc != ARG_FILE)) {
/* --expand on an option that isn't a string or a filename */
err = PARAM_EXPAND_ERROR;
goto error;
@@ -975,25 +1241,19 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
do {
/* we can loop here if we have multiple single-letters */
+ char letter;
+ cmdline_t cmd;
- if(!longopt) {
- letter = (char)*parse;
- subletter = '\0';
- }
- else {
- letter = parse[0];
- subletter = parse[1];
- }
-
- if(!a) {
- a = single(letter);
+ if(!longopt && !a) {
+ a = single(*parse);
if(!a) {
err = PARAM_OPTION_UNKNOWN;
break;
}
}
-
- if(a->desc >= ARG_STRING) {
+ letter = a->letter;
+ cmd = a->cmd;
+ if(a->desc >= ARG_STRG) {
/* this option requires an extra parameter */
if(!longopt && parse[1]) {
nextarg = (char *)&parse[1]; /* this is the actual extra parameter */
@@ -1010,7 +1270,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
*usedarg = TRUE; /* mark it as used */
}
- if((a->desc == ARG_FILENAME) &&
+ if((a->desc == ARG_FILE) &&
(nextarg[0] == '-') && nextarg[1]) {
/* if the file name looks like a command line option */
warnf(global, "The file name argument '%s' looks like a flag.",
@@ -1029,68 +1289,68 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
that aware of that state */
nextarg = (char *)"";
- switch(ONEOPT(letter, subletter)) {
- case ONEOPT('*', '4'): /* --dns-ipv4-addr */
+ switch(cmd) {
+ case C_DNS_IPV4_ADDR: /* --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 */
+ case C_DNS_IPV6_ADDR: /* --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 */
+ case C_RANDOM_FILE: /* --random-file */
break;
- case ONEOPT('*', 'b'): /* --egd-file */
+ case C_EGD_FILE: /* --egd-file */
break;
- case ONEOPT('*', 'B'): /* --oauth2-bearer */
+ case C_OAUTH2_BEARER: /* --oauth2-bearer */
err = getstr(&config->oauth_bearer, nextarg, DENY_BLANK);
if(!err) {
cleanarg(clearthis);
config->authtype |= CURLAUTH_BEARER;
}
break;
- case ONEOPT('*', 'c'): /* --connect-timeout */
+ case C_CONNECT_TIMEOUT: /* --connect-timeout */
err = secs2ms(&config->connecttimeout_ms, nextarg);
break;
- case ONEOPT('*', 'C'): /* --doh-url */
+ case C_DOH_URL: /* --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 */
+ case C_CIPHERS: /* -- ciphers */
err = getstr(&config->cipher_list, nextarg, DENY_BLANK);
break;
- case ONEOPT('*', 'D'): /* --dns-interface */
+ case C_DNS_INTERFACE: /* --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 */
+ case C_DISABLE_EPSV: /* --disable-epsv */
config->disable_epsv = toggle;
break;
- case ONEOPT('*', 'f'): /* --disallow-username-in-url */
+ case C_DISALLOW_USERNAME_IN_URL: /* --disallow-username-in-url */
config->disallow_username_in_url = toggle;
break;
- case ONEOPT('*', 'E'): /* --epsv */
+ case C_EPSV: /* --epsv */
config->disable_epsv = (!toggle)?TRUE:FALSE;
break;
- case ONEOPT('*', 'F'): /* --dns-servers */
+ case C_DNS_SERVERS: /* --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 */
+ case C_TRACE: /* --trace */
err = getstr(&global->trace_dump, nextarg, DENY_BLANK);
if(!err) {
if(global->tracetype && (global->tracetype != TRACE_BIN))
@@ -1098,10 +1358,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
global->tracetype = TRACE_BIN;
}
break;
- case ONEOPT('*', 'G'): /* --npn */
+ case C_NPN: /* --npn */
warnf(global, "--npn is no longer supported");
break;
- case ONEOPT('*', 'h'): /* --trace-ascii */
+ case C_TRACE_ASCII: /* --trace-ascii */
err = getstr(&global->trace_dump, nextarg, DENY_BLANK);
if(!err) {
if(global->tracetype && (global->tracetype != TRACE_ASCII))
@@ -1110,17 +1370,17 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
global->tracetype = TRACE_ASCII;
}
break;
- case ONEOPT('*', 'H'): /* --alpn */
+ case C_ALPN: /* --alpn */
config->noalpn = (!toggle)?TRUE:FALSE;
break;
- case ONEOPT('*', 'i'): /* --limit-rate */
+ case C_LIMIT_RATE: /* --limit-rate */
err = GetSizeParameter(global, nextarg, "rate", &value);
if(!err) {
config->recvpersecond = value;
config->sendpersecond = value;
}
break;
- case ONEOPT('*', 'I'): { /* --rate */
+ case C_RATE: { /* --rate */
/* support a few different suffixes, extract the suffix first, then
get the number and convert to per hour.
/s == per second
@@ -1177,25 +1437,25 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
}
break;
- case ONEOPT('*', 'j'): /* --compressed */
+ case C_COMPRESSED: /* --compressed */
if(toggle && !(feature_libz || feature_brotli || feature_zstd))
err = PARAM_LIBCURL_DOESNT_SUPPORT;
else
config->encoding = toggle;
break;
- case ONEOPT('*', 'J'): /* --tr-encoding */
+ case C_TR_ENCODING: /* --tr-encoding */
config->tr_encoding = toggle;
break;
- case ONEOPT('*', 'k'): /* --digest */
+ case C_DIGEST: /* --digest */
if(toggle)
config->authtype |= CURLAUTH_DIGEST;
else
config->authtype &= ~CURLAUTH_DIGEST;
break;
- case ONEOPT('*', 'l'): /* --negotiate */
+ case C_NEGOTIATE: /* --negotiate */
if(!toggle)
config->authtype &= ~CURLAUTH_NEGOTIATE;
else if(feature_spnego)
@@ -1204,7 +1464,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
err = PARAM_LIBCURL_DOESNT_SUPPORT;
break;
- case ONEOPT('*', 'm'): /* --ntlm */
+ case C_NTLM: /* --ntlm */
if(!toggle)
config->authtype &= ~CURLAUTH_NTLM;
else if(feature_ntlm)
@@ -1213,7 +1473,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
err = PARAM_LIBCURL_DOESNT_SUPPORT;
break;
- case ONEOPT('*', 'M'): /* --ntlm-wb */
+ case C_NTLM_WB: /* --ntlm-wb */
if(!toggle)
config->authtype &= ~CURLAUTH_NTLM_WB;
else if(feature_ntlm_wb)
@@ -1222,37 +1482,37 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
err = PARAM_LIBCURL_DOESNT_SUPPORT;
break;
- case ONEOPT('*', 'n'): /* --basic */
+ case C_BASIC: /* --basic */
if(toggle)
config->authtype |= CURLAUTH_BASIC;
else
config->authtype &= ~CURLAUTH_BASIC;
break;
- case ONEOPT('*', 'o'): /* --anyauth */
+ case C_ANYAUTH: /* --anyauth */
if(toggle)
config->authtype = CURLAUTH_ANY;
/* --no-anyauth simply doesn't touch it */
break;
#ifdef USE_WATT32
- case ONEOPT('*', 'p'): /* --wdebug */
+ case C_WDEBUG: /* --wdebug */
dbug_init();
break;
#endif
- case ONEOPT('*', 'q'): /* --ftp-create-dirs */
+ case C_FTP_CREATE_DIRS: /* --ftp-create-dirs */
config->ftp_create_dirs = toggle;
break;
- case ONEOPT('*', 'r'): /* --create-dirs */
+ case C_CREATE_DIRS: /* --create-dirs */
config->create_dirs = toggle;
break;
- case ONEOPT('*', 'R'): /* --create-file-mode */
+ case C_CREATE_FILE_MODE: /* --create-file-mode */
err = oct2nummax(&config->create_file_mode, nextarg, 0777);
break;
- case ONEOPT('*', 's'): /* --max-redirs */
+ case C_MAX_REDIRS: /* --max-redirs */
/* specified max no of redirects (http(s)), this accepts -1 as a
special condition */
err = str2num(&config->maxredirs, nextarg);
@@ -1260,62 +1520,62 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
err = PARAM_BAD_NUMERIC;
break;
- case ONEOPT('*', 'S'): /* --ipfs-gateway */
+ case C_IPFS_GATEWAY: /* --ipfs-gateway */
err = getstr(&config->ipfs_gateway, nextarg, DENY_BLANK);
break;
- case ONEOPT('*', 't'): /* --proxy-ntlm */
+ case C_PROXY_NTLM: /* --proxy-ntlm */
if(!feature_ntlm)
err = PARAM_LIBCURL_DOESNT_SUPPORT;
else
config->proxyntlm = toggle;
break;
- case ONEOPT('*', 'u'): /* --crlf */
+ case C_CRLF: /* --crlf */
/* LF -> CRLF conversion? */
config->crlf = toggle;
break;
- case ONEOPT('*', 'V'): /* --aws-sigv4 */
+ case C_AWS_SIGV4: /* --aws-sigv4 */
config->authtype |= CURLAUTH_AWS_SIGV4;
err = getstr(&config->aws_sigv4, nextarg, DENY_BLANK);
break;
- case ONEOPT('*', 'v'): /* --stderr */
+ case C_STDERR: /* --stderr */
tool_set_stderr_file(global, nextarg);
break;
- case ONEOPT('*', 'w'): /* --interface */
+ case C_INTERFACE: /* --interface */
/* interface */
err = getstr(&config->iface, nextarg, DENY_BLANK);
break;
- case ONEOPT('*', 'x'): /* --krb */
+ case C_KRB: /* --krb */
/* kerberos level string */
if(!feature_spnego)
err = PARAM_LIBCURL_DOESNT_SUPPORT;
else
err = getstr(&config->krblevel, nextarg, DENY_BLANK);
break;
- case ONEOPT('*', 'X'): /* --haproxy-protocol */
+ case C_HAPROXY_PROTOCOL: /* --haproxy-protocol */
config->haproxy_protocol = toggle;
break;
- case ONEOPT('*', 'P'): /* --haproxy-clientip */
+ case C_HAPROXY_CLIENTIP: /* --haproxy-clientip */
err = getstr(&config->haproxy_clientip, nextarg, DENY_BLANK);
break;
- case ONEOPT('*', 'y'): /* --max-filesize */
+ case C_MAX_FILESIZE: /* --max-filesize */
err = GetSizeParameter(global, nextarg, "max-filesize", &value);
if(!err)
config->max_filesize = value;
break;
- case ONEOPT('*', 'z'): /* --disable-eprt */
+ case C_DISABLE_EPRT: /* --disable-eprt */
config->disable_eprt = toggle;
break;
- case ONEOPT('*', 'Z'): /* --eprt */
+ case C_EPRT: /* --eprt */
config->disable_eprt = (!toggle)?TRUE:FALSE;
break;
- case ONEOPT('*', '~'): /* --xattr */
+ case C_XATTR: /* --xattr */
config->xattr = toggle;
break;
- case ONEOPT('*', '@'): /* --url */
+ case C_URL: /* --url */
if(!config->url_get)
config->url_get = config->url_list;
@@ -1335,105 +1595,103 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
/* there was no free node, create one! */
config->url_get = url = new_getout(config);
- if(!url) {
+ if(!url)
err = PARAM_NO_MEM;
- break;
+ else {
+ /* fill in the URL */
+ err = getstr(&url->url, nextarg, DENY_BLANK);
+ url->flags |= GETOUT_URL;
}
-
- /* fill in the URL */
- err = getstr(&url->url, nextarg, DENY_BLANK);
- url->flags |= GETOUT_URL;
break;
- case ONEOPT('$', 'a'): /* --ssl */
- if(toggle && !feature_ssl) {
+ case C_SSL: /* --ssl */
+ if(toggle && !feature_ssl)
err = PARAM_LIBCURL_DOESNT_SUPPORT;
- break;
+ else {
+ config->ftp_ssl = toggle;
+ if(config->ftp_ssl)
+ warnf(global,
+ "--ssl is an insecure option, consider --ssl-reqd instead");
}
- 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 */
+ case C_FTP_PASV: /* --ftp-pasv */
Curl_safefree(config->ftpport);
break;
- case ONEOPT('$', 'c'): /* --socks5 */
+ case C_SOCKS5: /* --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 */
+ case C_SOCKS4: /* --socks4 */
err = getstr(&config->proxy, nextarg, DENY_BLANK);
config->proxyver = CURLPROXY_SOCKS4;
break;
- case ONEOPT('$', 'T'): /* --socks4a */
+ case C_SOCKS4A: /* --socks4a */
err = getstr(&config->proxy, nextarg, DENY_BLANK);
config->proxyver = CURLPROXY_SOCKS4A;
break;
- case ONEOPT('$', '2'): /* --socks5-hostname */
+ case C_SOCKS5_HOSTNAME: /* --socks5-hostname */
err = getstr(&config->proxy, nextarg, DENY_BLANK);
config->proxyver = CURLPROXY_SOCKS5_HOSTNAME;
break;
- case ONEOPT('$', 'd'): /* --tcp-nodelay */
+ case C_TCP_NODELAY: /* --tcp-nodelay */
config->tcp_nodelay = toggle;
break;
- case ONEOPT('$', 'e'): /* --proxy-digest */
+ case C_PROXY_DIGEST: /* --proxy-digest */
config->proxydigest = toggle;
break;
- case ONEOPT('$', 'f'): /* --proxy-basic */
+ case C_PROXY_BASIC: /* --proxy-basic */
config->proxybasic = toggle;
break;
- case ONEOPT('$', 'g'): /* --retry */
+ case C_RETRY: /* --retry */
err = str2unum(&config->req_retry, nextarg);
break;
- case ONEOPT('$', 'V'): /* --retry-connrefused */
+ case C_RETRY_CONNREFUSED: /* --retry-connrefused */
config->retry_connrefused = toggle;
break;
- case ONEOPT('$', 'h'): /* --retry-delay */
+ case C_RETRY_DELAY: /* --retry-delay */
err = str2unummax(&config->retry_delay, nextarg, LONG_MAX/1000);
break;
- case ONEOPT('$', 'i'): /* --retry-max-time */
+ case C_RETRY_MAX_TIME: /* --retry-max-time */
err = str2unummax(&config->retry_maxtime, nextarg, LONG_MAX/1000);
break;
- case ONEOPT('$', '!'): /* --retry-all-errors */
+ case C_RETRY_ALL_ERRORS: /* --retry-all-errors */
config->retry_all_errors = toggle;
break;
- case ONEOPT('$', 'k'): /* --proxy-negotiate */
- if(!feature_spnego) {
+ case C_PROXY_NEGOTIATE: /* --proxy-negotiate */
+ if(!feature_spnego)
err = PARAM_LIBCURL_DOESNT_SUPPORT;
- break;
- }
- config->proxynegotiate = toggle;
+ else
+ config->proxynegotiate = toggle;
break;
- case ONEOPT('$', 'l'): /* --form-escape */
+ case C_FORM_ESCAPE: /* --form-escape */
config->mime_options &= ~CURLMIMEOPT_FORMESCAPE;
if(toggle)
config->mime_options |= CURLMIMEOPT_FORMESCAPE;
break;
- case ONEOPT('$', 'm'): /* --ftp-account */
+ case C_FTP_ACCOUNT: /* --ftp-account */
err = getstr(&config->ftp_account, nextarg, DENY_BLANK);
break;
- case ONEOPT('$', 'n'): /* --proxy-anyauth */
+ case C_PROXY_ANYAUTH: /* --proxy-anyauth */
config->proxyanyauth = toggle;
break;
- case ONEOPT('$', 'o'): /* --trace-time */
+ case C_TRACE_TIME: /* --trace-time */
global->tracetime = toggle;
break;
- case ONEOPT('$', 'p'): /* --ignore-content-length */
+ case C_IGNORE_CONTENT_LENGTH: /* --ignore-content-length */
config->ignorecl = toggle;
break;
- case ONEOPT('$', 'q'): /* --ftp-skip-pasv-ip */
+ case C_FTP_SKIP_PASV_IP: /* --ftp-skip-pasv-ip */
config->ftp_skip_ip = toggle;
break;
- case ONEOPT('$', 'r'): /* --ftp-method */
+ case C_FTP_METHOD: /* --ftp-method */
config->ftp_filemethod = ftpfilemethod(config, nextarg);
break;
- case ONEOPT('$', 's'): { /* --local-port */
+ case C_LOCAL_PORT: { /* --local-port */
/* 16bit base 10 is 5 digits, but we allow 6 so that this catches
overflows, not just truncates */
char lrange[7]="";
@@ -1467,36 +1725,36 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
}
break;
}
- case ONEOPT('$', 'u'): /* --ftp-alternative-to-user */
+ case C_FTP_ALTERNATIVE_TO_USER: /* --ftp-alternative-to-user */
err = getstr(&config->ftp_alternative_to_user, nextarg, DENY_BLANK);
break;
- case ONEOPT('$', 'v'): /* --ssl-reqd */
+ case C_FTP_SSL_REQD: /* --ftp-ssl-reqd */
+ case C_SSL_REQD: /* --ssl-reqd */
if(toggle && !feature_ssl) {
err = PARAM_LIBCURL_DOESNT_SUPPORT;
break;
}
config->ftp_ssl_reqd = toggle;
break;
- case ONEOPT('$', 'w'): /* --no-sessionid */
+ case C_SESSIONID: /* --sessionid */
config->disable_sessionid = (!toggle)?TRUE:FALSE;
break;
- case ONEOPT('$', 'x'): /* --ftp-ssl-control */
- if(toggle && !feature_ssl) {
+ case C_FTP_SSL_CONTROL: /* --ftp-ssl-control */
+ if(toggle && !feature_ssl)
err = PARAM_LIBCURL_DOESNT_SUPPORT;
- break;
- }
- config->ftp_ssl_control = toggle;
+ else
+ config->ftp_ssl_control = toggle;
break;
- case ONEOPT('$', 'y'): /* --ftp-ssl-ccc */
+ case C_FTP_SSL_CCC: /* --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 */
+ case C_FTP_SSL_CCC_MODE: /* --ftp-ssl-ccc-mode */
config->ftp_ssl_ccc = TRUE;
config->ftp_ssl_ccc_mode = ftpcccmethod(config, nextarg);
break;
- case ONEOPT('$', 'z'): /* --libcurl */
+ case C_LIBCURL: /* --libcurl */
#ifdef CURL_DISABLE_LIBCURL_OPTION
warnf(global,
"--libcurl option was disabled at build-time");
@@ -1505,251 +1763,245 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
err = getstr(&global->libcurl, nextarg, DENY_BLANK);
#endif
break;
- case ONEOPT('$', '#'): /* --raw */
+ case C_RAW: /* --raw */
config->raw = toggle;
break;
- case ONEOPT('$', '0'): /* --post301 */
- config->post301 = toggle;
- break;
- case ONEOPT('$', '1'): /* --no-keepalive */
+ case C_KEEPALIVE: /* --keepalive */
config->nokeepalive = (!toggle)?TRUE:FALSE;
break;
- case ONEOPT('$', '3'): /* --keepalive-time */
+ case C_KEEPALIVE_TIME: /* --keepalive-time */
err = str2unum(&config->alivetime, nextarg);
break;
- case ONEOPT('$', '4'): /* --post302 */
+ case C_POST301: /* --post301 */
+ config->post301 = toggle;
+ break;
+ case C_POST302: /* --post302 */
config->post302 = toggle;
break;
- case ONEOPT('$', 'I'): /* --post303 */
+ case C_POST303: /* --post303 */
config->post303 = toggle;
break;
- case ONEOPT('$', '5'): /* --noproxy */
+ case C_NOPROXY: /* --noproxy */
/* This specifies the noproxy list */
err = getstr(&config->noproxy, nextarg, ALLOW_BLANK);
break;
- case ONEOPT('$', '7'): /* --socks5-gssapi-nec */
+ case C_SOCKS5_GSSAPI_NEC: /* --socks5-gssapi-nec */
config->socks5_gssapi_nec = toggle;
break;
- case ONEOPT('$', '8'): /* --proxy1.0 */
+ case C_PROXY1_0: /* --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 */
+ case C_TFTP_BLKSIZE: /* --tftp-blksize */
err = str2unum(&config->tftp_blksize, nextarg);
break;
- case ONEOPT('$', 'A'): /* --mail-from */
+ case C_MAIL_FROM: /* --mail-from */
err = getstr(&config->mail_from, nextarg, DENY_BLANK);
break;
- case ONEOPT('$', 'B'): /* --mail-rcpt */
+ case C_MAIL_RCPT: /* --mail-rcpt */
/* append receiver to a list */
err = add2list(&config->mail_rcpt, nextarg);
break;
- case ONEOPT('$', 'C'): /* --ftp-pret */
+ case C_FTP_PRET: /* --ftp-pret */
config->ftp_pret = toggle;
break;
- case ONEOPT('$', 'D'): /* --proto */
+ case C_PROTO: /* --proto */
config->proto_present = TRUE;
err = proto2num(config, built_in_protos, &config->proto_str, nextarg);
break;
- case ONEOPT('$', 'E'): /* --proto-redir */
+ case C_PROTO_REDIR: /* --proto-redir */
config->proto_redir_present = TRUE;
if(proto2num(config, redir_protos, &config->proto_redir_str,
- nextarg)) {
+ nextarg))
err = PARAM_BAD_USE;
- break;
- }
break;
- case ONEOPT('$', 'F'): /* --resolve */
+ case C_RESOLVE: /* --resolve */
err = add2list(&config->resolve, nextarg);
break;
- case ONEOPT('$', 'G'): /* --delegation */
+ case C_DELEGATION: /* --delegation */
config->gssapi_delegation = delegation(config, nextarg);
break;
- case ONEOPT('$', 'H'): /* --mail-auth */
+ case C_MAIL_AUTH: /* --mail-auth */
err = getstr(&config->mail_auth, nextarg, DENY_BLANK);
break;
- case ONEOPT('$', 'J'): /* --metalink */
+ case C_METALINK: /* --metalink */
errorf(global, "--metalink is disabled");
err = PARAM_BAD_USE;
break;
- case ONEOPT('$', '6'): /* --sasl-authzid */
+ case C_SASL_AUTHZID: /* --sasl-authzid */
err = getstr(&config->sasl_authzid, nextarg, DENY_BLANK);
break;
- case ONEOPT('$', 'K'): /* --sasl-ir */
+ case C_SASL_IR: /* --sasl-ir */
config->sasl_ir = toggle;
break;
- case ONEOPT('$', 'L'): /* --test-event */
+ case C_TEST_EVENT: /* --test-event */
#ifdef CURLDEBUG
global->test_event_based = toggle;
#else
warnf(global, "--test-event is ignored unless a debug build");
#endif
break;
- case ONEOPT('$', 'M'): /* --unix-socket */
+ case C_UNIX_SOCKET: /* --unix-socket */
config->abstract_unix_socket = FALSE;
err = getstr(&config->unix_socket_path, nextarg, DENY_BLANK);
break;
- case ONEOPT('$', 'N'): /* --path-as-is */
+ case C_PATH_AS_IS: /* --path-as-is */
config->path_as_is = toggle;
break;
- case ONEOPT('$', 'O'): /* --proxy-service-name */
+ case C_PROXY_SERVICE_NAME: /* --proxy-service-name */
err = getstr(&config->proxy_service_name, nextarg, DENY_BLANK);
break;
- case ONEOPT('$', 'P'): /* --service-name */
+ case C_SERVICE_NAME: /* --service-name */
err = getstr(&config->service_name, nextarg, DENY_BLANK);
break;
- case ONEOPT('$', 'Q'): /* --proto-default */
+ case C_PROTO_DEFAULT: /* --proto-default */
err = getstr(&config->proto_default, nextarg, DENY_BLANK);
if(!err)
err = check_protocol(config->proto_default);
break;
- case ONEOPT('$', 'R'): /* --expect100-timeout */
+ case C_EXPECT100_TIMEOUT: /* --expect100-timeout */
err = secs2ms(&config->expect100timeout_ms, nextarg);
break;
- case ONEOPT('$', 'S'): /* --tftp-no-options */
+ case C_TFTP_NO_OPTIONS: /* --tftp-no-options */
config->tftp_no_options = toggle;
break;
- case ONEOPT('$', 'U'): /* --connect-to */
+ case C_CONNECT_TO: /* --connect-to */
err = add2list(&config->connect_to, nextarg);
break;
- case ONEOPT('$', 'W'): /* --abstract-unix-socket */
+ case C_ABSTRACT_UNIX_SOCKET: /* --abstract-unix-socket */
config->abstract_unix_socket = TRUE;
err = getstr(&config->unix_socket_path, nextarg, DENY_BLANK);
break;
- case ONEOPT('$', 'X'): /* --tls-max */
+ case C_TLS_MAX: /* --tls-max */
err = str2tls_max(&config->ssl_version_max, nextarg);
break;
- case ONEOPT('$', 'Y'): /* --suppress-connect-headers */
+ case C_SUPPRESS_CONNECT_HEADERS: /* --suppress-connect-headers */
config->suppress_connect_headers = toggle;
break;
- case ONEOPT('$', 'Z'): /* --compressed-ssh */
+ case C_COMPRESSED_SSH: /* --compressed-ssh */
config->ssh_compression = toggle;
break;
- case ONEOPT('$', '~'): /* --happy-eyeballs-timeout-ms */
+ case C_HAPPY_EYEBALLS_TIMEOUT_MS: /* --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 */
+ case C_TRACE_IDS: /* --trace-ids */
global->traceids = toggle;
break;
- case ONEOPT('$', '&'): /* --trace-config */
- if(set_trace_config(global, nextarg)) {
+ case C_TRACE_CONFIG: /* --trace-config */
+ if(set_trace_config(global, nextarg))
err = PARAM_NO_MEM;
- }
break;
- case ONEOPT('#', 'm'): /* --progress-meter */
+ case C_PROGRESS_METER: /* --progress-meter */
global->noprogress = !toggle;
break;
- case ONEOPT('#', '\0'): /* --progress-bar */
+ case C_PROGRESS_BAR: /* --progress-bar */
global->progressmode = toggle ? CURL_PROGRESS_BAR : CURL_PROGRESS_STATS;
break;
-
- case ONEOPT(':', 'a'): /* --variable */
+ case C_VARIABLE: /* --Variable */
err = setvariable(global, nextarg);
break;
- case ONEOPT(':', '\0'): /* --next */
+ case C_NEXT: /* --next */
err = PARAM_NEXT_OPERATION;
break;
-
- case ONEOPT('0', '\0'): /* --http1.0 */
+ case C_HTTP1_0: /* --http1.0 */
/* HTTP version 1.0 */
sethttpver(global, config, CURL_HTTP_VERSION_1_0);
break;
- case ONEOPT('0', '1'): /* --http1.1 */
+ case C_HTTP1_1: /* --http1.1 */
/* HTTP version 1.1 */
sethttpver(global, config, CURL_HTTP_VERSION_1_1);
break;
- case ONEOPT('0', '2'): /* --http2 */
+ case C_HTTP2: /* --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 */
+ case C_HTTP2_PRIOR_KNOWLEDGE: /* --http2-prior-knowledge */
/* HTTP version 2.0 over clean TCP */
if(!feature_http2)
return PARAM_LIBCURL_DOESNT_SUPPORT;
sethttpver(global, config, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE);
break;
- case ONEOPT('0', '4'): /* --http3: */
+ case C_HTTP3: /* --http3: */
/* Try HTTP/3, allow fallback */
- if(!feature_http3) {
+ if(!feature_http3)
err = PARAM_LIBCURL_DOESNT_SUPPORT;
- break;
- }
- sethttpver(global, config, CURL_HTTP_VERSION_3);
+ else
+ sethttpver(global, config, CURL_HTTP_VERSION_3);
break;
- case ONEOPT('0', '5'): /* --http3-only */
+ case C_HTTP3_ONLY: /* --http3-only */
/* Try HTTP/3 without fallback */
- if(!feature_http3) {
+ if(!feature_http3)
err = PARAM_LIBCURL_DOESNT_SUPPORT;
- break;
- }
- sethttpver(global, config, CURL_HTTP_VERSION_3ONLY);
+ else
+ sethttpver(global, config, CURL_HTTP_VERSION_3ONLY);
break;
- case ONEOPT('0', '9'): /* --http0.9 */
+ case C_HTTP0_9: /* --http0.9 */
/* Allow HTTP/0.9 responses! */
config->http09_allowed = toggle;
break;
- case ONEOPT('0', 'a'): /* --proxy-http2 */
+ case C_PROXY_HTTP2: /* --proxy-http2 */
if(!feature_httpsproxy || !feature_http2)
- return PARAM_LIBCURL_DOESNT_SUPPORT;
- config->proxyver = CURLPROXY_HTTPS2;
+ err = PARAM_LIBCURL_DOESNT_SUPPORT;
+ else
+ config->proxyver = CURLPROXY_HTTPS2;
break;
- case ONEOPT('1', '\0'): /* --tlsv1 */
+ case C_TLSV1: /* --tlsv1 */
config->ssl_version = CURL_SSLVERSION_TLSv1;
break;
- case ONEOPT('1', '0'): /* --tlsv1.0 */
+ case C_TLSV1_0: /* --tlsv1.0 */
config->ssl_version = CURL_SSLVERSION_TLSv1_0;
break;
- case ONEOPT('1', '1'): /* --tlsv1.1 */
+ case C_TLSV1_1: /* --tlsv1.1 */
config->ssl_version = CURL_SSLVERSION_TLSv1_1;
break;
- case ONEOPT('1', '2'): /* --tlsv1.2 */
+ case C_TLSV1_2: /* --tlsv1.2 */
config->ssl_version = CURL_SSLVERSION_TLSv1_2;
break;
- case ONEOPT('1', '3'): /* --tlsv1.3 */
+ case C_TLSV1_3: /* --tlsv1.3 */
config->ssl_version = CURL_SSLVERSION_TLSv1_3;
break;
- case ONEOPT('1', 'A'): /* --tls13-ciphers */
+ case C_TLS13_CIPHERS: /* --tls13-ciphers */
err = getstr(&config->cipher13_list, nextarg, DENY_BLANK);
break;
- case ONEOPT('1', 'B'): /* --proxy-tls13-ciphers */
+ case C_PROXY_TLS13_CIPHERS: /* --proxy-tls13-ciphers */
err = getstr(&config->proxy_cipher13_list, nextarg, DENY_BLANK);
break;
- case ONEOPT('2', '\0'): /* --sslv2 */
+ case C_SSLV2: /* --sslv2 */
warnf(global, "Ignores instruction to use SSLv2");
break;
- case ONEOPT('3', '\0'): /* --sslv3 */
+ case C_SSLV3: /* --sslv3 */
warnf(global, "Ignores instruction to use SSLv3");
break;
- case ONEOPT('4', '\0'): /* --ipv4 */
+ case C_IPV4: /* --ipv4 */
config->ip_version = CURL_IPRESOLVE_V4;
break;
- case ONEOPT('6', '\0'): /* --ipv6 */
+ case C_IPV6: /* --ipv6 */
config->ip_version = CURL_IPRESOLVE_V6;
break;
- case ONEOPT('a', '\0'): /* --append */
+ case C_APPEND: /* --append */
/* This makes the FTP sessions use APPE instead of STOR */
config->ftp_append = toggle;
break;
- case ONEOPT('A', '\0'): /* --user-agent */
+ case C_USER_AGENT: /* --user-agent */
err = getstr(&config->useragent, nextarg, ALLOW_BLANK);
break;
- case ONEOPT('b', 'a'): /* --alt-svc */
+ case C_ALT_SVC: /* --alt-svc */
if(!feature_altsvc)
err = PARAM_LIBCURL_DOESNT_SUPPORT;
else
err = getstr(&config->altsvc, nextarg, ALLOW_BLANK);
break;
- case ONEOPT('b', 'b'): /* --hsts */
+ case C_HSTS: /* --hsts */
if(!feature_hsts)
err = PARAM_LIBCURL_DOESNT_SUPPORT;
else
err = getstr(&config->hsts, nextarg, ALLOW_BLANK);
break;
- case ONEOPT('b', '\0'): /* --cookie */
+ case C_COOKIE: /* --cookie */
if(nextarg[0] == '@') {
nextarg++;
}
@@ -1761,18 +2013,16 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
/* We have a cookie file to read from! */
err = add2list(&config->cookiefiles, nextarg);
break;
- case ONEOPT('B', '\0'): /* --use-ascii */
+ case C_USE_ASCII: /* --use-ascii */
config->use_ascii = toggle;
break;
- case ONEOPT('c', '\0'): /* --cookie-jar */
+ case C_COOKIE_JAR: /* --cookie-jar */
err = getstr(&config->cookiejar, nextarg, DENY_BLANK);
break;
- case ONEOPT('C', '\0'): /* --continue-at */
+ case C_CONTINUE_AT: /* --continue-at */
/* This makes us continue an ftp transfer at given position */
if(strcmp(nextarg, "-")) {
err = str2offset(&config->resume_from, nextarg);
- if(err)
- break;
config->resume_from_current = FALSE;
}
else {
@@ -1781,21 +2031,21 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
}
config->use_resume = TRUE;
break;
- 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', 'r'): /* --data-raw */
- err = set_data(subletter, nextarg, global, config);
+ case C_DATA: /* --data */
+ case C_DATA_ASCII: /* --data-ascii */
+ case C_DATA_BINARY: /* --data-binary */
+ case C_DATA_URLENCODE: /* --data-urlencode */
+ case C_JSON: /* --json */
+ case C_DATA_RAW: /* --data-raw */
+ err = set_data(cmd, nextarg, global, config);
break;
- case ONEOPT('d', 'g'): /* --url-query */
+ case C_URL_QUERY: /* --url-query */
err = url_query(nextarg, global, config);
break;
- case ONEOPT('D', '\0'): /* --dump-header */
+ case C_DUMP_HEADER: /* --dump-header */
err = getstr(&config->headerfile, nextarg, DENY_BLANK);
break;
- case ONEOPT('e', '\0'): { /* --referer */
+ case C_REFERER: { /* --referer */
char *ptr = strstr(nextarg, ";auto");
if(ptr) {
/* Automatic referer requested, this may be combined with a
@@ -1809,73 +2059,73 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
err = getstr(&config->referer, ptr, ALLOW_BLANK);
}
break;
- case ONEOPT('E', '\0'): /* --cert */
+ case C_CERT: /* --cert */
cleanarg(clearthis);
GetFileAndPassword(nextarg, &config->cert, &config->key_passwd);
break;
- case ONEOPT('E', 'a'): /* --cacert */
+ case C_CACERT: /* --cacert */
err = getstr(&config->cacert, nextarg, DENY_BLANK);
break;
- case ONEOPT('E', 'G'): /* --ca-native */
+ case C_CA_NATIVE: /* --ca-native */
config->native_ca_store = toggle;
break;
- case ONEOPT('E', 'H'): /* --proxy-ca-native */
+ case C_PROXY_CA_NATIVE: /* --proxy-ca-native */
config->proxy_native_ca_store = toggle;
break;
- case ONEOPT('E', 'b'): /* --cert-type */
+ case C_CERT_TYPE: /* --cert-type */
err = getstr(&config->cert_type, nextarg, DENY_BLANK);
break;
- case ONEOPT('E', 'c'): /* --key */
+ case C_KEY: /* --key */
err = getstr(&config->key, nextarg, DENY_BLANK);
break;
- case ONEOPT('E', 'd'): /* --key-type */
+ case C_KEY_TYPE: /* --key-type */
err = getstr(&config->key_type, nextarg, DENY_BLANK);
break;
- case ONEOPT('E', 'e'): /* --pass */
+ case C_PASS: /* --pass */
err = getstr(&config->key_passwd, nextarg, DENY_BLANK);
cleanarg(clearthis);
break;
- case ONEOPT('E', 'f'): /* --engine */
+ case C_ENGINE: /* --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 */
+ case C_CAPATH: /* --capath */
err = getstr(&config->capath, nextarg, DENY_BLANK);
break;
- case ONEOPT('E', 'h'): /* --pubkey */
+ case C_PUBKEY: /* --pubkey */
err = getstr(&config->pubkey, nextarg, DENY_BLANK);
break;
- case ONEOPT('E', 'i'): /* --hostpubmd5 */
+ case C_HOSTPUBMD5: /* --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 */
+ case C_HOSTPUBSHA256: /* --hostpubsha256 */
err = getstr(&config->hostpubsha256, nextarg, DENY_BLANK);
break;
- case ONEOPT('E', 'j'): /* --crlfile */
+ case C_CRLFILE: /* --crlfile */
err = getstr(&config->crlfile, nextarg, DENY_BLANK);
break;
- case ONEOPT('E', 'k'): /* --tlsuser */
+ case C_TLSUSER: /* --tlsuser */
if(!feature_tls_srp)
err = PARAM_LIBCURL_DOESNT_SUPPORT;
else
err = getstr(&config->tls_username, nextarg, DENY_BLANK);
cleanarg(clearthis);
break;
- case ONEOPT('E', 'l'): /* --tlspassword */
+ case C_TLSPASSWORD: /* --tlspassword */
if(!feature_tls_srp)
err = PARAM_LIBCURL_DOESNT_SUPPORT;
else
err = getstr(&config->tls_password, nextarg, ALLOW_BLANK);
cleanarg(clearthis);
break;
- case ONEOPT('E', 'm'): /* --tlsauthtype */
+ case C_TLSAUTHTYPE: /* --tlsauthtype */
if(!feature_tls_srp)
err = PARAM_LIBCURL_DOESNT_SUPPORT;
else {
@@ -1884,72 +2134,59 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
err = PARAM_LIBCURL_DOESNT_SUPPORT; /* only support TLS-SRP */
}
break;
- case ONEOPT('E', 'n'): /* --ssl-allow-beast */
+ case C_SSL_ALLOW_BEAST: /* --ssl-allow-beast */
if(feature_ssl)
config->ssl_allow_beast = toggle;
break;
-
- case ONEOPT('E', 'o'): /* --ssl-auto-client-cert */
+ case C_SSL_AUTO_CLIENT_CERT: /* --ssl-auto-client-cert */
if(feature_ssl)
config->ssl_auto_client_cert = toggle;
break;
-
- case ONEOPT('E', 'O'): /* --proxy-ssl-auto-client-cert */
+ case C_PROXY_SSL_AUTO_CLIENT_CERT: /* --proxy-ssl-auto-client-cert */
if(feature_ssl)
config->proxy_ssl_auto_client_cert = toggle;
break;
-
- case ONEOPT('E', 'p'): /* --pinnedpubkey */
+ case C_PINNEDPUBKEY: /* --pinnedpubkey */
err = getstr(&config->pinnedpubkey, nextarg, DENY_BLANK);
break;
-
- case ONEOPT('E', 'P'): /* --proxy-pinnedpubkey */
+ case C_PROXY_PINNEDPUBKEY: /* --proxy-pinnedpubkey */
err = getstr(&config->proxy_pinnedpubkey, nextarg, DENY_BLANK);
break;
-
- case ONEOPT('E', 'q'): /* --cert-status */
+ case C_CERT_STATUS: /* --cert-status */
config->verifystatus = TRUE;
break;
-
- case ONEOPT('E', 'Q'): /* --doh-cert-status */
+ case C_DOH_CERT_STATUS: /* --doh-cert-status */
config->doh_verifystatus = TRUE;
break;
-
- case ONEOPT('E', 'r'): /* --false-start */
+ case C_FALSE_START: /* --false-start */
config->falsestart = TRUE;
break;
-
- case ONEOPT('E', 's'): /* --ssl-no-revoke */
+ case C_SSL_NO_REVOKE: /* --ssl-no-revoke */
if(feature_ssl)
config->ssl_no_revoke = TRUE;
break;
-
- case ONEOPT('E', 'S'): /* --ssl-revoke-best-effort */
+ case C_SSL_REVOKE_BEST_EFFORT: /* --ssl-revoke-best-effort */
if(feature_ssl)
config->ssl_revoke_best_effort = TRUE;
break;
-
- case ONEOPT('E', 't'): /* --tcp-fastopen */
+ case C_TCP_FASTOPEN: /* --tcp-fastopen */
config->tcp_fastopen = TRUE;
break;
-
- case ONEOPT('E', 'u'): /* --proxy-tlsuser */
+ case C_PROXY_TLSUSER: /* --proxy-tlsuser */
cleanarg(clearthis);
if(!feature_tls_srp)
err = PARAM_LIBCURL_DOESNT_SUPPORT;
else
err = getstr(&config->proxy_tls_username, nextarg, ALLOW_BLANK);
break;
-
- case ONEOPT('E', 'v'): /* --proxy-tlspassword */
+ case C_PROXY_TLSPASSWORD: /* --proxy-tlspassword */
cleanarg(clearthis);
if(!feature_tls_srp)
err = PARAM_LIBCURL_DOESNT_SUPPORT;
else
err = getstr(&config->proxy_tls_password, nextarg, DENY_BLANK);
break;
-
- case ONEOPT('E', 'w'): /* --proxy-tlsauthtype */
+ case C_PROXY_TLSAUTHTYPE: /* --proxy-tlsauthtype */
if(!feature_tls_srp)
err = PARAM_LIBCURL_DOESNT_SUPPORT;
else {
@@ -1958,100 +2195,81 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
err = PARAM_LIBCURL_DOESNT_SUPPORT; /* only support TLS-SRP */
}
break;
-
- case ONEOPT('E', 'x'): /* --proxy-cert */
+ case C_PROXY_CERT: /* --proxy-cert */
cleanarg(clearthis);
GetFileAndPassword(nextarg, &config->proxy_cert,
&config->proxy_key_passwd);
break;
-
- case ONEOPT('E', 'y'): /* --proxy-cert-type */
+ case C_PROXY_CERT_TYPE: /* --proxy-cert-type */
err = getstr(&config->proxy_cert_type, nextarg, DENY_BLANK);
break;
-
- case ONEOPT('E', 'z'): /* --proxy-key */
+ case C_PROXY_KEY: /* --proxy-key */
err = getstr(&config->proxy_key, nextarg, ALLOW_BLANK);
break;
-
- case ONEOPT('E', '0'): /* --proxy-key-type */
+ case C_PROXY_KEY_TYPE: /* --proxy-key-type */
err = getstr(&config->proxy_key_type, nextarg, DENY_BLANK);
break;
-
- case ONEOPT('E', '1'): /* --proxy-pass */
+ case C_PROXY_PASS: /* --proxy-pass */
err = getstr(&config->proxy_key_passwd, nextarg, ALLOW_BLANK);
cleanarg(clearthis);
break;
-
- case ONEOPT('E', '2'): /* --proxy-ciphers */
+ case C_PROXY_CIPHERS: /* --proxy-ciphers */
err = getstr(&config->proxy_cipher_list, nextarg, DENY_BLANK);
break;
-
- case ONEOPT('E', '3'): /* --proxy-crlfile */
+ case C_PROXY_CRLFILE: /* --proxy-crlfile */
err = getstr(&config->proxy_crlfile, nextarg, DENY_BLANK);
break;
-
- case ONEOPT('E', '4'): /* --proxy-allow-beast */
+ case C_PROXY_SSL_ALLOW_BEAST: /* --proxy-ssl-allow-beast */
if(feature_ssl)
config->proxy_ssl_allow_beast = toggle;
break;
-
- case ONEOPT('E', '5'): /* --login-options */
+ case C_LOGIN_OPTIONS: /* --login-options */
err = getstr(&config->login_options, nextarg, ALLOW_BLANK);
break;
-
- case ONEOPT('E', '6'): /* --proxy-cacert */
+ case C_PROXY_CACERT: /* --proxy-cacert */
err = getstr(&config->proxy_cacert, nextarg, DENY_BLANK);
break;
-
- case ONEOPT('E', '7'): /* --proxy-cainfo */
+ case C_PROXY_CAPATH: /* --proxy-capath */
err = getstr(&config->proxy_capath, nextarg, DENY_BLANK);
break;
-
- case ONEOPT('E', '8'): /* --proxy-insecure */
+ case C_PROXY_INSECURE: /* --proxy-insecure */
config->proxy_insecure_ok = toggle;
break;
-
- case ONEOPT('E', '9'): /* --proxy-tlsv1 */
+ case C_PROXY_TLSV1: /* --proxy-tlsv1 */
/* TLS version 1 for proxy */
config->proxy_ssl_version = CURL_SSLVERSION_TLSv1;
break;
-
- case ONEOPT('E', 'A'): /* --socks5-basic */
+ case C_SOCKS5_BASIC: /* --socks5-basic */
if(toggle)
config->socks5_auth |= CURLAUTH_BASIC;
else
config->socks5_auth &= ~CURLAUTH_BASIC;
break;
-
- case ONEOPT('E', 'B'): /* --socks5-gssapi */
+ case C_SOCKS5_GSSAPI: /* --socks5-gssapi */
if(toggle)
config->socks5_auth |= CURLAUTH_GSSAPI;
else
config->socks5_auth &= ~CURLAUTH_GSSAPI;
break;
-
- case ONEOPT('E', 'C'): /* --etag-save */
+ case C_ETAG_SAVE: /* --etag-save */
err = getstr(&config->etag_save_file, nextarg, DENY_BLANK);
break;
-
- case ONEOPT('E', 'D'): /* --etag-compare */
+ case C_ETAG_COMPARE: /* --etag-compare */
err = getstr(&config->etag_compare_file, nextarg, DENY_BLANK);
break;
-
- case ONEOPT('E', 'E'): /* --curves */
+ case C_CURVES: /* --curves */
err = getstr(&config->ssl_ec_curves, nextarg, DENY_BLANK);
break;
-
- case ONEOPT('f', 'a'): /* --fail-early */
+ case C_FAIL_EARLY: /* --fail-early */
global->fail_early = toggle;
break;
- case ONEOPT('f', 'b'): /* --styled-output */
+ case C_STYLED_OUTPUT: /* --styled-output */
global->styled_output = toggle;
break;
- case ONEOPT('f', 'c'): /* --mail-rcpt-allowfails */
+ case C_MAIL_RCPT_ALLOWFAILS: /* --mail-rcpt-allowfails */
config->mail_rcpt_allowfails = toggle;
break;
- case ONEOPT('f', 'd'): /* --fail-with-body */
+ case C_FAIL_WITH_BODY: /* --fail-with-body */
config->failwithbody = toggle;
if(config->failonerror && config->failwithbody) {
errorf(config->global, "You must select either --fail or "
@@ -2059,10 +2277,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
err = PARAM_BAD_USE;
}
break;
- case ONEOPT('f', 'e'): /* --remove-on-error */
+ case C_REMOVE_ON_ERROR: /* --remove-on-error */
config->rm_partial = toggle;
break;
- case ONEOPT('f', '\0'): /* --fail */
+ case C_FAIL: /* --fail */
config->failonerror = toggle;
if(config->failonerror && config->failwithbody) {
errorf(config->global, "You must select either --fail or "
@@ -2070,36 +2288,29 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
err = PARAM_BAD_USE;
}
break;
-
- case ONEOPT('F', '\0'): /* --form */
- case ONEOPT('F', 's'): /* --form-string */
+ case C_FORM: /* --form */
+ case C_FORM_STRING: /* --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,
nextarg,
&config->mimeroot,
&config->mimecurrent,
- (subletter == 's')?TRUE:FALSE)) { /* 's' is literal
- string */
+ (cmd == C_FORM_STRING)?TRUE:FALSE)) /* literal string */
err = PARAM_BAD_USE;
- }
else if(SetHTTPrequest(config, HTTPREQ_MIMEPOST, &config->httpreq))
err = PARAM_BAD_USE;
break;
-
- case ONEOPT('g', '\0'): /* --globoff */
+ case C_GLOBOFF: /* --globoff */
config->globoff = toggle;
break;
-
- case ONEOPT('G', '\0'): /* --get */
+ case C_GET: /* --get */
config->use_httpget = toggle;
break;
-
- case ONEOPT('G', 'a'): /* --request-target */
+ case C_REQUEST_TARGET: /* --request-target */
err = getstr(&config->request_target, nextarg, DENY_BLANK);
break;
-
- case ONEOPT('h', '\0'): /* --help */
+ case C_HELP: /* --help */
if(toggle) {
if(*nextarg) {
global->help_category = strdup(nextarg);
@@ -2112,8 +2323,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
}
/* we now actually support --no-help too! */
break;
- case ONEOPT('H', '\0'): /* --header */
- case ONEOPT('H', 'p'): /* --proxy-header */
+ case C_HEADER: /* --header */
+ case C_PROXY_HEADER: /* --proxy-header */
/* A custom header to append to a list */
if(nextarg[0] == '@') {
/* read many headers from a file or stdin */
@@ -2124,7 +2335,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
if(!file) {
errorf(global, "Failed to open %s", &nextarg[1]);
err = PARAM_READ_ERROR;
- break;
}
else {
err = file2memory(&string, &len, file);
@@ -2133,7 +2343,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
/* !checksrc! disable BANNEDFUNC 2 */
char *h = strtok(string, "\r\n");
while(h) {
- if(subletter == 'p') /* --proxy-header */
+ if(cmd == C_PROXY_HEADER) /* --proxy-header */
err = add2list(&config->proxyheaders, h);
else
err = add2list(&config->headers, h);
@@ -2145,25 +2355,23 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
}
if(!use_stdin)
fclose(file);
- if(err)
- break;
}
}
else {
- if(subletter == 'p') /* --proxy-header */
+ if(cmd == C_PROXY_HEADER) /* --proxy-header */
err = add2list(&config->proxyheaders, nextarg);
else
err = add2list(&config->headers, nextarg);
}
break;
- case ONEOPT('i', '\0'): /* --include */
+ case C_INCLUDE: /* --include */
config->show_headers = toggle; /* show the headers as well in the
general output stream */
break;
- case ONEOPT('j', '\0'): /* --junk-session-cookies */
+ case C_JUNK_SESSION_COOKIES: /* --junk-session-cookies */
config->cookiesession = toggle;
break;
- case ONEOPT('I', '\0'): /* --head */
+ case C_HEAD: /* --head */
config->no_body = toggle;
config->show_headers = toggle;
if(SetHTTPrequest(config,
@@ -2171,37 +2379,37 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
&config->httpreq))
err = PARAM_BAD_USE;
break;
- case ONEOPT('J', '\0'): /* --remote-header-name */
+ case C_REMOTE_HEADER_NAME: /* --remote-header-name */
config->content_disposition = toggle;
break;
- case ONEOPT('k', '\0'): /* --insecure */
+ case C_INSECURE: /* --insecure */
config->insecure_ok = toggle;
break;
- case ONEOPT('k', 'd'): /* --doh-insecure */
+ case C_DOH_INSECURE: /* --doh-insecure */
config->doh_insecure_ok = toggle;
break;
- case ONEOPT('K', '\0'): /* --config */
+ case C_CONFIG: /* --config */
if(parseconfig(nextarg, global)) {
errorf(global, "cannot read config from '%s'", nextarg);
err = PARAM_READ_ERROR;
}
break;
- case ONEOPT('l', '\0'): /* --list-only */
+ case C_LIST_ONLY: /* --list-only */
config->dirlistonly = toggle; /* only list the names of the FTP dir */
break;
- case ONEOPT('L', '\0'): /* --location */
- case ONEOPT('L', 't'): /* --location-trusted */
+ case C_LOCATION_TRUSTED: /* --location-trusted */
+ /* Continue to send authentication (user+password) when following
+ * locations, even when hostname changed */
+ config->unrestricted_auth = toggle;
+ FALLTHROUGH();
+ case C_LOCATION: /* --location */
config->followlocation = toggle; /* Follow Location: HTTP headers */
- if(subletter == 't')
- /* Continue to send authentication (user+password) when following
- * locations, even when hostname changed */
- config->unrestricted_auth = toggle;
break;
- case ONEOPT('m', '\0'): /* --max-time */
+ case C_MAX_TIME: /* --max-time */
/* specified max time */
err = secs2ms(&config->timeout_ms, nextarg);
break;
- case ONEOPT('M', '\0'): /* --manual */
+ case C_MANUAL: /* --manual */
if(toggle) { /* --no-manual shows no manual... */
#ifndef USE_MANUAL
warnf(global,
@@ -2210,39 +2418,33 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
err = PARAM_MANUAL_REQUESTED;
}
break;
-
- case ONEOPT('n', 'o'): /* --netrc-optional */
+ case C_NETRC_OPTIONAL: /* --netrc-optional */
config->netrc_opt = toggle;
break;
- case ONEOPT('n', 'e'): /* --netrc-file */
+ case C_NETRC_FILE: /* --netrc-file */
err = getstr(&config->netrc_file, nextarg, DENY_BLANK);
break;
- case ONEOPT('n', '\0'): /* --netrc */
+ case C_NETRC: /* --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 */
+ case C_BUFFER: /* --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 ONEOPT('O', 'a'): /* --remote-name-all */
+ case C_REMOTE_NAME_ALL: /* --remote-name-all */
config->default_node_flags = toggle?GETOUT_USEREMOTE:0;
break;
-
- case ONEOPT('O', 'b'): /* --output-dir */
+ case C_OUTPUT_DIR: /* --output-dir */
err = getstr(&config->output_dir, nextarg, DENY_BLANK);
break;
-
- case ONEOPT('O', 'c'): /* --clobber */
+ case C_CLOBBER: /* --clobber */
config->file_clobber_mode = toggle ? CLOBBER_ALWAYS : CLOBBER_NEVER;
break;
-
- case ONEOPT('o', '\0'): /* --output */
- case ONEOPT('O', '\0'): /* --remote-name */
+ case C_OUTPUT: /* --output */
+ case C_REMOTE_NAME: /* --remote-name */
/* output file */
if(!config->url_out)
config->url_out = config->url_list;
@@ -2284,7 +2486,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
}
url->flags |= GETOUT_OUTFILE;
break;
- case ONEOPT('P', '\0'): /* --ftp-port */
+ case C_FTP_PORT: /* --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.
@@ -2292,16 +2494,16 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
*/
err = getstr(&config->ftpport, nextarg, DENY_BLANK);
break;
- case ONEOPT('p', '\0'): /* --proxytunnel */
+ case C_PROXYTUNNEL: /* --proxytunnel */
/* proxy tunnel for non-http protocols */
config->proxytunnel = toggle;
break;
- case ONEOPT('q', '\0'): /* --disable */
+ case C_DISABLE: /* --disable */
/* if used first, already taken care of, we do it like this so we don't
cause an error! */
break;
- case ONEOPT('Q', '\0'): /* --quote */
+ case C_QUOTE: /* --quote */
/* QUOTE command to send to FTP server */
switch(nextarg[0]) {
case '-':
@@ -2319,7 +2521,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
break;
}
break;
- case ONEOPT('r', '\0'): /* --range */
+ case C_RANGE: /* --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
@@ -2329,24 +2531,23 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
if(curlx_strtoofft(nextarg, NULL, 10, &value)) {
warnf(global, "unsupported range point");
err = PARAM_BAD_USE;
- break;
}
- warnf(global,
- "A specified range MUST include at least one dash (-). "
- "Appending one for you");
- msnprintf(buffer, sizeof(buffer), "%" CURL_FORMAT_CURL_OFF_T "-",
- value);
- Curl_safefree(config->range);
- config->range = strdup(buffer);
- if(!config->range) {
- err = PARAM_NO_MEM;
- break;
+ else {
+ warnf(global,
+ "A specified range MUST include at least one dash (-). "
+ "Appending one for you");
+ msnprintf(buffer, sizeof(buffer), "%" CURL_FORMAT_CURL_OFF_T "-",
+ value);
+ Curl_safefree(config->range);
+ config->range = strdup(buffer);
+ if(!config->range)
+ err = PARAM_NO_MEM;
}
}
else {
/* byte range requested */
const char *tmp_range = nextarg;
- while(*tmp_range != '\0') {
+ while(*tmp_range) {
if(!ISDIGIT(*tmp_range) && *tmp_range != '-' && *tmp_range != ',') {
warnf(global, "Invalid character is found in given range. "
"A specified range MUST have only digits in "
@@ -2359,21 +2560,21 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
err = getstr(&config->range, nextarg, DENY_BLANK);
}
break;
- case ONEOPT('R', '\0'): /* --remote-time */
+ case C_REMOTE_TIME: /* --remote-time */
/* use remote file's time */
config->remote_time = toggle;
break;
- case ONEOPT('s', '\0'): /* --silent */
+ case C_SILENT: /* --silent */
global->silent = toggle;
break;
- case ONEOPT('S', '\0'): /* --show-error */
+ case C_SHOW_ERROR: /* --show-error */
global->showerror = toggle;
break;
- case ONEOPT('t', '\0'): /* --telnet-option */
+ case C_TELNET_OPTION: /* --telnet-option */
/* Telnet options */
err = add2list(&config->telnet_options, nextarg);
break;
- case ONEOPT('T', '\0'): /* --upload */
+ case C_UPLOAD_FILE: /* --upload-file */
/* we are uploading */
if(!config->url_ul)
config->url_ul = config->url_list;
@@ -2406,17 +2607,17 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
err = getstr(&url->infile, nextarg, DENY_BLANK);
}
break;
- case ONEOPT('u', '\0'): /* --user */
+ case C_USER: /* --user */
/* user:password */
err = getstr(&config->userpwd, nextarg, ALLOW_BLANK);
cleanarg(clearthis);
break;
- case ONEOPT('U', '\0'): /* --proxy-user */
+ case C_PROXY_USER: /* --proxy-user */
/* Proxy user:password */
err = getstr(&config->proxyuserpwd, nextarg, ALLOW_BLANK);
cleanarg(clearthis);
break;
- case ONEOPT('v', '\0'): /* --verbose */
+ case C_VERBOSE: /* --verbose */
if(toggle) {
/* the '%' thing here will cause the trace get sent to stderr */
Curl_safefree(global->trace_dump);
@@ -2434,12 +2635,11 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
/* verbose is disabled here */
global->tracetype = TRACE_NONE;
break;
- case ONEOPT('V', '\0'): /* --version */
+ case C_VERSION: /* --version */
if(toggle) /* --no-version yields no output! */
err = PARAM_VERSION_INFO_REQUESTED;
break;
-
- case ONEOPT('w', '\0'): /* --write-out */
+ case C_WRITE_OUT: /* --write-out */
/* get the output string */
if('@' == *nextarg) {
/* the data begins with a '@' letter, it means that a file name
@@ -2472,36 +2672,35 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
else
err = getstr(&config->writeout, nextarg, DENY_BLANK);
break;
- case ONEOPT('x', 'a'): /* --preproxy */
+ case C_PREPROXY: /* --preproxy */
err = getstr(&config->preproxy, nextarg, DENY_BLANK);
break;
- case ONEOPT('x', '\0'): /* --proxy */
+ case C_PROXY: /* --proxy */
/* --proxy */
err = getstr(&config->proxy, nextarg, ALLOW_BLANK);
if(config->proxyver != CURLPROXY_HTTPS2)
config->proxyver = CURLPROXY_HTTP;
break;
-
- case ONEOPT('X', '\0'): /* --request */
+ case C_REQUEST: /* --request */
/* set custom request */
err = getstr(&config->customrequest, nextarg, DENY_BLANK);
break;
- case ONEOPT('y', '\0'): /* --speed-limit */
+ case C_SPEED_TIME: /* --speed-time */
/* low speed time */
err = str2unum(&config->low_speed_time, nextarg);
if(!err && !config->low_speed_limit)
config->low_speed_limit = 1;
break;
- case ONEOPT('Y', '\0'): /* --speed-time */
+ case C_SPEED_LIMIT: /* --speed-limit */
/* low speed limit */
err = str2unum(&config->low_speed_limit, nextarg);
if(!err && !config->low_speed_time)
config->low_speed_time = 30;
break;
- case ONEOPT('Z', '\0'): /* --parallel */
+ case C_PARALLEL: /* --parallel */
global->parallel = toggle;
break;
- case ONEOPT('Z', 'b'): { /* --parallel-max */
+ case C_PARALLEL_MAX: { /* --parallel-max */
long val;
err = str2unum(&val, nextarg);
if(err)
@@ -2514,11 +2713,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
global->parallel_max = (unsigned short)val;
break;
}
- case ONEOPT('Z', 'c'): /* --parallel-immediate */
+ case C_PARALLEL_IMMEDIATE: /* --parallel-immediate */
global->parallel_connect = toggle;
break;
-
- case ONEOPT('z', '\0'): /* --time-cond */
+ case C_TIME_COND: /* --time-cond */
switch(*nextarg) {
case '+':
nextarg++;
tests/test1139.pl+4 -4
@@ -190,8 +190,8 @@ while(<$r>) {
$list=1;
}
elsif($list) {
- if( /^ \{(\"[^,]*\").*((\"[^ ]*)\")/) {
- my ($l, $s)=($1, $2);
+ if( /^ \{(\"[^,]*\").*\'(.)\', (.*)\}/) {
+ my ($l, $s, $rd)=($1, $2, $3);
my $sh;
my $lo;
my $title;
@@ -203,9 +203,9 @@ while(<$r>) {
$lo = $1;
$title="--$lo";
}
- if($s =~ /\"(.)\"/) {
+ if($s ne " ") {
# a short option
- $sh = $1;
+ $sh = $s;
$title="-$sh, $title";
}
push @getparam, $title;