← Commit list

b4538ec522

Daniel Stenberg

2025-02-15

SUCCESS Duration: 119s

Subject

strparse: switch to curl_off_t as base data type

Binary

Download Binary (870 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 b4538ec5229d716baa5e09b0f41b77c08c849c04
Previous HEAD position was 2ee754d830 asyn-thread: avoid the separate curl_mutex_t alloc
HEAD is now at b4538ec522 strparse: switch to curl_off_t as base data type

$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing buildinfo.txt
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/curl-base64.o
Removing lib/curl-curl_multibyte.o
Removing lib/curl-dynbuf.o
Removing lib/curl-nonblock.o
Removing lib/curl-strcase.o
Removing lib/curl-strparse.o
Removing lib/curl-strtoofft.o
Removing lib/curl-timediff.o
Removing lib/curl-version_win32.o
Removing lib/curl-warnless.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/libcurl.la
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-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-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_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sha512_256.lo
Removing lib/libcurl_la-curl_sha512_256.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-curl_trc.lo
Removing lib/libcurl_la-curl_trc.o
Removing lib/libcurl_la-cw-out.lo
Removing lib/libcurl_la-cw-out.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-dllmain.lo
Removing lib/libcurl_la-dllmain.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-httpsrr.lo
Removing lib/libcurl_la-httpsrr.o
Removing lib/libcurl_la-idn.lo
Removing lib/libcurl_la-idn.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-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-request.lo
Removing lib/libcurl_la-request.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strequal.lo
Removing lib/libcurl_la-strequal.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strparse.lo
Removing lib/libcurl_la-strparse.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/stamp-h1
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/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_osslq.lo
Removing lib/vquic/libcurl_la-curl_osslq.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic-tls.lo
Removing lib/vquic/libcurl_la-vquic-tls.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-curl_path.lo
Removing lib/vssh/libcurl_la-curl_path.o
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/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-cipher_suite.lo
Removing lib/vtls/libcurl_la-cipher_suite.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-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-vtls_scache.lo
Removing lib/vtls/libcurl_la-vtls_scache.o
Removing lib/vtls/libcurl_la-vtls_spack.lo
Removing lib/vtls/libcurl_la-vtls_spack.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/curl-slist_wc.o
Removing src/curl-terminal.o
Removing src/curl-tool_bname.o
Removing src/curl-tool_ca_embed.o
Removing src/curl-tool_cb_dbg.o
Removing src/curl-tool_cb_hdr.o
Removing src/curl-tool_cb_prg.o
Removing src/curl-tool_cb_rea.o
Removing src/curl-tool_cb_see.o
Removing src/curl-tool_cb_soc.o
Removing src/curl-tool_cb_wrt.o
Removing src/curl-tool_cfgable.o
Removing src/curl-tool_dirhie.o
Removing src/curl-tool_doswin.o
Removing src/curl-tool_easysrc.o
Removing src/curl-tool_filetime.o
Removing src/curl-tool_findfile.o
Removing src/curl-tool_formparse.o
Removing src/curl-tool_getparam.o
Removing src/curl-tool_getpass.o
Removing src/curl-tool_help.o
Removing src/curl-tool_helpers.o
Removing src/curl-tool_hugehelp.o
Removing src/curl-tool_ipfs.o
Removing src/curl-tool_libinfo.o
Removing src/curl-tool_listhelp.o
Removing src/curl-tool_main.o
Removing src/curl-tool_msgs.o
Removing src/curl-tool_operate.o
Removing src/curl-tool_operhlp.o
Removing src/curl-tool_paramhlp.o
Removing src/curl-tool_parsecfg.o
Removing src/curl-tool_progress.o
Removing src/curl-tool_setopt.o
Removing src/curl-tool_sleep.o
Removing src/curl-tool_ssls.o
Removing src/curl-tool_stderr.o
Removing src/curl-tool_strdup.o
Removing src/curl-tool_urlglob.o
Removing src/curl-tool_util.o
Removing src/curl-tool_vms.o
Removing src/curl-tool_writeout.o
Removing src/curl-tool_writeout_json.o
Removing src/curl-tool_xattr.o
Removing src/curl-var.o
Removing src/tool_ca_embed.c
Removing src/tool_hugehelp.c
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/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:126: installing './compile'
configure.ac:422: installing './config.guess'
configure.ac:422: installing './config.sub'
configure.ac:126: installing './install-sh'
configure.ac:132: installing './missing'
docs/examples/Makefile.am: installing './depcomp'

$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;

$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;

$ chmod +x configure

$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable HTTPSRR support... no
checking whether to enable ECH support... no
checking whether to enable SSL session export support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking that grep -E works... yes
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for stdatomic.h... yes
checking if _Atomic is available... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 8.12.2-DEV
checking for httpd... no
checking for apache2... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... /usr/bin/caddy
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking compiler version... gcc '1100' (raw: '11')
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking whether build target is a native Windows one... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
checking whether build target supports Win32 crypto API... no
checking for good-to-use Darwin CFLAGS... no
checking whether to build libcurl and curl in "unity" mode... no
checking whether to build tests into single-binary bundles... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support IPFS... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to build documentation... no
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking whether build target is a native Windows one... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for 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 pkg-config... (cached) /usr/bin/pkg-config
checking for libpsl options with pkg-config... found
checking for psl_builtin in -lpsl... yes
checking for libpsl.h... yes
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for sys/types.h... (cached) yes
checking for sys/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 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 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/eventfd.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for 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 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 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_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 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... yes
checking if memrchr is compilable... yes
checking if memrchr usage allowed... yes
checking if memrchr might be used... yes
checking for sys/types.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking 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 eventfd... yes
checking for fnmatch... yes
checking for geteuid... yes
checking for getpass_r... no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for mach_absolute_time... no
checking for pipe... yes
checking for poll... yes
checking for sendmsg... yes
checking for sendmmsg... yes
checking for setlocale... yes
checking for setmode... no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking for if_nametoindex... yes
checking for realpath... yes
checking for sched_yield... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking for arc4random... no
checking for fseeko... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking whether to enable the threaded resolver... yes
checking whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
checking for pthread.h... yes
checking for pthread_create... yes
checking for dirent.h... yes
checking for opendir... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable basic authentication method... yes
checking whether to enable bearer authentication method... yes
checking whether to enable digest authentication method... yes
checking whether to enable kerberos authentication method... yes
checking whether to enable negotiate authentication method... yes
checking whether to enable aws sig methods... yes
checking whether to support NTLM... yes
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support binding connections locally... yes
checking whether to support the form API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support the SHA-512/256 hash algorithm... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to support WebSockets... yes
checking whether hiding of library internal symbols will actually happen... yes
checking if this build supports HTTPS-proxy... no
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating docs/Makefile
config.status: creating docs/examples/Makefile
config.status: creating docs/libcurl/Makefile
config.status: creating docs/libcurl/opts/Makefile
config.status: creating docs/cmdline-opts/Makefile
config.status: creating include/Makefile
config.status: creating include/curl/Makefile
config.status: creating src/Makefile
config.status: creating lib/Makefile
config.status: creating scripts/Makefile
config.status: creating lib/libcurl.vers
config.status: creating tests/Makefile
config.status: creating tests/config
config.status: creating tests/configurehelp.pm
config.status: creating tests/certs/Makefile
config.status: creating tests/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
CFLAGS extras:
CPPFLAGS: -D_GNU_SOURCE
LDFLAGS:
curl-config:
LIBS: -lpsl -lz

curl version: 8.12.2-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 docs: no
Build libcurl: Shared=no, Static=yes
Built-in manual: no (--enable-manual)
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca cert embed: no
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
IPFS/IPNS: enabled
RTSP: enabled
RTMP: no (--with-librtmp)
PSL: enabled
Alt-svc: enabled (--disable-alt-svc)
Headers API: enabled (--disable-headers-api)
HSTS: no (--enable-hsts)
HTTP1: enabled (internal)
HTTP2: no (--with-nghttp2)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-openssl-quic, --with-msh3)
ECH: no (--enable-ech)
HTTPS RR: no (--enable-httpsrr)
SSLS-EXPORT: no (--enable-ssls-export)
Protocols: dict file ftp gopher http imap ipfs ipns mqtt pop3 rtsp smtp telnet tftp ws
Features: alt-svc AsynchDNS IPv6 Largefile libz PSL threadsafe UnixSockets

configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libidn2

$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-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_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sha512_256.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-cw-out.lo
CC libcurl_la-dict.lo
CC libcurl_la-dllmain.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-http2.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-httpsrr.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-request.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strequal.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strparse.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-ws.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-gsasl.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-cipher_suite.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-vtls_scache.lo
CC vtls/libcurl_la-vtls_spack.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_osslq.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vssh/libcurl_la-libssh.lo
CC vquic/libcurl_la-vquic-tls.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-curl_path.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 docs
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Nothing to be done for 'all-am'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Nothing to be done for 'all'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
Making all in libcurl
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
Making all in opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[3]: Nothing to be done for 'all-am'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC curl-slist_wc.o
CC curl-tool_bname.o
CC curl-terminal.o
CC curl-tool_cb_dbg.o
CC curl-tool_cb_hdr.o
CC curl-tool_cb_prg.o
CC curl-tool_cb_rea.o
CC curl-tool_cb_see.o
CC curl-tool_cb_soc.o
CC curl-tool_cb_wrt.o
CC curl-tool_cfgable.o
CC curl-tool_dirhie.o
CC curl-tool_doswin.o
CC curl-tool_easysrc.o
CC curl-tool_filetime.o
CC curl-tool_findfile.o
CC curl-tool_formparse.o
CC curl-tool_getparam.o
CC curl-tool_getpass.o
CC curl-tool_help.o
CC curl-tool_ipfs.o
CC curl-tool_helpers.o
CC curl-tool_libinfo.o
CC curl-tool_listhelp.o
CC curl-tool_main.o
CC curl-tool_msgs.o
CC curl-tool_operate.o
CC curl-tool_operhlp.o
CC curl-tool_paramhlp.o
CC curl-tool_parsecfg.o
CC curl-tool_progress.o
CC curl-tool_setopt.o
CC curl-tool_sleep.o
CC curl-tool_ssls.o
CC curl-tool_stderr.o
CC curl-tool_strdup.o
CC curl-tool_urlglob.o
CC curl-tool_util.o
CC curl-tool_vms.o
CC curl-tool_writeout.o
CC curl-tool_writeout_json.o
CC curl-tool_xattr.o
CC curl-var.o
echo '#include "tool_hugehelp.h"' >> tool_hugehelp.c
echo 'extern const void *curl_ca_embed; const void *curl_ca_embed;' > tool_ca_embed.c
CC ../lib/curl-base64.o
CC ../lib/curl-curl_multibyte.o
CC ../lib/curl-dynbuf.o
CC ../lib/curl-nonblock.o
CC ../lib/curl-strparse.o
CC ../lib/curl-strtoofft.o
CC ../lib/curl-strcase.o
CC ../lib/curl-timediff.o
CC ../lib/curl-version_win32.o
CC ../lib/curl-warnless.o
CC curl-tool_hugehelp.o
CC curl-tool_ca_embed.o
CCLD curl
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in scripts
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'

Commit Diff GitHub →

lib/.checksrc +2 -0 lib/Makefile.inc +1 -0 lib/altsvc.c +12 -11 lib/cf-socket.c +10 -10 lib/cfilters.c +5 -4 lib/conncache.c +4 -3 lib/cookie.c +12 -19 lib/curl_ctype.h +1 -0 lib/curl_range.c +17 -16 lib/ftp.c +12 -15 lib/ftplistparser.c +1 -1 lib/getinfo.c +14 -8 lib/hostip.c +7 -6 lib/hsts.c +8 -11 lib/http.c +5 -5 lib/imap.c +4 -4 lib/ldap.c +3 -1 lib/openldap.c +3 -1 lib/parsedate.c +1 -1 lib/request.c +5 -4 lib/rtsp.c +2 -2 lib/smtp.c +1 -1 lib/strcase.c +0 -59 lib/strequal.c +88 -0 lib/strparse.c +46 -9 lib/strparse.h +8 -3 lib/strtoofft.c +14 -194 lib/strtoofft.h +0 -16 lib/telnet.c +2 -2 lib/tftp.c +7 -6 lib/url.c +6 -6 lib/urlapi.c +37 -35 lib/vquic/.checksrc +2 -0 lib/vquic/vquic.c +3 -3 lib/vssh/libssh.c +13 -9 lib/vssh/libssh2.c +15 -7 lib/vssh/wolfssh.c +0 -1 lib/vtls/.checksrc +2 -0 lib/vtls/schannel.c +7 -5 lib/ws.c +7 -8 projects/generate.bat +4 -0 src/Makefile.inc +4 -0 tests/data/test1664 +35 -3 tests/server/Makefile.inc +4 -0 tests/unit/unit1664.c +97 -7 winbuild/MakefileBuild.vc +6 -0

lib/.checksrc+2 -0

@@ -3,3 +3,5 @@ banfunc strncpy
	banfunc sscanf
	banfunc snprintf
	banfunc vsnprint
+	banfunc strtoul
+	banfunc strtol

lib/Makefile.inc+1 -0

@@ -226,6 +226,7 @@ LIB_CFILES = \
	splay.c \
	strcase.c \
	strdup.c \
+	strequal.c \
	strerror.c \
	strparse.c \
	strtok.c \

lib/altsvc.c+12 -11

@@ -159,10 +159,10 @@ static CURLcode altsvc_add(struct altsvcinfo asi, const char line)
	struct Curl_str srcalpn;
	struct Curl_str dstalpn;
	struct Curl_str date;
-	size_t srcport;
-	size_t dstport;
-	size_t persist;
-	size_t prio;
+	curl_off_t srcport;
+	curl_off_t dstport;
+	curl_off_t persist;
+	curl_off_t prio;

	if(Curl_str_word(&line, &srcalpn, MAX_ALTSVC_ALPNLEN) \|\|
	Curl_str_singlespace(&line) \|\|
@@ -193,8 +193,8 @@ static CURLcode altsvc_add(struct altsvcinfo asi, const char line)
	memcpy(dbuf, date.str, date.len);
	dbuf[date.len] = 0;
	expires = Curl_getdate_capped(dbuf);
-	as = altsvc_create(&srchost, &dsthost, &srcalpn, &dstalpn, srcport,
-	dstport);
+	as = altsvc_create(&srchost, &dsthost, &srcalpn, &dstalpn,
+	(size_t)srcport, (size_t)dstport);
	if(as) {
	as->expires = expires;
	as->prio = 0; /* not supported to just set zero */
@@ -465,10 +465,11 @@ static void altsvc_flush(struct altsvcinfo *asi, enum alpnid srcalpnid,
	return */
	static time_t altsvc_debugtime(void *unused)
	{
-	char *timestr = getenv("CURL_TIME");
+	const char *timestr = getenv("CURL_TIME");
	(void)unused;
	if(timestr) {
-	long val = strtol(timestr, NULL, 10);
+	curl_off_t val;
+	Curl_str_number(&timestr, &val, TIME_T_MAX);
	return (time_t)val;
	}
	return time(NULL);
@@ -528,7 +529,7 @@ CURLcode Curl_altsvc_parse(struct Curl_easy *data,
	size_t dstlen = 0; /* destination hostname length */
	const char *value_ptr;
	char option[32];
-	size_t num;
+	curl_off_t num;
	bool quoted = FALSE;
	time_t maxage = 24 * 3600; /* default is 24 hours */
	bool persist = FALSE;
@@ -566,7 +567,7 @@ CURLcode Curl_altsvc_parse(struct Curl_easy *data,
	dstlen = strlen(srchost);
	}
	if(*p == ':') {
-	size_t port = 0;
+	curl_off_t port = 0;
	p++;
	if(Curl_str_number(&p, &port, 0xffff) \|\| (*p != '\"')) {
	infof(data, "Unknown alt-svc port number, ignoring.");
@@ -617,7 +618,7 @@ CURLcode Curl_altsvc_parse(struct Curl_easy *data,
	while(p && !ISBLANK(p) && p!= ';' && p != ',')
	p++;
	}
-	if(!Curl_str_number(&value_ptr, &num, SIZE_T_MAX)) {
+	if(!Curl_str_number(&value_ptr, &num, TIME_T_MAX)) {
	if(strcasecompare("ma", option))
	maxage = (time_t)num;
	else if(strcasecompare("persist", option) && (num == 1))

lib/cf-socket.c+10 -10

@@ -742,7 +742,7 @@ static CURLcode bindlocal(struct Curl_easy data, struct connectdata conn,
	Curl_printable_address. The latter returns only numeric scope
	IDs and the former returns none at all. So the scope ID, if
	present, is known to be numeric */
-	size_t scope_id;
+	curl_off_t scope_id;
	if(Curl_str_number((const char **)&scope_ptr, &scope_id, UINT_MAX))
	return CURLE_UNSUPPORTED_PROTOCOL;
	si6->sin6_scope_id = (unsigned int)scope_id;
@@ -974,28 +974,28 @@ static CURLcode cf_socket_ctx_init(struct cf_socket_ctx *ctx,

	#ifdef DEBUGBUILD
	{
-	char *p = getenv("CURL_DBG_SOCK_WBLOCK");
+	const char *p = getenv("CURL_DBG_SOCK_WBLOCK");
	if(p) {
-	long l = strtol(p, NULL, 10);
-	if(l >= 0 && l <= 100)
+	curl_off_t l;
+	if(!Curl_str_number(&p, &l, 100))
	ctx->wblock_percent = (int)l;
	}
	p = getenv("CURL_DBG_SOCK_WPARTIAL");
	if(p) {
-	long l = strtol(p, NULL, 10);
-	if(l >= 0 && l <= 100)
+	curl_off_t l;
+	if(!Curl_str_number(&p, &l, 100))
	ctx->wpartial_percent = (int)l;
	}
	p = getenv("CURL_DBG_SOCK_RBLOCK");
	if(p) {
-	long l = strtol(p, NULL, 10);
-	if(l >= 0 && l <= 100)
+	curl_off_t l;
+	if(!Curl_str_number(&p, &l, 100))
	ctx->rblock_percent = (int)l;
	}
	p = getenv("CURL_DBG_SOCK_RMAX");
	if(p) {
-	long l = strtol(p, NULL, 10);
-	if(l >= 0)
+	curl_off_t l;
+	if(!Curl_str_number(&p, &l, SIZE_T_MAX))
	ctx->recv_max = (size_t)l;
	}
	}

lib/cfilters.c+5 -4

@@ -35,6 +35,7 @@
	#include "progress.h"
	#include "select.h"
	#include "warnless.h"
+	#include "strparse.h"

	/* The last 3 #include files should be in this order */
	#include "curl_printf.h"
@@ -883,11 +884,11 @@ CURLcode Curl_conn_send(struct Curl_easy *data, int sockindex,
	{
	/* Allow debug builds to override this logic to force short sends
	*/
-	char *p = getenv("CURL_SMALLSENDS");
+	const char *p = getenv("CURL_SMALLSENDS");
	if(p) {
-	size_t altsize = (size_t)strtoul(p, NULL, 10);
-	if(altsize)
-	write_len = CURLMIN(write_len, altsize);
+	curl_off_t altsize;
+	if(!Curl_str_number(&p, &altsize, SIZE_T_MAX))
+	write_len = CURLMIN(write_len, (size_t)altsize);
	}
	}
	#endif

lib/conncache.c+4 -3

@@ -41,6 +41,7 @@
	#include "connect.h"
	#include "select.h"
	#include "strcase.h"
+	#include "strparse.h"

	/* The last 3 #include files should be in this order */
	#include "curl_printf.h"
@@ -682,10 +683,10 @@ static void cpool_close_and_destroy_all(struct cpool *cpool)
	/* Just for testing, run graceful shutdown */
	#ifdef DEBUGBUILD
	{
-	char *p = getenv("CURL_GRACEFUL_SHUTDOWN");
+	const char *p = getenv("CURL_GRACEFUL_SHUTDOWN");
	if(p) {
-	long l = strtol(p, NULL, 10);
-	if(l > 0 && l < INT_MAX)
+	curl_off_t l;
+	if(!Curl_str_number(&p, &l, INT_MAX))
	timeout_ms = (int)l;
	}
	}

lib/cookie.c+12 -19

@@ -80,7 +80,6 @@ Example set of cookies:
	#include "sendf.h"
	#include "slist.h"
	#include "share.h"
-	#include "strtoofft.h"
	#include "strcase.h"
	#include "curl_get_line.h"
	#include "curl_memrchr.h"
@@ -89,6 +88,7 @@ Example set of cookies:
	#include "fopen.h"
	#include "strdup.h"
	#include "llist.h"
+	#include "strparse.h"

	/* The last 3 #include files should be in this order */
	#include "curl_printf.h"
@@ -708,21 +708,22 @@ parse_cookie_header(struct Curl_easy *data,
	* client should discard the cookie. A value of zero means the
	* cookie should be discarded immediately.
	*/
-	CURLofft offt;
+	int rc;
	const char *maxage = valuep;
-	offt = curlx_strtoofft((*maxage == '\"') ?
-	&maxage[1] : &maxage[0], NULL, 10,
-	&co->expires);
-	switch(offt) {
-	case CURL_OFFT_FLOW:
+	if(*maxage == '\"')
+	maxage++;
+	rc = Curl_str_number(&maxage, &co->expires, CURL_OFF_T_MAX);
+
+	switch(rc) {
+	case STRE_OVERFLOW:
	/* overflow, used max value */
	co->expires = CURL_OFF_T_MAX;
	break;
-	case CURL_OFFT_INVAL:
+	default:
	/* negative or otherwise bad, expire */
	co->expires = 1;
	break;
-	case CURL_OFFT_OK:
+	case STRE_OK:
	if(!co->expires)
	/* already expired */
	co->expires = 1;
@@ -915,16 +916,8 @@ parse_netscape(struct Cookie *co,
	}
	break;
	case 4:
-	{
-	char *endp;
-	const char *p;
-	/* make sure curlx_strtoofft won't read past the current field */
-	for(p = ptr; p < &ptr[len] && ISDIGIT(*p); ++p)
-	;
-	if(p == ptr \|\| p != &ptr[len] \|\|
-	curlx_strtoofft(ptr, &endp, 10, &co->expires) \|\| endp != &ptr[len])
-	return CERR_RANGE;
-	}
+	if(Curl_str_number(&ptr, &co->expires, CURL_OFF_T_MAX))
+	return CERR_RANGE;
	break;
	case 5:
	co->name = Curl_memdup0(ptr, len);

lib/curl_ctype.h+1 -0

@@ -37,6 +37,7 @@
	#define ISCNTRL(x) (ISLOWCNTRL(x) \|\| IS7F(x))
	#define ISALPHA(x) (ISLOWER(x) \|\| ISUPPER(x))
	#define ISXDIGIT(x) (ISDIGIT(x) \|\| ISLOWHEXALHA(x) \|\| ISUPHEXALHA(x))
+	#define ISODIGIT(x) (((x) >= '0') && ((x) <= '7'))
	#define ISALNUM(x) (ISDIGIT(x) \|\| ISLOWER(x) \|\| ISUPPER(x))
	#define ISUPPER(x) (((x) >= 'A') && ((x) <= 'Z'))
	#define ISLOWER(x) (((x) >= 'a') && ((x) <= 'z'))

lib/curl_range.c+17 -16

@@ -26,7 +26,7 @@
	#include <curl/curl.h>
	#include "curl_range.h"
	#include "sendf.h"
-	#include "strtoofft.h"
+	#include "strparse.h"

	/* Only include this function if one or more of FTP, FILE are enabled. */
	#if !defined(CURL_DISABLE_FTP) \|\| !defined(CURL_DISABLE_FILE)
@@ -37,28 +37,29 @@
	*/
	CURLcode Curl_range(struct Curl_easy *data)
	{
-	curl_off_t from, to;
-	char *ptr;
-	char *ptr2;
-
	if(data->state.use_range && data->state.range) {
-	CURLofft from_t;
-	CURLofft to_t;
-	from_t = curlx_strtoofft(data->state.range, &ptr, 10, &from);
-	if(from_t == CURL_OFFT_FLOW)
-	return CURLE_RANGE_ERROR;
-	while(ptr && (ISBLANK(ptr) \|\| (*ptr == '-')))
-	ptr++;
-	to_t = curlx_strtoofft(ptr, &ptr2, 10, &to);
-	if(to_t == CURL_OFFT_FLOW)
+	curl_off_t from, to;
+	bool first_num = TRUE;
+	const char *p = data->state.range;
+	if(Curl_str_number(&p, &from, CURL_OFF_T_MAX))
+	first_num = FALSE;
+
+	if(Curl_str_single(&p, '-'))
+	/* no leading dash or after the first number is an error */
	return CURLE_RANGE_ERROR;
-	if((to_t == CURL_OFFT_INVAL) && !from_t) {
+
+	if(Curl_str_number(&p, &to, CURL_OFF_T_MAX)) {
+	/* no second number */
	/* X - */
	data->state.resume_from = from;
	DEBUGF(infof(data, "RANGE %" FMT_OFF_T " to end of file", from));
	}
-	else if((from_t == CURL_OFFT_INVAL) && !to_t) {
+	else if(!first_num) {
	/* -Y */
+	if(!to)
+	/* "-0" is just wrong */
+	return CURLE_RANGE_ERROR;
+
	data->req.maxdownload = to;
	data->state.resume_from = -to;
	DEBUGF(infof(data, "RANGE the last %" FMT_OFF_T " bytes", to));

lib/ftp.c+12 -15

@@ -54,7 +54,6 @@
	#include "ftplistparser.h"
	#include "curl_range.h"
	#include "curl_krb5.h"
-	#include "strtoofft.h"
	#include "strcase.h"
	#include "vtls/vtls.h"
	#include "cfilters.h"
@@ -473,7 +472,7 @@ static CURLcode ftp_check_ctrl_on_data_wait(struct Curl_easy *data)
	r += pp->nfinal;

	if(LASTLINE(r)) {
-	size_t status;
+	curl_off_t status;
	if(!Curl_str_number(&r, &status, 999) && (status == 226)) {
	/* funny timing situation where we get the final message on the
	control connection before traffic on the data connection has been
@@ -544,7 +543,7 @@ static CURLcode InitiateTransfer(struct Curl_easy *data)
	static bool ftp_endofresp(struct Curl_easy data, struct connectdata conn,
	const char line, size_t len, int code)
	{
-	size_t status;
+	curl_off_t status;
	(void)data;
	(void)conn;

@@ -929,8 +928,8 @@ static CURLcode ftp_state_use_port(struct Curl_easy *data,
	if(ip_end) {
	const char *portp = strchr(ip_end, ':');
	if(portp) {
-	size_t start;
-	size_t end;
+	curl_off_t start;
+	curl_off_t end;
	portp++;
	if(!Curl_str_number(&portp, &start, 0xffff)) {
	/* got the first number */
@@ -1767,7 +1766,7 @@ static bool match_pasv_6nums(const char *p,
	{
	int i;
	for(i = 0; i < 6; i++) {
-	size_t num;
+	curl_off_t num;
	if(i) {
	if(*p != ',')
	return FALSE;
@@ -1805,11 +1804,9 @@ static CURLcode ftp_state_pasv_resp(struct Curl_easy *data,
	ptr++;
	/* \|\|\|12345\| */
	sep = ptr[0];
-	/* the ISDIGIT() check here is because strtoul() accepts leading minus
-	etc */
	if((ptr[1] == sep) && (ptr[2] == sep) && ISDIGIT(ptr[3])) {
	const char *p = &ptr[3];
-	size_t num;
+	curl_off_t num;
	if(Curl_str_number(&p, &num, 0xffff) \|\| (*p != sep)) {
	failf(data, "Illegal port number in EPSV reply");
	return CURLE_FTP_WEIRD_PASV_REPLY;
@@ -2297,7 +2294,7 @@ static CURLcode ftp_state_size_resp(struct Curl_easy *data,
	for all the digits at the end of the response and parse only those as a
	number. */
	char *start = &buf[4];
-	char *fdigit = memchr(start, '\r', len);
+	const char *fdigit = memchr(start, '\r', len);
	if(fdigit) {
	fdigit--;
	if(*fdigit == '\n')
@@ -2307,9 +2304,8 @@ static CURLcode ftp_state_size_resp(struct Curl_easy *data,
	}
	else
	fdigit = start;
-	/* ignores parsing errors, which will make the size remain unknown */
-	(void)curlx_strtoofft(fdigit, NULL, 10, &filesize);
-
+	if(Curl_str_number(&fdigit, &filesize, CURL_OFF_T_MAX))
+	filesize = -1; /* size remain unknown */
	}
	else if(ftpcode == 550) { /* "No such file or directory" */
	/* allow a SIZE failure for (resumed) uploads, when probing what command
@@ -2471,7 +2467,7 @@ static CURLcode ftp_state_get_resp(struct Curl_easy *data,
	* those cases only confuses us.
	*
	* Example D above makes this parsing a little tricky */
-	char *bytes;
+	const char *bytes;
	char *buf = Curl_dyn_ptr(&conn->proto.ftpc.pp.recvbuf);
	bytes = strstr(buf, " bytes");
	if(bytes) {
@@ -2493,7 +2489,8 @@ static CURLcode ftp_state_get_resp(struct Curl_easy *data,
	if(bytes) {
	++bytes;
	/* get the number! */
-	(void)curlx_strtoofft(bytes, NULL, 10, &size);
+	if(Curl_str_number(&bytes, &size, CURL_OFF_T_MAX))
+	size = 1;
	}
	}
	}

lib/ftplistparser.c+1 -1

@@ -547,7 +547,7 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
	parser->item_length ++;
	if(c == ' ') {
	const char *p = &mem[parser->item_offset];
-	size_t hlinks;
+	curl_off_t hlinks;
	mem[parser->item_offset + parser->item_length - 1] = 0;

	if(!Curl_str_number(&p, &hlinks, LONG_MAX)) {

lib/getinfo.c+14 -8

@@ -28,10 +28,10 @@

	#include "urldata.h"
	#include "getinfo.h"
-
	#include "vtls/vtls.h"
	#include "connect.h" /* Curl_getconnectinfo() */
	#include "progress.h"
+	#include "strparse.h"

	/* The last #include files should be: */
	#include "curl_memory.h"
@@ -204,9 +204,10 @@ static CURLcode getinfo_long(struct Curl_easy *data, CURLINFO info,
	} lptr;

	#ifdef DEBUGBUILD
-	char *timestr = getenv("CURL_TIME");
+	const char *timestr = getenv("CURL_TIME");
	if(timestr) {
-	unsigned long val = strtoul(timestr, NULL, 10);
+	curl_off_t val;
+	Curl_str_number(&timestr, &val, TIME_T_MAX);
	switch(info) {
	case CURLINFO_LOCAL_PORT:
	*param_longp = (long)val;
@@ -218,7 +219,8 @@ static CURLcode getinfo_long(struct Curl_easy *data, CURLINFO info,
	/* use another variable for this to allow different values */
	timestr = getenv("CURL_DEBUG_SIZE");
	if(timestr) {
-	unsigned long val = strtoul(timestr, NULL, 10);
+	curl_off_t val;
+	Curl_str_number(&timestr, &val, LONG_MAX);
	switch(info) {
	case CURLINFO_HEADER_SIZE:
	case CURLINFO_REQUEST_SIZE:
@@ -379,9 +381,11 @@ static CURLcode getinfo_offt(struct Curl_easy *data, CURLINFO info,
	curl_off_t *param_offt)
	{
	#ifdef DEBUGBUILD
-	char *timestr = getenv("CURL_TIME");
+	const char *timestr = getenv("CURL_TIME");
	if(timestr) {
-	unsigned long val = strtoul(timestr, NULL, 10);
+	curl_off_t val;
+	Curl_str_number(&timestr, &val, CURL_OFF_T_MAX);
+
	switch(info) {
	case CURLINFO_TOTAL_TIME_T:
	case CURLINFO_NAMELOOKUP_TIME_T:
@@ -476,9 +480,11 @@ static CURLcode getinfo_double(struct Curl_easy *data, CURLINFO info,
	double *param_doublep)
	{
	#ifdef DEBUGBUILD
-	char *timestr = getenv("CURL_TIME");
+	const char *timestr = getenv("CURL_TIME");
	if(timestr) {
-	unsigned long val = strtoul(timestr, NULL, 10);
+	curl_off_t val;
+	Curl_str_number(&timestr, &val, CURL_OFF_T_MAX);
+
	switch(info) {
	case CURLINFO_TOTAL_TIME:
	case CURLINFO_NAMELOOKUP_TIME:

lib/hostip.c+7 -6

@@ -1134,7 +1134,7 @@ CURLcode Curl_loadhostpairs(struct Curl_easy *data)
	if(!hostp->data)
	continue;
	if(hostp->data[0] == '-') {
-	size_t num = 0;
+	curl_off_t num = 0;
	size_t entry_len;
	size_t hlen = 0;
	host_end = strchr(&hostp->data[1], ':');
@@ -1173,7 +1173,7 @@ CURLcode Curl_loadhostpairs(struct Curl_easy *data)
	const char *addr_begin;
	const char *addr_end;
	const char *port_ptr;
-	size_t port = 0;
+	curl_off_t port = 0;
	const char *end_ptr;
	bool permanent = TRUE;
	bool error = TRUE;
@@ -1273,8 +1273,8 @@ err:
	dns = Curl_hash_pick(data->dns.hostcache, entry_id, entry_len + 1);

	if(dns) {
-	infof(data, "RESOLVE %.*s:%zd - old addresses discarded",
-	(int)hlen, host_begin, port);
+	infof(data, "RESOLVE %.*s:%" CURL_FORMAT_CURL_OFF_T
+	" - old addresses discarded", (int)hlen, host_begin, port);
	/* delete old entry, there are two reasons for this
	1. old entry may have different addresses.
	2. even if entry with correct addresses is already in the cache,
@@ -1306,14 +1306,15 @@ err:
	return CURLE_OUT_OF_MEMORY;
	}
	#ifndef CURL_DISABLE_VERBOSE_STRINGS
-	infof(data, "Added %.*s:%zd:%s to DNS cache%s",
+	infof(data, "Added %.*s:%" CURL_FORMAT_CURL_OFF_T ":%s to DNS cache%s",
	(int)hlen, host_begin, port, addresses,
	permanent ? "" : " (non-permanent)");
	#endif

	/* Wildcard hostname */
	if((hlen == 1) && (host_begin[0] == '*')) {
-	infof(data, "RESOLVE *:%zd using wildcard", port);
+	infof(data, "RESOLVE *:%" CURL_FORMAT_CURL_OFF_T " using wildcard",
+	port);
	data->state.wildcard_resolve = TRUE;
	}
	}

lib/hsts.c+8 -11

@@ -35,7 +35,6 @@
	#include "curl_get_line.h"
	#include "strcase.h"
	#include "sendf.h"
-	#include "strtoofft.h"
	#include "parsedate.h"
	#include "fopen.h"
	#include "rename.h"
@@ -59,13 +58,12 @@
	time_t deltatime; /* allow for "adjustments" for unit test purposes */
	static time_t hsts_debugtime(void *unused)
	{
-	char *timestr = getenv("CURL_TIME");
+	const char *timestr = getenv("CURL_TIME");
	(void)unused;
	if(timestr) {
	curl_off_t val;
-	(void)curlx_strtoofft(timestr, NULL, 10, &val);
-
-	val += (curl_off_t)deltatime;
+	if(!Curl_str_number(&timestr, &val, TIME_T_MAX))
+	val += (curl_off_t)deltatime;
	return (time_t)val;
	}
	return time(NULL);
@@ -160,8 +158,7 @@ CURLcode Curl_hsts_parse(struct hsts h, const char hostname,
	p++;
	if(strncasecompare("max-age", p, 7)) {
	bool quoted = FALSE;
-	CURLofft offt;
-	char *endp;
+	int rc;

	if(gotma)
	return CURLE_BAD_FUNCTION_ARGUMENT;
@@ -178,13 +175,13 @@ CURLcode Curl_hsts_parse(struct hsts h, const char hostname,
	p++;
	quoted = TRUE;
	}
-	offt = curlx_strtoofft(p, &endp, 10, &expires);
-	if(offt == CURL_OFFT_FLOW)
+	rc = Curl_str_number(&p, &expires, TIME_T_MAX);
+	if(rc == STRE_OVERFLOW)
	expires = CURL_OFF_T_MAX;
-	else if(offt)
+	else if(rc)
	/* invalid max-age */
	return CURLE_BAD_FUNCTION_ARGUMENT;
-	p = endp;
+
	if(quoted) {
	if(*p != '\"')
	return CURLE_BAD_FUNCTION_ARGUMENT;

lib/http.c+5 -5

@@ -86,6 +86,7 @@
	#include "hsts.h"
	#include "ws.h"
	#include "curl_ctype.h"
+	#include "strparse.h"

	/* The last 3 #include files should be in this order */
	#include "curl_printf.h"
@@ -3072,11 +3073,10 @@ static CURLcode http_header(struct Curl_easy *data,

	/* if it truly stopped on a digit */
	if(ISDIGIT(*ptr)) {
-	if(!curlx_strtoofft(ptr, NULL, 10, &k->offset)) {
-	if(data->state.resume_from == k->offset)
-	/* we asked for a resume and we got it */
-	k->content_range = TRUE;
-	}
+	if(!Curl_str_number(&ptr, &k->offset, CURL_OFF_T_MAX) &&
+	(data->state.resume_from == k->offset))
+	/* we asked for a resume and we got it */
+	k->content_range = TRUE;
	}
	else if(k->httpcode < 300)
	data->state.resume_from = 0; /* get everything */

lib/imap.c+4 -4

@@ -64,7 +64,7 @@
	#include "socks.h"
	#include "imap.h"
	#include "mime.h"
-	#include "strtoofft.h"
+	#include "strparse.h"
	#include "strcase.h"
	#include "vtls/vtls.h"
	#include "cfilters.h"
@@ -1156,9 +1156,9 @@ static CURLcode imap_state_fetch_resp(struct Curl_easy *data,
	the continuation data contained within the curly brackets */
	ptr = memchr(ptr, '{', len);
	if(ptr) {
-	char *endptr;
-	if(!curlx_strtoofft(ptr + 1, &endptr, 10, &size) &&
-	(endptr - ptr > 1 && *endptr == '}'))
+	ptr++;
+	if(!Curl_str_number(&ptr, &size, CURL_OFF_T_MAX) &&
+	!Curl_str_single(&ptr, '}'))
	parsed = TRUE;
	}

lib/ldap.c+3 -1

@@ -728,7 +728,9 @@ static void _ldap_trace(const char *fmt, ...)

	if(do_trace == -1) {
	const char *env = getenv("CURL_TRACE");
-	do_trace = (env && strtol(env, NULL, 10) > 0);
+	curl_off_t e = 0;
+	if(!Curl_str_number(&env, &e, INT_MAX))
+	do_trace = e > 0;
	}
	if(!do_trace)
	return;

lib/openldap.c+3 -1

@@ -560,7 +560,9 @@ static CURLcode oldap_connect(struct Curl_easy data, bool done)
	#ifdef CURL_OPENLDAP_DEBUG
	if(do_trace < 0) {
	const char *env = getenv("CURL_OPENLDAP_TRACE");
-	do_trace = (env && strtol(env, NULL, 10) > 0);
+	curl_off_t e = 0;
+	if(!Curl_str_number(&env, &e, INT_MAX))
+	do_trace = e > 0;
	}
	if(do_trace)
	ldap_set_option(li->ld, LDAP_OPT_DEBUG_LEVEL, &do_trace);

lib/parsedate.c+1 -1

@@ -420,7 +420,7 @@ static int parsedate(const char date, time_t output)
	date = end;
	}
	else {
-	size_t lval;
+	curl_off_t lval;
	int num_digits = 0;
	const char *p = date;
	if(Curl_str_number(&p, &lval, 99999999))

lib/request.c+5 -4

@@ -34,6 +34,7 @@
	#include "sendf.h"
	#include "transfer.h"
	#include "url.h"
+	#include "strparse.h"

	/* The last 3 #include files should be in this order */
	#include "curl_printf.h"
@@ -194,11 +195,11 @@ static CURLcode xfer_send(struct Curl_easy *data,
	/* Allow debug builds to override this logic to force short initial
	sends */
	size_t body_len = blen - hds_len;
-	char *p = getenv("CURL_SMALLREQSEND");
+	const char *p = getenv("CURL_SMALLREQSEND");
	if(p) {
-	size_t body_small = (size_t)strtoul(p, NULL, 10);
-	if(body_small && body_small < body_len)
-	blen = hds_len + body_small;
+	curl_off_t body_small;
+	if(!Curl_str_number(&p, &body_small, body_len))
+	blen = hds_len + (size_t)body_small;
	}
	}
	#endif

lib/rtsp.c+2 -2

@@ -926,7 +926,7 @@ CURLcode rtp_client_write(struct Curl_easy data, const char ptr, size_t len)
	CURLcode Curl_rtsp_parseheader(struct Curl_easy data, const char header)
	{
	if(checkprefix("CSeq:", header)) {
-	size_t CSeq = 0;
+	curl_off_t CSeq = 0;
	struct RTSP *rtsp = data->req.p.rtsp;
	const char *p = &header[5];
	while(ISBLANK(*p))
@@ -1007,7 +1007,7 @@ CURLcode rtsp_parse_transport(struct Curl_easy data, const char transport)
	start++;
	end = strchr(start, ';');
	if(checkprefix("interleaved=", start)) {
-	size_t chan1, chan2, chan;
+	curl_off_t chan1, chan2, chan;
	const char *p = start + 12;
	if(!Curl_str_number(&p, &chan1, 255)) {
	unsigned char *rtp_channel_mask = data->state.rtp_channel_mask;

lib/smtp.c+1 -1

@@ -215,7 +215,7 @@ static bool smtp_endofresp(struct Curl_easy data, struct connectdata conn,
	only send the response code instead as per Section 4.2. */
	if(line[3] == ' ' \|\| len == 5) {
	char tmpline[6];
-	size_t code;
+	curl_off_t code;
	const char *p = tmpline;
	result = TRUE;
	memcpy(tmpline, line, (len == 5 ? 5 : 3));

lib/strcase.c+0 -59

@@ -82,65 +82,6 @@ char Curl_raw_tolower(char in)
	return (char)tolowermap[(unsigned char) in];
	}

-	/*
-	* curl_strequal() is for doing "raw" case insensitive strings. This is meant
-	* to be locale independent and only compare strings we know are safe for
-	* this. See https://daniel.haxx.se/blog/2008/10/15/strcasecmp-in-turkish/ for
-	* further explanations as to why this function is necessary.
-	*/
-
-	static int casecompare(const char first, const char second)
-	{
-	while(*first) {
-	if(Curl_raw_toupper(first) != Curl_raw_toupper(second))
-	/* get out of the loop as soon as they do not match */
-	return 0;
-	first++;
-	second++;
-	}
-	/* If we are here either the strings are the same or the length is different.
-	We can just test if the "current" character is non-zero for one and zero
-	for the other. Note that the characters may not be exactly the same even
-	if they match, we only want to compare zero-ness. */
-	return !first == !second;
-	}
-
-	/* --- public function --- */
-	int curl_strequal(const char first, const char second)
-	{
-	if(first && second)
-	/* both pointers point to something then compare them */
-	return casecompare(first, second);
-
-	/* if both pointers are NULL then treat them as equal */
-	return NULL == first && NULL == second;
-	}
-
-	static int ncasecompare(const char first, const char second, size_t max)
-	{
-	while(*first && max) {
-	if(Curl_raw_toupper(first) != Curl_raw_toupper(second))
-	return 0;
-	max--;
-	first++;
-	second++;
-	}
-	if(0 == max)
-	return 1; /* they are equal this far */
-
-	return Curl_raw_toupper(first) == Curl_raw_toupper(second);
-	}
-
-	/* --- public function --- */
-	int curl_strnequal(const char first, const char second, size_t max)
-	{
-	if(first && second)
-	/* both pointers point to something then compare them */
-	return ncasecompare(first, second, max);
-
-	/* if both pointers are NULL then treat them as equal if max is non-zero */
-	return NULL == first && NULL == second && max;
-	}
	/* Copy an upper case version of the string from src to dest. The
	* strings may overlap. No more than n characters of the string are copied
	* (including any NUL) and the destination string will NOT be

lib/strequal.c+88 -0

@@ -0,0 +1,88 @@
+	/***************************************************************************
+	* _ _ ____ _
+	* Project ___\| \| \| \| _ \\| \|
+	* / __\| \| \| \| \|_) \| \|
+	* \| (__\| \|_\| \| _ <\| \|___
+	* \___\|\___/\|_\| \_\_____\|
+	*
+	* Copyright (C) Daniel Stenberg, <[email protected]>, et al.
+	*
+	* This software is licensed as described in the file COPYING, which
+	* you should have received as part of this distribution. The terms
+	* are also available at https://curl.se/docs/copyright.html.
+	*
+	* You may opt to use, copy, modify, merge, publish, distribute and/or sell
+	* copies of the Software, and permit persons to whom the Software is
+	* furnished to do so, under the terms of the COPYING file.
+	*
+	* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+	* KIND, either express or implied.
+	*
+	* SPDX-License-Identifier: curl
+	*
+	***************************************************************************/
+
+	#include "curl_setup.h"
+
+	#include <curl/curl.h>
+	#include "strcase.h"
+
+	/*
+	* curl_strequal() is for doing "raw" case insensitive strings. This is meant
+	* to be locale independent and only compare strings we know are safe for
+	* this. See https://daniel.haxx.se/blog/2008/10/15/strcasecmp-in-turkish/ for
+	* further explanations as to why this function is necessary.
+	*/
+
+	static int casecompare(const char first, const char second)
+	{
+	while(*first) {
+	if(Curl_raw_toupper(first) != Curl_raw_toupper(second))
+	/* get out of the loop as soon as they do not match */
+	return 0;
+	first++;
+	second++;
+	}
+	/* If we are here either the strings are the same or the length is different.
+	We can just test if the "current" character is non-zero for one and zero
+	for the other. Note that the characters may not be exactly the same even
+	if they match, we only want to compare zero-ness. */
+	return !first == !second;
+	}
+
+	static int ncasecompare(const char first, const char second, size_t max)
+	{
+	while(*first && max) {
+	if(Curl_raw_toupper(first) != Curl_raw_toupper(second))
+	return 0;
+	max--;
+	first++;
+	second++;
+	}
+	if(0 == max)
+	return 1; /* they are equal this far */
+
+	return Curl_raw_toupper(first) == Curl_raw_toupper(second);
+	}
+
+	/* --- public function --- */
+	int curl_strequal(const char first, const char second)
+	{
+	if(first && second)
+	/* both pointers point to something then compare them */
+	return casecompare(first, second);
+
+	/* if both pointers are NULL then treat them as equal */
+	return NULL == first && NULL == second;
+	}
+
+	/* --- public function --- */
+	int curl_strnequal(const char first, const char second, size_t max)
+	{
+	if(first && second)
+	/* both pointers point to something then compare them */
+	return ncasecompare(first, second, max);
+
+	/* if both pointers are NULL then treat them as equal if max is non-zero */
+	return NULL == first && NULL == second && max;
+	}

lib/strparse.c+46 -9

@@ -23,6 +23,7 @@
	***************************************************************************/

	#include "strparse.h"
+	#include "strcase.h"

	/* Get a word until the first DELIM or end of string. At least one byte long.
	return non-zero on error */
@@ -103,28 +104,64 @@ int Curl_str_singlespace(const char **linep)
	return Curl_str_single(linep, ' ');
	}

-	/* Get an unsigned number. Leading zeroes are accepted.
-	return non-zero on error */
-	int Curl_str_number(const char *linep, size_t nump, size_t max)
+	/* given an ASCII hexadecimal character, return the value */
+	#define HEXDIGIT2NUM(x) \
+	(((x) > '9') ? Curl_raw_tolower(x) - 'a' + 10 : x - '0')
+
+	/* given an ASCII character and a given base, return TRUE if valid */
+	#define valid_digit(digit, base) \
+	(((base == 10) && ISDIGIT(digit)) \|\| \
+	((base == 16) && ISXDIGIT(digit)) \|\| \
+	((base == 8) && ISODIGIT(digit)))
+
+	/* given an ASCII character and a given base, return the value */
+	#define num_digit(digit, base) \
+	((base != 16) ? digit - '0' : HEXDIGIT2NUM(digit))
+
+	/* no support for 0x prefix nor leading spaces */
+	static int str_num_base(const char *linep, curl_off_t nump, curl_off_t max,
+	int base) /* 8, 10 or 16, nothing else */
	{
-	size_t num = 0;
+	curl_off_t num = 0;
	DEBUGASSERT(linep && *linep && nump);
+	DEBUGASSERT((base == 8) \|\| (base == 10) \|\| (base == 16));
	*nump = 0;
-	if(!ISDIGIT(**linep))
+	if(!valid_digit(**linep, base))
	return STRE_NO_NUM;
	do {
-	int n = **linep - '0';
-	if(num > ((SIZE_T_MAX - n) / 10))
+	int n = num_digit(**linep, base);
+	if(num > ((CURL_OFF_T_MAX - n) / base))
	return STRE_OVERFLOW;
-	num = num * 10 + n;
+	num = num * base + n;
	if(num > max)
	return STRE_BIG; /** too big */
	(*linep)++;
-	} while(ISDIGIT(**linep));
+	} while(valid_digit(**linep, base));
	*nump = num;
	return STRE_OK;
	}

+	/* Get an unsigned decimal number with no leading space or minus. Leading
+	zeroes are accepted. return non-zero on error */
+	int Curl_str_number(const char *linep, curl_off_t nump, curl_off_t max)
+	{
+	return str_num_base(linep, nump, max, 10);
+	}
+
+	/* Get an unsigned hexadecimal number with no leading space or minus and no
+	"0x" support. Leading zeroes are accepted. return non-zero on error */
+	int Curl_str_hex(const char *linep, curl_off_t nump, curl_off_t max)
+	{
+	return str_num_base(linep, nump, max, 16);
+	}
+
+	/* Get an unsigned octal number with no leading space or minus and no "0"
+	prefix support. Leading zeroes are accepted. return non-zero on error */
+	int Curl_str_octal(const char *linep, curl_off_t nump, curl_off_t max)
+	{
+	return str_num_base(linep, nump, max, 8);
+	}
+
	/* CR or LF
	return non-zero on error */
	int Curl_str_newline(const char **linep)

lib/strparse.h+8 -3

@@ -62,9 +62,14 @@ int Curl_str_single(const char **linep, char byte);
	return non-zero on error */
	int Curl_str_singlespace(const char **linep);

-	/* Get an unsigned number
-	return non-zero on error */
-	int Curl_str_number(const char *linep, size_t nump, size_t max);
+	/* Get an unsigned decimal number. Return non-zero on error */
+	int Curl_str_number(const char *linep, curl_off_t nump, curl_off_t max);
+
+	/* Get an unsigned hexadecimal number. Return non-zero on error */
+	int Curl_str_hex(const char *linep, curl_off_t nump, curl_off_t max);
+
+	/* Get an unsigned octal number. Return non-zero on error */
+	int Curl_str_octal(const char *linep, curl_off_t nump, curl_off_t max);

	/* Check for CR or LF
	return non-zero on error */

lib/strtoofft.c+14 -194

@@ -22,216 +22,36 @@
	*
	***************************************************************************/

-	#include <errno.h>
	#include "curl_setup.h"

	#include "strtoofft.h"
+	#include "strparse.h"

	/*
-	* NOTE:
-	*
-	* In the ISO C standard (IEEE Std 1003.1), there is a strtoimax() function we
-	* could use in case strtoll() does not exist... See
-	* https://www.opengroup.org/onlinepubs/009695399/functions/strtoimax.html
-	*/
-
-	#if (SIZEOF_CURL_OFF_T > SIZEOF_LONG)
-	# ifdef HAVE_STRTOLL
-	# define strtooff strtoll
-	# else
-	# if defined(_MSC_VER) && (_MSC_VER >= 1300)
-	# if defined(_SAL_VERSION)
-	_Check_return_ _CRTIMP __int64 __cdecl _strtoi64(
-	_In_z_ const char *_String,
-	_Out_opt_ _Deref_post_z_ char **_EndPtr, _In_ int _Radix);
-	# else
-	_CRTIMP __int64 __cdecl _strtoi64(const char *_String,
-	char **_EndPtr, int _Radix);
-	# endif
-	# define strtooff _strtoi64
-	# else
-	# define PRIVATE_STRTOOFF 1
-	# endif
-	# endif
-	#else
-	# define strtooff strtol
-	#endif
-
-	#ifdef PRIVATE_STRTOOFF
-
-	/* Range tests can be used for alphanum decoding if characters are consecutive,
-	like in ASCII. Else an array is scanned. Determine this condition now. */
-
-	#if('9' - '0') != 9 \|\| ('Z' - 'A') != 25 \|\| ('z' - 'a') != 25
-
-	#define NO_RANGE_TEST
-
-	static const char valchars[] =
-	"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-	#endif
-
-	static int get_char(char c, int base);
-
-	/**
-	* Custom version of the strtooff function. This extracts a curl_off_t
-	* value from the given input string and returns it.
-	*/
-	static curl_off_t strtooff(const char nptr, char *endptr, int base)
-	{
-	char *end;
-	bool is_negative = FALSE;
-	bool overflow = FALSE;
-	int i;
-	curl_off_t value = 0;
-
-	/* Skip leading whitespace. */
-	end = (char *)nptr;
-	while(ISBLANK(end[0])) {
-	end++;
-	}
-
-	/* Handle the sign, if any. */
-	if(end[0] == '-') {
-	is_negative = TRUE;
-	end++;
-	}
-	else if(end[0] == '+') {
-	end++;
-	}
-	else if(end[0] == '\0') {
-	/* We had nothing but perhaps some whitespace -- there was no number. */
-	if(endptr) {
-	*endptr = end;
-	}
-	return 0;
-	}
-
-	/* Handle special beginnings, if present and allowed. */
-	if(end[0] == '0' && end[1] == 'x') {
-	if(base == 16 \|\| base == 0) {
-	end += 2;
-	base = 16;
-	}
-	}
-	else if(end[0] == '0') {
-	if(base == 8 \|\| base == 0) {
-	end++;
-	base = 8;
-	}
-	}
-
-	/* Matching strtol, if the base is 0 and it does not look like
-	* the number is octal or hex, we assume it is base 10.
-	*/
-	if(base == 0) {
-	base = 10;
-	}
-
-	/* Loop handling digits. */
-	for(i = get_char(end[0], base);
-	i != -1;
-	end++, i = get_char(end[0], base)) {
-
-	if(value > (CURL_OFF_T_MAX - i) / base) {
-	overflow = TRUE;
-	break;
-	}
-	value = base * value + i;
-	}
-
-	if(!overflow) {
-	if(is_negative) {
-	/* Fix the sign. */
-	value *= -1;
-	}
-	}
-	else {
-	if(is_negative)
-	value = CURL_OFF_T_MIN;
-	else
-	value = CURL_OFF_T_MAX;
-
-	errno = ERANGE;
-	}
-
-	if(endptr)
-	*endptr = end;
-
-	return value;
-	}
-
-	/**
-	* Returns the value of c in the given base, or -1 if c cannot
-	* be interpreted properly in that base (i.e., is out of range,
-	* is a null, etc.).
-	*
-	* @param c the character to interpret according to base
-	* @param base the base in which to interpret c
-	*
-	* @return the value of c in base, or -1 if c is not in range
-	*/
-	static int get_char(char c, int base)
-	{
-	#ifndef NO_RANGE_TEST
-	int value = -1;
-	if(c <= '9' && c >= '0') {
-	value = c - '0';
-	}
-	else if(c <= 'Z' && c >= 'A') {
-	value = c - 'A' + 10;
-	}
-	else if(c <= 'z' && c >= 'a') {
-	value = c - 'a' + 10;
-	}
-	#else
-	const char *cp;
-	int value;
-
-	cp = memchr(valchars, c, 10 + 26 + 26);
-
-	if(!cp)
-	return -1;
-
-	value = cp - valchars;
-
-	if(value >= 10 + 26)
-	value -= 26; /* Lowercase. */
-	#endif
-
-	if(value >= base) {
-	value = -1;
-	}
-
-	return value;
-	}
-	#endif /* Only present if we need strtoll, but do not have it. */
-
-	/*
-	* Parse a positive up to 64-bit number written in ASCII.
+	* Parse a positive number up to 63-bit number written in ASCII. Skip leading
+	* blanks. No support for prefixes.
	*/
	CURLofft curlx_strtoofft(const char str, char *endp, int base,
	curl_off_t *num)
	{
-	char *end = NULL;
	curl_off_t number;
-	errno = 0;
+	int rc;
	num = 0; / clear by default */
-	DEBUGASSERT(base); /* starting now, avoid base zero */
+	DEBUGASSERT((base == 10) \|\| (base == 16));

	while(str && ISBLANK(str))
	str++;
-	if(('-' == str) \|\| (ISSPACE(str))) {
-	if(endp)
-	endp = (char )str; /* did not actually move */
-	return CURL_OFFT_INVAL; /* nothing parsed */
-	}
-	number = strtooff(str, &end, base);
+
+	rc = base == 10 ?
+	Curl_str_number(&str, &number, CURL_OFF_T_MAX) :
+	Curl_str_hex(&str, &number, CURL_OFF_T_MAX);
+
	if(endp)
-	*endp = end;
-	if(errno == ERANGE)
-	/* overflow/underflow */
+	endp = (char )str;
+	if(rc == STRE_OVERFLOW)
+	/* overflow */
	return CURL_OFFT_FLOW;
-	else if(str == end)
+	else if(rc)
	/* nothing parsed */
	return CURL_OFFT_INVAL;

lib/strtoofft.h+0 -16

@@ -26,22 +26,6 @@

	#include "curl_setup.h"

-	/*
-	* Determine which string to integral data type conversion function we use
-	* to implement string conversion to our curl_off_t integral data type.
-	*
-	* Notice that curl_off_t might be 64 or 32 bits wide, and that it might use
-	* an underlying data type which might be 'long', 'int64_t', 'long long' or
-	* '__int64' and more remotely other data types.
-	*
-	* On systems where the size of curl_off_t is greater than the size of 'long'
-	* the conversion function to use is strtoll() if it is available, otherwise,
-	* we emulate its functionality with our own clone.
-	*
-	* On systems where the size of curl_off_t is smaller or equal than the size
-	* of 'long' the conversion function to use is strtol().
-	*/
-
	typedef enum {
	CURL_OFFT_OK, /* parsed fine */
	CURL_OFFT_FLOW, /* over or underflow */

lib/telnet.c+2 -2

@@ -864,8 +864,8 @@ static CURLcode check_telnet_options(struct Curl_easy *data)
	/* Window Size */
	if(strncasecompare(option, "WS", 2)) {
	const char *p = arg;
-	size_t x = 0;
-	size_t y = 0;
+	curl_off_t x = 0;
+	curl_off_t y = 0;
	if(Curl_str_number(&p, &x, 0xffff) \|\|
	Curl_str_single(&p, 'x') \|\|
	Curl_str_number(&p, &y, 0xffff)) {

lib/tftp.c+7 -6

@@ -331,7 +331,7 @@ static CURLcode tftp_parse_option_ack(struct tftp_state_data *state,
	infof(data, "got option=(%s) value=(%s)", option, value);

	if(checkprefix(TFTP_OPTION_BLKSIZE, option)) {
-	size_t blksize;
+	curl_off_t blksize;
	if(Curl_str_number(&value, &blksize, TFTP_BLKSIZE_MAX)) {
	failf(data, "%s (%d)", "blksize is larger than max supported",
	TFTP_BLKSIZE_MAX);
@@ -350,8 +350,8 @@ static CURLcode tftp_parse_option_ack(struct tftp_state_data *state,
	/* could realloc pkt buffers here, but the spec does not call out
	* support for the server requesting a bigger blksize than the client
	* requests */
-	failf(data, "server requested blksize larger than allocated (%zd)",
-	blksize);
+	failf(data, "server requested blksize larger than allocated (%"
+	CURL_FORMAT_CURL_OFF_T ")", blksize);
	return CURLE_TFTP_ILLEGAL;
	}

@@ -360,16 +360,17 @@ static CURLcode tftp_parse_option_ack(struct tftp_state_data *state,
	state->blksize, state->requested_blksize);
	}
	else if(checkprefix(TFTP_OPTION_TSIZE, option)) {
-	size_t tsize = 0;
+	curl_off_t tsize = 0;
	/* tsize should be ignored on upload: Who cares about the size of the
	remote file? */
	if(!data->state.upload &&
-	!Curl_str_number(&value, &tsize, SIZE_T_MAX)) {
+	!Curl_str_number(&value, &tsize, CURL_OFF_T_MAX)) {
	if(!tsize) {
	failf(data, "invalid tsize -:%s:- value in OACK packet", value);
	return CURLE_TFTP_ILLEGAL;
	}
-	infof(data, "tsize parsed from OACK (%zd)", tsize);
+	infof(data, "tsize parsed from OACK (%" CURL_FORMAT_CURL_OFF_T ")",
+	tsize);
	Curl_pgrsSetDownloadSize(data, tsize);
	}
	}

lib/url.c+6 -6

@@ -1681,7 +1681,7 @@ static void zonefrom_url(CURLU uh, struct Curl_easy data,

	if(!uc && zoneid) {
	const char *p = zoneid;
-	size_t scope;
+	curl_off_t scope;
	if(!Curl_str_number(&p, &scope, UINT_MAX))
	/* A plain number, use it directly as a scope id. */
	conn->scope_id = (unsigned int)scope;
@@ -1919,7 +1919,7 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,
	return CURLE_OUT_OF_MEMORY;
	}
	else {
-	size_t port;
+	curl_off_t port;
	bool valid = TRUE;
	if(data->set.use_port && data->state.allow_port)
	port = data->set.use_port;
@@ -2258,7 +2258,7 @@ static CURLcode parse_proxy(struct Curl_easy *data,
	(void)curl_url_get(uhp, CURLUPART_PORT, &portptr, 0);

	if(portptr) {
-	size_t num;
+	curl_off_t num;
	const char *p = portptr;
	if(!Curl_str_number(&p, &num, 0xffff))
	port = (int)num;
@@ -2902,7 +2902,7 @@ static CURLcode parse_connect_to_host_port(struct Curl_easy *data,
	host_portno = '\0'; / cut off number from hostname */
	host_portno++;
	if(*host_portno) {
-	size_t portparse;
+	curl_off_t portparse;
	const char *p = host_portno;
	if(Curl_str_number(&p, &portparse, 0xffff)) {
	failf(data, "No valid port number in connect to host string (%s)",
@@ -2981,9 +2981,9 @@ static CURLcode parse_connect_to_string(struct Curl_easy *data,
	/* check whether the URL's port matches */
	char *ptr_next = strchr(ptr, ':');
	if(ptr_next) {
-	size_t port_to_match;
+	curl_off_t port_to_match;
	if(!Curl_str_number(&ptr, &port_to_match, 0xffff) &&
-	(port_to_match == (size_t)conn->remote_port))
+	(port_to_match == (curl_off_t)conn->remote_port))
	port_match = TRUE;
	ptr = ptr_next + 1;
	}

lib/urlapi.c+37 -35

@@ -468,7 +468,7 @@ UNITTEST CURLUcode Curl_parse_port(struct Curl_URL u, struct dynbuf host,
	portptr = strchr(hostname, ':');

	if(portptr) {
-	size_t port;
+	curl_off_t port;
	size_t keep = portptr - hostname;

	/* Browser behavior adaptation. If there is a colon with no digits after,
@@ -489,7 +489,7 @@ UNITTEST CURLUcode Curl_parse_port(struct Curl_URL u, struct dynbuf host,
	u->portnum = (unsigned short) port;
	/* generate a new port number string to get rid of leading zeroes etc */
	free(u->port);
-	u->port = aprintf("%zd", port);
+	u->port = aprintf("%" CURL_FORMAT_CURL_OFF_T, port);
	if(!u->port)
	return CURLUE_OUT_OF_MEMORY;
	}
@@ -596,7 +596,7 @@ static int ipv4_normalize(struct dynbuf *host)
	bool done = FALSE;
	int n = 0;
	const char *c = Curl_dyn_ptr(host);
-	unsigned long parts[4] = {0, 0, 0, 0};
+	unsigned int parts[4] = {0, 0, 0, 0};
	CURLcode result = CURLE_OK;

	if(*c == '[')
@@ -604,22 +604,24 @@ static int ipv4_normalize(struct dynbuf *host)

	errno = 0; /* for strtoul */
	while(!done) {
-	char *endp = NULL;
-	unsigned long l;
-	if(!ISDIGIT(*c))
-	/* most importantly this does not allow a leading plus or minus */
-	return HOST_NAME;
-	l = strtoul(c, &endp, 0);
-	if(errno)
-	return HOST_NAME;
-	#if SIZEOF_LONG > 4
-	/* a value larger than 32 bits */
-	if(l > UINT_MAX)
+	int rc;
+	curl_off_t l;
+	if(*c == '0') {
+	c++;
+	if(*c == 'x') {
+	c++; /* skip the prefix */
+	rc = Curl_str_hex(&c, &l, UINT_MAX);
+	}
+	else
+	rc = Curl_str_octal(&c, &l, UINT_MAX);
+	}
+	else
+	rc = Curl_str_number(&c, &l, UINT_MAX);
+
+	if(rc)
	return HOST_NAME;
-	#endif

-	parts[n] = l;
-	c = endp;
+	parts[n] = (unsigned int)l;

	switch(*c) {
	case '.':
@@ -643,30 +645,30 @@ static int ipv4_normalize(struct dynbuf *host)
	Curl_dyn_reset(host);

	result = Curl_dyn_addf(host, "%u.%u.%u.%u",
-	(unsigned int)(parts[0] >> 24),
-	(unsigned int)((parts[0] >> 16) & 0xff),
-	(unsigned int)((parts[0] >> 8) & 0xff),
-	(unsigned int)(parts[0] & 0xff));
+	(parts[0] >> 24),
+	((parts[0] >> 16) & 0xff),
+	((parts[0] >> 8) & 0xff),
+	(parts[0] & 0xff));
	break;
	case 1: /* a.b -- 8.24 bits */
	if((parts[0] > 0xff) \|\| (parts[1] > 0xffffff))
	return HOST_NAME;
	Curl_dyn_reset(host);
	result = Curl_dyn_addf(host, "%u.%u.%u.%u",
-	(unsigned int)(parts[0]),
-	(unsigned int)((parts[1] >> 16) & 0xff),
-	(unsigned int)((parts[1] >> 8) & 0xff),
-	(unsigned int)(parts[1] & 0xff));
+	(parts[0]),
+	((parts[1] >> 16) & 0xff),
+	((parts[1] >> 8) & 0xff),
+	(parts[1] & 0xff));
	break;
	case 2: /* a.b.c -- 8.8.16 bits */
	if((parts[0] > 0xff) \|\| (parts[1] > 0xff) \|\| (parts[2] > 0xffff))
	return HOST_NAME;
	Curl_dyn_reset(host);
	result = Curl_dyn_addf(host, "%u.%u.%u.%u",
-	(unsigned int)(parts[0]),
-	(unsigned int)(parts[1]),
-	(unsigned int)((parts[2] >> 8) & 0xff),
-	(unsigned int)(parts[2] & 0xff));
+	(parts[0]),
+	(parts[1]),
+	((parts[2] >> 8) & 0xff),
+	(parts[2] & 0xff));
	break;
	case 3: /* a.b.c.d -- 8.8.8.8 bits */
	if((parts[0] > 0xff) \|\| (parts[1] > 0xff) \|\| (parts[2] > 0xff) \|\|
@@ -674,10 +676,10 @@ static int ipv4_normalize(struct dynbuf *host)
	return HOST_NAME;
	Curl_dyn_reset(host);
	result = Curl_dyn_addf(host, "%u.%u.%u.%u",
-	(unsigned int)(parts[0]),
-	(unsigned int)(parts[1]),
-	(unsigned int)(parts[2]),
-	(unsigned int)(parts[3]));
+	(parts[0]),
+	(parts[1]),
+	(parts[2]),
+	(parts[3]));
	break;
	}
	if(result)
@@ -1745,11 +1747,11 @@ CURLUcode curl_url_set(CURLU *u, CURLUPart what,
	return CURLUE_BAD_PORT_NUMBER;
	else {
	char *tmp;
-	size_t port;
+	curl_off_t port;
	if(Curl_str_number(&part, &port, 0xffff) \|\| *part)
	/* weirdly provided number, not good! */
	return CURLUE_BAD_PORT_NUMBER;
-	tmp = aprintf("%zd", port);
+	tmp = aprintf("%" CURL_FORMAT_CURL_OFF_T, port);
	if(!tmp)
	return CURLUE_OUT_OF_MEMORY;
	free(u->port);

lib/vquic/.checksrc+2 -0

@@ -1,3 +1,5 @@
	banfunc strerror
	banfunc strncpy
	banfunc sscanf
+	banfunc strtoul
+	banfunc strtol

lib/vquic/vquic.c+3 -3

@@ -81,10 +81,10 @@ CURLcode vquic_ctx_init(struct cf_quic_ctx *qctx)
	#endif
	#ifdef DEBUGBUILD
	{
-	char *p = getenv("CURL_DBG_QUIC_WBLOCK");
+	const char *p = getenv("CURL_DBG_QUIC_WBLOCK");
	if(p) {
-	long l = strtol(p, NULL, 10);
-	if(l >= 0 && l <= 100)
+	curl_off_t l;
+	if(!Curl_str_number(&p, &l, 100))
	qctx->wblock_percent = (int)l;
	}
	}

lib/vssh/libssh.c+13 -9

@@ -2871,9 +2871,12 @@ static void sftp_quote_stat(struct Curl_easy *data)

	/* Now set the new attributes... */
	if(strncasecompare(cmd, "chgrp", 5)) {
-	sshc->quote_attrs->gid = (uint32_t)strtoul(sshc->quote_path1, NULL, 10);
+	const char *p = sshc->quote_path1;
+	curl_off_t gid;
+	(void)Curl_str_number(&p, &gid, UINT_MAX);
+	sshc->quote_attrs->gid = (uint32_t)gid;
	if(sshc->quote_attrs->gid == 0 && !ISDIGIT(sshc->quote_path1[0]) &&
-	!sshc->acceptfail) {
+	!sshc->acceptfail) {
	Curl_safefree(sshc->quote_path1);
	Curl_safefree(sshc->quote_path2);
	failf(data, "Syntax error: chgrp gid not a number");
@@ -2885,10 +2888,9 @@ static void sftp_quote_stat(struct Curl_easy *data)
	sshc->quote_attrs->flags \|= SSH_FILEXFER_ATTR_UIDGID;
	}
	else if(strncasecompare(cmd, "chmod", 5)) {
-	mode_t perms;
-	perms = (mode_t)strtoul(sshc->quote_path1, NULL, 8);
-	/* permissions are octal */
-	if(perms == 0 && !ISDIGIT(sshc->quote_path1[0])) {
+	curl_off_t perms;
+	const char *p = sshc->quote_path1;
+	if(Curl_str_octal(&p, &perms, 07777)) {
	Curl_safefree(sshc->quote_path1);
	Curl_safefree(sshc->quote_path2);
	failf(data, "Syntax error: chmod permissions not a number");
@@ -2897,13 +2899,15 @@ static void sftp_quote_stat(struct Curl_easy *data)
	sshc->actualcode = CURLE_QUOTE_ERROR;
	return;
	}
-	sshc->quote_attrs->permissions = perms;
+	sshc->quote_attrs->permissions = (mode_t)perms;
	sshc->quote_attrs->flags \|= SSH_FILEXFER_ATTR_PERMISSIONS;
	}
	else if(strncasecompare(cmd, "chown", 5)) {
-	sshc->quote_attrs->uid = (uint32_t)strtoul(sshc->quote_path1, NULL, 10);
+	const char *p = sshc->quote_path1;
+	curl_off_t uid;
+	(void)Curl_str_number(&p, &uid, UINT_MAX);
	if(sshc->quote_attrs->uid == 0 && !ISDIGIT(sshc->quote_path1[0]) &&
-	!sshc->acceptfail) {
+	!sshc->acceptfail) {
	Curl_safefree(sshc->quote_path1);
	Curl_safefree(sshc->quote_path2);
	failf(data, "Syntax error: chown uid not a number");

lib/vssh/libssh2.c+15 -7

@@ -73,7 +73,7 @@
	#include "select.h"
	#include "warnless.h"
	#include "curl_path.h"
-
+	#include "strparse.h"
	#include <curl_base64.h> /* for base64 encoding/decoding */
	#include <curl_sha256.h>

@@ -1368,7 +1368,10 @@ sftp_quote_stat(struct Curl_easy *data,

	/* Now set the new attributes... */
	if(strncasecompare(cmd, "chgrp", 5)) {
-	sshp->quote_attrs.gid = strtoul(sshc->quote_path1, NULL, 10);
+	const char *p = sshc->quote_path1;
+	curl_off_t gid;
+	(void)Curl_str_number(&p, &gid, ULONG_MAX);
+	sshp->quote_attrs.gid = (unsigned long)gid;
	sshp->quote_attrs.flags = LIBSSH2_SFTP_ATTR_UIDGID;
	if(sshp->quote_attrs.gid == 0 && !ISDIGIT(sshc->quote_path1[0]) &&
	!sshc->acceptfail) {
@@ -1377,17 +1380,22 @@ sftp_quote_stat(struct Curl_easy *data,
	}
	}
	else if(strncasecompare(cmd, "chmod", 5)) {
-	sshp->quote_attrs.permissions = strtoul(sshc->quote_path1, NULL, 8);
-	sshp->quote_attrs.flags = LIBSSH2_SFTP_ATTR_PERMISSIONS;
+	curl_off_t perms;
+	const char *p = sshc->quote_path1;
	/* permissions are octal */
-	if(sshp->quote_attrs.permissions == 0 &&
-	!ISDIGIT(sshc->quote_path1[0])) {
+	if(Curl_str_octal(&p, &perms, 07777)) {
	failf(data, "Syntax error: chmod permissions not a number");
	goto fail;
	}
+
+	sshp->quote_attrs.permissions = (unsigned long)perms;
+	sshp->quote_attrs.flags = LIBSSH2_SFTP_ATTR_PERMISSIONS;
	}
	else if(strncasecompare(cmd, "chown", 5)) {
-	sshp->quote_attrs.uid = strtoul(sshc->quote_path1, NULL, 10);
+	const char *p = sshc->quote_path1;
+	curl_off_t uid;
+	(void)Curl_str_number(&p, &uid, ULONG_MAX);
+	sshp->quote_attrs.uid = (unsigned long)uid;
	sshp->quote_attrs.flags = LIBSSH2_SFTP_ATTR_UIDGID;
	if(sshp->quote_attrs.uid == 0 && !ISDIGIT(sshc->quote_path1[0]) &&
	!sshc->acceptfail) {

lib/vssh/wolfssh.c+0 -1

@@ -34,7 +34,6 @@
	#include "sendf.h"
	#include "progress.h"
	#include "curl_path.h"
-	#include "strtoofft.h"
	#include "transfer.h"
	#include "speedcheck.h"
	#include "select.h"

lib/vtls/.checksrc+2 -0

@@ -1,3 +1,5 @@
	banfunc strerror
	banfunc strncpy
	banfunc sscanf
+	banfunc strtoul
+	banfunc strtol

lib/vtls/schannel.c+7 -5

@@ -55,6 +55,7 @@
	#include "multiif.h"
	#include "version_win32.h"
	#include "rand.h"
+	#include "strparse.h"

	/* The last #include file should be: */
	#include "curl_memory.h"
@@ -344,9 +345,9 @@ static const struct algo algs[]= {
	};

	static int
-	get_alg_id_by_name(char *name)
+	get_alg_id_by_name(const char *name)
	{
-	char *nameEnd = strchr(name, ':');
+	const char *nameEnd = strchr(name, ':');
	size_t n = nameEnd ? (size_t)(nameEnd - name) : strlen(name);
	int i;

@@ -363,12 +364,13 @@ static CURLcode
	set_ssl_ciphers(SCHANNEL_CRED schannel_cred, char ciphers,
	ALG_ID *algIds)
	{
-	char *startCur = ciphers;
+	const char *startCur = ciphers;
	int algCount = 0;
	while(startCur && (0 != *startCur) && (algCount < NUM_CIPHERS)) {
-	long alg = strtol(startCur, 0, 0);
-	if(!alg)
+	curl_off_t alg;
+	if(Curl_str_number(&startCur, &alg, INT_MAX) \|\| !alg)
	alg = get_alg_id_by_name(startCur);
+
	if(alg)
	algIds[algCount++] = (ALG_ID)alg;
	else if(!strncmp(startCur, "USE_STRONG_CRYPTO",

lib/ws.c+7 -8

@@ -39,6 +39,7 @@
	#include "transfer.h"
	#include "select.h"
	#include "nonblock.h"
+	#include "strparse.h"

	/* The last 3 #include files should be in this order */
	#include "curl_printf.h"
@@ -778,12 +779,11 @@ CURLcode Curl_ws_accept(struct Curl_easy *data,
	data->conn->proto.ws = ws;
	#ifdef DEBUGBUILD
	{
-	char *p = getenv("CURL_WS_CHUNK_SIZE");
+	const char *p = getenv("CURL_WS_CHUNK_SIZE");
	if(p) {
-	long l = strtol(p, NULL, 10);
-	if(l > 0 && l <= (110241024)) {
+	curl_off_t l;
+	if(!Curl_str_number(&p, &l, 110241024))
	chunk_size = (size_t)l;
-	}
	}
	}
	#endif
@@ -1032,12 +1032,11 @@ static CURLcode ws_flush(struct Curl_easy data, struct websocket ws,
	/* Simulate a blocking send after this chunk has been sent */
	bool eagain_next = FALSE;
	size_t chunk_egain = 0;
-	char *p = getenv("CURL_WS_CHUNK_EAGAIN");
+	const char *p = getenv("CURL_WS_CHUNK_EAGAIN");
	if(p) {
-	long l = strtol(p, NULL, 10);
-	if(l > 0 && l <= (110241024)) {
+	curl_off_t l;
+	if(!Curl_str_number(&p, &l, 110241024))
	chunk_egain = (size_t)l;
-	}
	}
	#endif

projects/generate.bat+4 -0

@@ -152,6 +152,8 @@ rem
	for /f "delims=" %%r in ('dir /b ..\src\*.rc') do call :element %1 src "%%r" %3
	) else if "!var!" == "CURL_SRC_X_C_FILES" (
	call :element %1 lib "strtoofft.c" %3
+	call :element %1 lib "strparse.c" %3
+	call :element %1 lib "strcase.c" %3
	call :element %1 lib "timediff.c" %3
	call :element %1 lib "nonblock.c" %3
	call :element %1 lib "warnless.c" %3
@@ -163,6 +165,8 @@ rem
	call :element %1 lib "config-win32.h" %3
	call :element %1 lib "curl_setup.h" %3
	call :element %1 lib "strtoofft.h" %3
+	call :element %1 lib "strparse.h" %3
+	call :element %1 lib "strcase.h" %3
	call :element %1 lib "timediff.h" %3
	call :element %1 lib "nonblock.h" %3
	call :element %1 lib "warnless.h" %3

src/Makefile.inc+4 -0

@@ -42,6 +42,8 @@ CURLX_CFILES = \
	../lib/dynbuf.c \
	../lib/nonblock.c \
	../lib/strtoofft.c \
+	../lib/strparse.c \
+	../lib/strcase.c \
	../lib/timediff.c \
	../lib/version_win32.c \
	../lib/warnless.c
@@ -53,6 +55,8 @@ CURLX_HFILES = \
	../lib/dynbuf.h \
	../lib/nonblock.h \
	../lib/strtoofft.h \
+	../lib/strparse.h \
+	../lib/strcase.h \
	../lib/timediff.h \
	../lib/version_win32.h \
	../lib/warnless.h

tests/data/test1664+35 -3

@@ -97,9 +97,9 @@ Curl_str_number
	10: (" 123") 8, [0] line 0
	11: ("") 8, [0] line 0
	Curl_str_number / max
-	0: ("9223372036854775808") 0, [9223372036854775808] line 19
-	1: ("9223372036854775809") 0, [9223372036854775809] line 19
-	2: ("18446744073709551615") 0, [18446744073709551615] line 20
+	0: ("9223372036854775807") 0, [9223372036854775807] line 19
+	1: ("9223372036854775808") 7, [0] line 18
+	2: ("18446744073709551615") 7, [0] line 19
	3: ("18446744073709551616") 7, [0] line 19
	4: ("18446744073709551617") 7, [0] line 19
	Curl_str_newline
@@ -115,6 +115,38 @@ Curl_str_newline
	8: ("
	") 0, line 1
	9: ("") 6, line 0
+	Curl_str_hex
+	0: ("1") 0, [1] line 1
+	1: ("1000") 0, [4096] line 4
+	2: ("1234") 0, [4660] line 4
+	3: ("1235") 0, [4661] line 4
+	4: ("1236") 1, [0] line 3
+	5: ("01234") 0, [4660] line 5
+	6: ("00000000000000000000000000001234") 0, [4660] line 32
+	7: ("0123 345") 0, [291] line 4
+	8: ("0123O345") 0, [291] line 4
+	9: ("-12") 8, [0] line 0
+	10: (" 123") 8, [0] line 0
+	11: ("") 8, [0] line 0
+	Curl_str_octal
+	0: ("1") 0, [1] line 1
+	1: ("1000") 0, [512] line 4
+	2: ("1234") 0, [668] line 4
+	3: ("1235") 0, [669] line 4
+	4: ("1236") 1, [0] line 3
+	5: ("01234") 0, [668] line 5
+	6: ("00000000000000000000000000001234") 0, [668] line 32
+	7: ("0123 345") 0, [83] line 4
+	8: ("0123O345") 0, [83] line 4
+	9: ("-12") 8, [0] line 0
+	10: (" 123") 8, [0] line 0
+	11: ("") 8, [0] line 0
+	Curl_str_octal / max
+	0: ("777777777777777777777") 0, [9223372036854775807] line 21
+	1: ("1000000000000000000000") 7, [0] line 21
+	Curl_str_hex / max
+	0: ("7FFFFFFFFFFFFFFF") 0, [9223372036854775807] line 16
+	1: ("8000000000000000") 7, [0] line 15
	</stdout>
	</verify>
	</testcase>

tests/server/Makefile.inc+4 -0

@@ -29,6 +29,8 @@ CURLX_SRCS = \
	../../lib/mprintf.c \
	../../lib/nonblock.c \
	../../lib/strtoofft.c \
+	../../lib/strparse.c \
+	../../lib/strequal.c \
	../../lib/warnless.c \
	../../lib/timediff.c \
	../../lib/dynbuf.c \
@@ -41,10 +43,12 @@ CURLX_HDRS = \
	../../lib/curlx.h \
	../../lib/nonblock.h \
	../../lib/strtoofft.h \
+	../../lib/strcase.h \
	../../lib/warnless.h \
	../../lib/timediff.h \
	../../lib/curl_ctype.h \
	../../lib/dynbuf.h \
+	../../lib/strcase.h \
	../../lib/strdup.h \
	../../lib/curl_get_line.h \
	../../lib/curl_multibyte.h

tests/unit/unit1664.c+97 -7

@@ -196,7 +196,7 @@ UNITTEST_START
	};
	printf("Curl_str_number\n");
	for(i = 0; nums[i]; i++) {
-	size_t num;
+	curl_off_t num;
	const char *line = nums[i];
	const char *orgline = line;
	int rc = Curl_str_number(&line, &num, 1235);
@@ -206,10 +206,10 @@ UNITTEST_START
	}

	{
-	/* SIZE_T_MAX is typically 18446744073709551615 */
+	/* CURL_OFF_T is typically 9223372036854775807 */
	static const char *nums[] = {
-	"9223372036854775808", /* 2^63 */
-	"9223372036854775809", /* 2^63 + 1 */
+	"9223372036854775807", /* 2^63 -1 */
+	"9223372036854775808", /* 2^63 */
	"18446744073709551615", /* 2^64 - 1 */
	"18446744073709551616", /* 2^64 */
	"18446744073709551617", /* 2^64 + 1 */
@@ -217,11 +217,11 @@ UNITTEST_START
	};
	printf("Curl_str_number / max\n");
	for(i = 0; nums[i]; i++) {
-	size_t num;
+	curl_off_t num;
	const char *line = nums[i];
	const char *orgline = line;
-	int rc = Curl_str_number(&line, &num, SIZE_T_MAX);
-	printf("%u: (\"%s\") %d, [%zu] line %d\n",
+	int rc = Curl_str_number(&line, &num, CURL_OFF_T_MAX);
+	printf("%u: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
	i, orgline, rc, num, (int)(line - orgline));
	}
	}
@@ -250,5 +250,95 @@ UNITTEST_START
	}
	}

+	{
+	static const char *nums[] = {
+	"1",
+	"1000",
+	"1234",
+	"1235",
+	"1236",
+	"01234",
+	"00000000000000000000000000001234",
+	"0123 345",
+	"0123O345",
+	"-12",
+	" 123",
+	"",
+	NULL
+	};
+	printf("Curl_str_hex\n");
+	for(i = 0; nums[i]; i++) {
+	curl_off_t num;
+	const char *line = nums[i];
+	const char *orgline = line;
+	int rc = Curl_str_hex(&line, &num, 0x1235);
+	printf("%u: (\"%s\") %d, [%u] line %d\n",
+	i, orgline, rc, (int)num, (int)(line - orgline));
+	}
+	}
+
+	{
+	static const char *nums[] = {
+	"1",
+	"1000",
+	"1234",
+	"1235",
+	"1236",
+	"01234",
+	"00000000000000000000000000001234",
+	"0123 345",
+	"0123O345",
+	"-12",
+	" 123",
+	"",
+	NULL
+	};
+	printf("Curl_str_octal\n");
+	for(i = 0; nums[i]; i++) {
+	curl_off_t num;
+	const char *line = nums[i];
+	const char *orgline = line;
+	int rc = Curl_str_octal(&line, &num, 01235);
+	printf("%u: (\"%s\") %d, [%u] line %d\n",
+	i, orgline, rc, (int)num, (int)(line - orgline));
+	}
+	}
+
+	{
+	/* CURL_OFF_T is typically 2^63-1 */
+	static const char *nums[] = {
+	"777777777777777777777", /* 2^63 -1 */
+	"1000000000000000000000", /* 2^63 */
+	NULL
+	};
+	printf("Curl_str_octal / max\n");
+	for(i = 0; nums[i]; i++) {
+	curl_off_t num;
+	const char *line = nums[i];
+	const char *orgline = line;
+	int rc = Curl_str_octal(&line, &num, CURL_OFF_T_MAX);
+	printf("%u: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
+	i, orgline, rc, num, (int)(line - orgline));
+	}
+	}
+
+	{
+	/* CURL_OFF_T is typically 2^63-1 */
+	static const char *nums[] = {
+	"7FFFFFFFFFFFFFFF", /* 2^63 -1 */
+	"8000000000000000", /* 2^63 */
+	NULL
+	};
+	printf("Curl_str_hex / max\n");
+	for(i = 0; nums[i]; i++) {
+	curl_off_t num;
+	const char *line = nums[i];
+	const char *orgline = line;
+	int rc = Curl_str_hex(&line, &num, CURL_OFF_T_MAX);
+	printf("%u: (\"%s\") %d, [%" CURL_FORMAT_CURL_OFF_T "] line %d\n",
+	i, orgline, rc, num, (int)(line - orgline));
+	}
+	}
+
	}
	UNITTEST_STOP

winbuild/MakefileBuild.vc+6 -0

@@ -692,6 +692,8 @@ CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP)
	CURL_FROM_LIBCURL=\
	$(CURL_DIROBJ)\nonblock.obj \
	$(CURL_DIROBJ)\strtoofft.obj \
+	$(CURL_DIROBJ)\strparse.obj \
+	$(CURL_DIROBJ)\strcase.obj \
	$(CURL_DIROBJ)\warnless.obj \
	$(CURL_DIROBJ)\curl_get_line.obj \
	$(CURL_DIROBJ)\curl_multibyte.obj \
@@ -718,6 +720,10 @@ $(CURL_DIROBJ)\nonblock.obj: ../lib/nonblock.c
	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/nonblock.c
	$(CURL_DIROBJ)\strtoofft.obj: ../lib/strtoofft.c
	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/strtoofft.c
+	$(CURL_DIROBJ)\strparse.obj: ../lib/strparse.c
+	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/strparse.c
+	$(CURL_DIROBJ)\strcase.obj: ../lib/strcase.c
+	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/strcase.c
	$(CURL_DIROBJ)\warnless.obj: ../lib/warnless.c
	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/warnless.c
	$(CURL_DIROBJ)\curl_get_line.obj: ../lib/curl_get_line.c