lib: use Curl_str_number() for parsing decimal numbers
—
$ git checkout -f b696fc129bf318eb97404855a47ae08e9a297d39
Previous HEAD position was 2e9773b76a tests: change from curlx_ultous to util_ultous
HEAD is now at b696fc129b lib: use Curl_str_number() for parsing decimal numbers
$ 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-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-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-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-gsasl.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-cipher_suite.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-vtls_scache.lo
CC vtls/libcurl_la-vtls_spack.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_osslq.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vquic/libcurl_la-vquic-tls.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-curl_path.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in docs
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Nothing to be done for 'all-am'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Nothing to be done for 'all'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
Making all in libcurl
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
Making all in opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[3]: Nothing to be done for 'all-am'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC curl-slist_wc.o
CC curl-terminal.o
CC curl-tool_bname.o
CC curl-tool_cb_dbg.o
CC curl-tool_cb_prg.o
CC curl-tool_cb_hdr.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_helpers.o
CC curl-tool_ipfs.o
CC curl-tool_libinfo.o
CC curl-tool_listhelp.o
CC curl-tool_main.o
CC curl-tool_msgs.o
CC curl-tool_operate.o
CC curl-tool_operhlp.o
CC curl-tool_paramhlp.o
CC curl-tool_parsecfg.o
CC curl-tool_progress.o
CC curl-tool_setopt.o
CC curl-tool_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_xattr.o
CC curl-tool_writeout_json.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-strtoofft.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'
| @@ -528,8 +528,7 @@ CURLcode Curl_altsvc_parse(struct Curl_easy *data, | |
| size_t dstlen = 0; /* destination hostname length */ | |
| const char *value_ptr; | |
| char option[32]; | |
| - | unsigned long num; |
| - | char *end_ptr; |
| + | size_t num; |
| bool quoted = FALSE; | |
| time_t maxage = 24 * 3600; /* default is 24 hours */ | |
| bool persist = FALSE; | |
| @@ -567,21 +566,14 @@ CURLcode Curl_altsvc_parse(struct Curl_easy *data, | |
| dstlen = strlen(srchost); | |
| } | |
| if(*p == ':') { | |
| - | unsigned long port = 0; |
| + | size_t port = 0; |
| p++; | |
| - | if(ISDIGIT(*p)) |
| - | /* a port number */ |
| - | port = strtoul(p, &end_ptr, 10); |
| - | else |
| - | end_ptr = (char *)p; /* not left uninitialized */ |
| - | if(!port || port > USHRT_MAX || end_ptr == p || *end_ptr != '\"') { |
| + | if(Curl_str_number(&p, &port, 0xffff) || (*p != '\"')) { |
| infof(data, "Unknown alt-svc port number, ignoring."); | |
| valid = FALSE; | |
| } | |
| - | else { |
| - | dstport = curlx_ultous(port); |
| - | p = end_ptr; |
| - | } |
| + | else |
| + | dstport = (unsigned short)port; |
| } | |
| if(*p++ != '\"') | |
| break; | |
| @@ -625,8 +617,7 @@ CURLcode Curl_altsvc_parse(struct Curl_easy *data, | |
| while(*p && !ISBLANK(*p) && *p!= ';' && *p != ',') | |
| p++; | |
| } | |
| - | num = strtoul(value_ptr, &end_ptr, 10); |
| - | if((end_ptr != value_ptr) && (num < ULONG_MAX)) { |
| + | if(!Curl_str_number(&value_ptr, &num, SIZE_T_MAX)) { |
| if(strcasecompare("ma", option)) | |
| maxage = (time_t)num; | |
| else if(strcasecompare("persist", option) && (num == 1)) | |
| @@ -83,6 +83,7 @@ | |
| #include "share.h" | |
| #include "strdup.h" | |
| #include "version_win32.h" | |
| + | #include "strparse.h" |
| /* The last 3 #include files should be in this order */ | |
| #include "curl_printf.h" | |
| @@ -741,10 +742,9 @@ 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 */ | |
| - | unsigned long scope_id = strtoul(scope_ptr, NULL, 10); |
| - | if(scope_id > UINT_MAX) |
| + | size_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; | |
| } | |
| #endif | |
| @@ -73,6 +73,7 @@ | |
| #include "http_proxy.h" | |
| #include "socks.h" | |
| #include "strdup.h" | |
| + | #include "strparse.h" |
| /* The last 3 #include files should be in this order */ | |
| #include "curl_printf.h" | |
| #include "curl_memory.h" | |
| @@ -464,7 +465,7 @@ static CURLcode ftp_check_ctrl_on_data_wait(struct Curl_easy *data) | |
| if(response) { | |
| infof(data, "Ctrl conn has data while waiting for data conn"); | |
| if(pp->overflow > 3) { | |
| - | char *r = Curl_dyn_ptr(&pp->recvbuf); |
| + | const char *r = Curl_dyn_ptr(&pp->recvbuf); |
| DEBUGASSERT((pp->overflow + pp->nfinal) <= | |
| Curl_dyn_len(&pp->recvbuf)); | |
| @@ -472,8 +473,8 @@ static CURLcode ftp_check_ctrl_on_data_wait(struct Curl_easy *data) | |
| r += pp->nfinal; | |
| if(LASTLINE(r)) { | |
| - | int status = curlx_sltosi(strtol(r, NULL, 10)); |
| - | if(status == 226) { |
| + | size_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 | |
| noticed. Leave the 226 in there and use this as a trigger to read | |
| @@ -541,13 +542,14 @@ static CURLcode InitiateTransfer(struct Curl_easy *data) | |
| } | |
| static bool ftp_endofresp(struct Curl_easy *data, struct connectdata *conn, | |
| - | char *line, size_t len, int *code) |
| + | const char *line, size_t len, int *code) |
| { | |
| + | size_t status; |
| (void)data; | |
| (void)conn; | |
| - | if((len > 3) && LASTLINE(line)) { |
| - | *code = curlx_sltosi(strtol(line, NULL, 10)); |
| + | if((len > 3) && LASTLINE(line) && !Curl_str_number(&line, &status, 999)) { |
| + | *code = (int)status; |
| return TRUE; | |
| } | |
| @@ -925,13 +927,20 @@ static CURLcode ftp_state_use_port(struct Curl_easy *data, | |
| /* parse the port */ | |
| if(ip_end) { | |
| - | char *port_sep = NULL; |
| - | char *port_start = strchr(ip_end, ':'); |
| - | if(port_start) { |
| - | port_min = curlx_ultous(strtoul(port_start + 1, NULL, 10)); |
| - | port_sep = strchr(port_start, '-'); |
| - | if(port_sep) { |
| - | port_max = curlx_ultous(strtoul(port_sep + 1, NULL, 10)); |
| + | const char *portp = strchr(ip_end, ':'); |
| + | if(portp) { |
| + | size_t start; |
| + | size_t end; |
| + | portp++; |
| + | if(!Curl_str_number(&portp, &start, 0xffff)) { |
| + | /* got the first number */ |
| + | port_min = (unsigned short)start; |
| + | if(!Curl_str_single(&portp, '-')) { |
| + | /* got the dash */ |
| + | if(!Curl_str_number(&portp, &end, 0xffff)) |
| + | /* got the second number */ |
| + | port_max = (unsigned short)end; |
| + | } |
| } | |
| else | |
| port_max = port_min; | |
| @@ -1758,20 +1767,15 @@ static bool match_pasv_6nums(const char *p, | |
| { | |
| int i; | |
| for(i = 0; i < 6; i++) { | |
| - | unsigned long num; |
| - | char *endp; |
| + | size_t num; |
| if(i) { | |
| if(*p != ',') | |
| return FALSE; | |
| p++; | |
| } | |
| - | if(!ISDIGIT(*p)) |
| - | return FALSE; |
| - | num = strtoul(p, &endp, 10); |
| - | if(num > 255) |
| + | if(Curl_str_number(&p, &num, 0xff)) |
| return FALSE; | |
| array[i] = (unsigned int)num; | |
| - | p = endp; |
| } | |
| return TRUE; | |
| } | |
| @@ -1804,20 +1808,16 @@ static CURLcode ftp_state_pasv_resp(struct Curl_easy *data, | |
| /* the ISDIGIT() check here is because strtoul() accepts leading minus | |
| etc */ | |
| if((ptr[1] == sep) && (ptr[2] == sep) && ISDIGIT(ptr[3])) { | |
| - | char *endp; |
| - | unsigned long num = strtoul(&ptr[3], &endp, 10); |
| - | if(*endp != sep) |
| - | ptr = NULL; |
| - | else if(num > 0xffff) { |
| + | const char *p = &ptr[3]; |
| + | size_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; | |
| } | |
| - | if(ptr) { |
| - | ftpc->newport = (unsigned short)(num & 0xffff); |
| - | ftpc->newhost = strdup(control_address(conn)); |
| - | if(!ftpc->newhost) |
| - | return CURLE_OUT_OF_MEMORY; |
| - | } |
| + | ftpc->newport = (unsigned short)num; |
| + | ftpc->newhost = strdup(control_address(conn)); |
| + | if(!ftpc->newhost) |
| + | return CURLE_OUT_OF_MEMORY; |
| } | |
| else | |
| ptr = NULL; | |
| @@ -50,9 +50,12 @@ | |
| #include "ftp.h" | |
| #include "ftplistparser.h" | |
| #include "curl_fnmatch.h" | |
| - | #include "curl_memory.h" |
| #include "multiif.h" | |
| - | /* The last #include file should be: */ |
| + | #include "strparse.h" |
| + | |
| + | /* The last 3 #include files should be in this order */ |
| + | #include "curl_printf.h" |
| + | #include "curl_memory.h" |
| #include "memdebug.h" | |
| typedef enum { | |
| @@ -543,13 +546,13 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, | |
| case PL_UNIX_HLINKS_NUMBER: | |
| parser->item_length ++; | |
| if(c == ' ') { | |
| - | char *p; |
| - | long int hlinks; |
| + | const char *p = &mem[parser->item_offset]; |
| + | size_t hlinks; |
| mem[parser->item_offset + parser->item_length - 1] = 0; | |
| - | hlinks = strtol(mem + parser->item_offset, &p, 10); |
| - | if(p[0] == '\0' && hlinks != LONG_MAX && hlinks != LONG_MIN) { |
| + | |
| + | if(!Curl_str_number(&p, &hlinks, LONG_MAX)) { |
| parser->file_data->info.flags |= CURLFINFOFLAG_KNOWN_HLINKCOUNT; | |
| - | parser->file_data->info.hardlinks = hlinks; |
| + | parser->file_data->info.hardlinks = (long)hlinks; |
| } | |
| parser->item_length = 0; | |
| parser->item_offset = 0; | |
| @@ -58,6 +58,8 @@ | |
| #include "warnless.h" | |
| #include "strcase.h" | |
| #include "easy_lock.h" | |
| + | #include "strparse.h" |
| + | |
| /* The last 3 #include files should be in this order */ | |
| #include "curl_printf.h" | |
| #include "curl_memory.h" | |
| @@ -1122,7 +1124,7 @@ void Curl_hostcache_clean(struct Curl_easy *data, | |
| CURLcode Curl_loadhostpairs(struct Curl_easy *data) | |
| { | |
| struct curl_slist *hostp; | |
| - | char *host_end; |
| + | const char *host_end; |
| /* Default is no wildcard found */ | |
| data->state.wildcard_resolve = FALSE; | |
| @@ -1132,15 +1134,15 @@ CURLcode Curl_loadhostpairs(struct Curl_easy *data) | |
| if(!hostp->data) | |
| continue; | |
| if(hostp->data[0] == '-') { | |
| - | unsigned long num = 0; |
| + | size_t num = 0; |
| size_t entry_len; | |
| size_t hlen = 0; | |
| host_end = strchr(&hostp->data[1], ':'); | |
| if(host_end) { | |
| hlen = host_end - &hostp->data[1]; | |
| - | num = strtoul(++host_end, NULL, 10); |
| - | if(!hlen || (num > 0xffff)) |
| + | host_end++; |
| + | if(Curl_str_number(&host_end, &num, 0xffff)) |
| host_end = NULL; | |
| } | |
| if(!host_end) { | |
| @@ -1166,15 +1168,14 @@ CURLcode Curl_loadhostpairs(struct Curl_easy *data) | |
| size_t entry_len; | |
| char address[64]; | |
| #if !defined(CURL_DISABLE_VERBOSE_STRINGS) | |
| - | char *addresses = NULL; |
| + | const char *addresses = NULL; |
| #endif | |
| - | char *addr_begin; |
| - | char *addr_end; |
| - | char *port_ptr; |
| - | int port = 0; |
| - | char *end_ptr; |
| + | const char *addr_begin; |
| + | const char *addr_end; |
| + | const char *port_ptr; |
| + | size_t port = 0; |
| + | const char *end_ptr; |
| bool permanent = TRUE; | |
| - | unsigned long tmp_port; |
| bool error = TRUE; | |
| char *host_begin = hostp->data; | |
| size_t hlen = 0; | |
| @@ -1189,11 +1190,11 @@ CURLcode Curl_loadhostpairs(struct Curl_easy *data) | |
| hlen = host_end - host_begin; | |
| port_ptr = host_end + 1; | |
| - | tmp_port = strtoul(port_ptr, &end_ptr, 10); |
| - | if(tmp_port > USHRT_MAX || end_ptr == port_ptr || *end_ptr != ':') |
| + | if(Curl_str_number(&port_ptr, &port, 0xffff) || |
| + | (*port_ptr != ':')) |
| goto err; | |
| + | end_ptr = port_ptr; |
| - | port = (int)tmp_port; |
| #if !defined(CURL_DISABLE_VERBOSE_STRINGS) | |
| addresses = end_ptr + 1; | |
| #endif | |
| @@ -1234,7 +1235,7 @@ CURLcode Curl_loadhostpairs(struct Curl_easy *data) | |
| } | |
| #endif | |
| - | ai = Curl_str2addr(address, port); |
| + | ai = Curl_str2addr(address, (int)port); |
| if(!ai) { | |
| infof(data, "Resolve address '%s' found illegal", address); | |
| goto err; | |
| @@ -1262,7 +1263,7 @@ err: | |
| } | |
| /* Create an entry id, based upon the hostname and port */ | |
| - | entry_len = create_hostcache_id(host_begin, hlen, port, |
| + | entry_len = create_hostcache_id(host_begin, hlen, (int)port, |
| entry_id, sizeof(entry_id)); | |
| if(data->share) | |
| @@ -1272,7 +1273,7 @@ err: | |
| dns = Curl_hash_pick(data->dns.hostcache, entry_id, entry_len + 1); | |
| if(dns) { | |
| - | infof(data, "RESOLVE %.*s:%d - old addresses discarded", |
| + | infof(data, "RESOLVE %.*s:%zd - old addresses discarded", |
| (int)hlen, host_begin, port); | |
| /* delete old entry, there are two reasons for this | |
| 1. old entry may have different addresses. | |
| @@ -1289,7 +1290,8 @@ err: | |
| } | |
| /* put this new host in the cache */ | |
| - | dns = Curl_cache_addr(data, head, host_begin, hlen, port, permanent); |
| + | dns = Curl_cache_addr(data, head, host_begin, hlen, (int)port, |
| + | permanent); |
| if(dns) { | |
| /* release the returned reference; the cache itself will keep the | |
| * entry alive: */ | |
| @@ -1304,14 +1306,14 @@ err: | |
| return CURLE_OUT_OF_MEMORY; | |
| } | |
| #ifndef CURL_DISABLE_VERBOSE_STRINGS | |
| - | infof(data, "Added %.*s:%d:%s to DNS cache%s", |
| + | infof(data, "Added %.*s:%zd:%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 *:%d using wildcard", port); |
| + | infof(data, "RESOLVE *:%zd using wildcard", port); |
| data->state.wildcard_resolve = TRUE; | |
| } | |
| } | |
| @@ -242,7 +242,7 @@ static bool imap_matchresp(const char *line, size_t len, const char *cmd) | |
| * response which can be processed by the response handler. | |
| */ | |
| static bool imap_endofresp(struct Curl_easy *data, struct connectdata *conn, | |
| - | char *line, size_t len, int *resp) |
| + | const char *line, size_t len, int *resp) |
| { | |
| struct IMAP *imap = data->req.p.imap; | |
| struct imap_conn *imapc = &conn->proto.imapc; | |
| @@ -83,6 +83,7 @@ | |
| #include "strcase.h" | |
| #include "warnless.h" | |
| #include "parsedate.h" | |
| + | #include "strparse.h" |
| /* | |
| * parsedate() | |
| @@ -411,7 +412,7 @@ static int parsedate(const char *date, time_t *output) | |
| } | |
| else if(ISDIGIT(*date)) { | |
| /* a digit */ | |
| - | int val; |
| + | unsigned int val; |
| char *end; | |
| if((secnum == -1) && | |
| match_time(date, &hournum, &minnum, &secnum, &end)) { | |
| @@ -419,29 +420,18 @@ static int parsedate(const char *date, time_t *output) | |
| date = end; | |
| } | |
| else { | |
| - | long lval; |
| - | int error; |
| - | int old_errno; |
| - | |
| - | old_errno = errno; |
| - | errno = 0; |
| - | lval = strtol(date, &end, 10); |
| - | error = errno; |
| - | if(errno != old_errno) |
| - | errno = old_errno; |
| - | |
| - | if(error) |
| + | size_t lval; |
| + | int num_digits = 0; |
| + | const char *p = date; |
| + | if(Curl_str_number(&p, &lval, 99999999)) |
| return PARSEDATE_FAIL; | |
| - | #if LONG_MAX != INT_MAX |
| - | if((lval > (long)INT_MAX) || (lval < (long)INT_MIN)) |
| - | return PARSEDATE_FAIL; |
| - | #endif |
| - | |
| - | val = curlx_sltosi(lval); |
| + | /* we know num_digits cannot be larger than 8 */ |
| + | num_digits = (int)(p - date); |
| + | val = (unsigned int)lval; |
| if((tzoff == -1) && | |
| - | ((end - date) == 4) && |
| + | (num_digits == 4) && |
| (val <= 1400) && | |
| (indate < date) && | |
| ((date[-1] == '+' || date[-1] == '-'))) { | |
| @@ -461,10 +451,10 @@ static int parsedate(const char *date, time_t *output) | |
| tzoff = date[-1]=='+' ? -tzoff : tzoff; | |
| } | |
| - | if(((end - date) == 8) && |
| - | (yearnum == -1) && |
| - | (monnum == -1) && |
| - | (mdaynum == -1)) { |
| + | else if((num_digits == 8) && |
| + | (yearnum == -1) && |
| + | (monnum == -1) && |
| + | (mdaynum == -1)) { |
| /* 8 digits, no year, month or day yet. This is YYYYMMDD */ | |
| found = TRUE; | |
| yearnum = val/10000; | |
| @@ -496,7 +486,7 @@ static int parsedate(const char *date, time_t *output) | |
| if(!found) | |
| return PARSEDATE_FAIL; | |
| - | date = end; |
| + | date = p; |
| } | |
| } | |
| @@ -69,7 +69,7 @@ struct pingpong { | |
| CURLcode (*statemachine)(struct Curl_easy *data, struct connectdata *conn); | |
| bool (*endofresp)(struct Curl_easy *data, struct connectdata *conn, | |
| - | char *ptr, size_t len, int *code); |
| + | const char *ptr, size_t len, int *code); |
| }; | |
| #define PINGPONG_SETUP(pp,s,e) \ | |
| @@ -244,7 +244,7 @@ static bool pop3_is_multiline(const char *cmdline) | |
| * types and allowed SASL mechanisms. | |
| */ | |
| static bool pop3_endofresp(struct Curl_easy *data, struct connectdata *conn, | |
| - | char *line, size_t len, int *resp) |
| + | const char *line, size_t len, int *resp) |
| { | |
| struct pop3_conn *pop3c = &conn->proto.pop3c; | |
| (void)data; | |
| @@ -40,6 +40,7 @@ | |
| #include "connect.h" | |
| #include "cfilters.h" | |
| #include "strdup.h" | |
| + | #include "strparse.h" |
| /* The last 3 #include files should be in this order */ | |
| #include "curl_printf.h" | |
| #include "curl_memory.h" | |
| @@ -925,21 +926,17 @@ 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)) { | |
| - | long CSeq = 0; |
| - | char *endp; |
| + | size_t CSeq = 0; |
| + | struct RTSP *rtsp = data->req.p.rtsp; |
| const char *p = &header[5]; | |
| while(ISBLANK(*p)) | |
| p++; | |
| - | CSeq = strtol(p, &endp, 10); |
| - | if(p != endp) { |
| - | struct RTSP *rtsp = data->req.p.rtsp; |
| - | rtsp->CSeq_recv = CSeq; /* mark the request */ |
| - | data->state.rtsp_CSeq_recv = CSeq; /* update the handle */ |
| - | } |
| - | else { |
| + | if(Curl_str_number(&p, &CSeq, LONG_MAX)) { |
| failf(data, "Unable to read the CSeq header: [%s]", header); | |
| return CURLE_RTSP_CSEQ_ERROR; | |
| } | |
| + | rtsp->CSeq_recv = (long)CSeq; /* mark the request */ |
| + | data->state.rtsp_CSeq_recv = (long)CSeq; /* update the handle */ |
| } | |
| else if(checkprefix("Session:", header)) { | |
| const char *start, *end; | |
| @@ -1010,25 +1007,21 @@ CURLcode rtsp_parse_transport(struct Curl_easy *data, const char *transport) | |
| start++; | |
| end = strchr(start, ';'); | |
| if(checkprefix("interleaved=", start)) { | |
| - | long chan1, chan2, chan; |
| - | char *endp; |
| + | size_t chan1, chan2, chan; |
| const char *p = start + 12; | |
| - | chan1 = strtol(p, &endp, 10); |
| - | if(p != endp && chan1 >= 0 && chan1 <= 255) { |
| + | if(!Curl_str_number(&p, &chan1, 255)) { |
| unsigned char *rtp_channel_mask = data->state.rtp_channel_mask; | |
| chan2 = chan1; | |
| - | if(*endp == '-') { |
| - | p = endp + 1; |
| - | chan2 = strtol(p, &endp, 10); |
| - | if(p == endp || chan2 < 0 || chan2 > 255) { |
| + | if(!Curl_str_single(&p, '-')) { |
| + | if(Curl_str_number(&p, &chan2, 255)) { |
| infof(data, "Unable to read the interleaved parameter from " | |
| "Transport header: [%s]", transport); | |
| chan2 = chan1; | |
| } | |
| } | |
| for(chan = chan1; chan <= chan2; chan++) { | |
| - | long idx = chan / 8; |
| - | long off = chan % 8; |
| + | int idx = (int)chan / 8; |
| + | int off = (int)chan % 8; |
| rtp_channel_mask[idx] |= (unsigned char)(1 << off); | |
| } | |
| } | |
| @@ -80,6 +80,8 @@ | |
| #include "curl_sasl.h" | |
| #include "warnless.h" | |
| #include "idn.h" | |
| + | #include "strparse.h" |
| + | |
| /* The last 3 #include files should be in this order */ | |
| #include "curl_printf.h" | |
| #include "curl_memory.h" | |
| @@ -197,7 +199,7 @@ static const struct SASLproto saslsmtp = { | |
| * supported authentication mechanisms. | |
| */ | |
| static bool smtp_endofresp(struct Curl_easy *data, struct connectdata *conn, | |
| - | char *line, size_t len, int *resp) |
| + | const char *line, size_t len, int *resp) |
| { | |
| struct smtp_conn *smtpc = &conn->proto.smtpc; | |
| bool result = FALSE; | |
| @@ -213,11 +215,14 @@ 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; |
| + | const char *p = tmpline; |
| result = TRUE; | |
| - | memset(tmpline, '\0', sizeof(tmpline)); |
| memcpy(tmpline, line, (len == 5 ? 5 : 3)); | |
| - | *resp = curlx_sltosi(strtol(tmpline, NULL, 10)); |
| + | tmpline[len == 5 ? 5 : 3 ] = 0; |
| + | if(Curl_str_number(&p, &code, len == 5 ? 99999 : 999)) |
| + | return FALSE; |
| + | *resp = (int) code; |
| /* Make sure real server never sends internal value */ | |
| if(*resp == 1) | |
| @@ -58,6 +58,7 @@ | |
| #include "select.h" | |
| #include "strcase.h" | |
| #include "warnless.h" | |
| + | #include "strparse.h" |
| /* The last 3 #include files should be in this order */ | |
| #include "curl_printf.h" | |
| @@ -862,22 +863,20 @@ static CURLcode check_telnet_options(struct Curl_easy *data) | |
| case 2: | |
| /* Window Size */ | |
| if(strncasecompare(option, "WS", 2)) { | |
| - | char *p; |
| - | unsigned long x = strtoul(arg, &p, 10); |
| - | unsigned long y = 0; |
| - | if(x && (x <= 0xffff) && Curl_raw_tolower(*p) == 'x') { |
| - | p++; |
| - | y = strtoul(p, NULL, 10); |
| - | if(y && (y <= 0xffff)) { |
| - | tn->subopt_wsx = (unsigned short)x; |
| - | tn->subopt_wsy = (unsigned short)y; |
| - | tn->us_preferred[CURL_TELOPT_NAWS] = CURL_YES; |
| - | } |
| - | } |
| - | if(!y) { |
| + | const char *p = arg; |
| + | size_t x = 0; |
| + | size_t y = 0; |
| + | if(Curl_str_number(&p, &x, 0xffff) || |
| + | Curl_str_single(&p, 'x') || |
| + | Curl_str_number(&p, &y, 0xffff)) { |
| failf(data, "Syntax error in telnet option: %s", head->data); | |
| result = CURLE_SETOPT_OPTION_SYNTAX; | |
| } | |
| + | else { |
| + | tn->subopt_wsx = (unsigned short)x; |
| + | tn->subopt_wsy = (unsigned short)y; |
| + | tn->us_preferred[CURL_TELOPT_NAWS] = CURL_YES; |
| + | } |
| } | |
| else | |
| result = CURLE_UNKNOWN_OPTION; | |
| @@ -62,6 +62,7 @@ | |
| #include "speedcheck.h" | |
| #include "select.h" | |
| #include "escape.h" | |
| + | #include "strparse.h" |
| /* The last 3 #include files should be in this order */ | |
| #include "curl_printf.h" | |
| @@ -135,9 +136,9 @@ struct tftp_state_data { | |
| struct Curl_sockaddr_storage remote_addr; | |
| curl_socklen_t remote_addrlen; | |
| int rbytes; | |
| - | int sbytes; |
| - | int blksize; |
| - | int requested_blksize; |
| + | size_t sbytes; |
| + | unsigned int blksize; |
| + | unsigned int requested_blksize; |
| unsigned short block; | |
| struct tftp_packet rpacket; | |
| struct tftp_packet spacket; | |
| @@ -330,19 +331,16 @@ 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)) { | |
| - | long blksize; |
| - | |
| - | blksize = strtol(value, NULL, 10); |
| - | |
| - | if(!blksize) { |
| - | failf(data, "invalid blocksize value in OACK packet"); |
| - | return CURLE_TFTP_ILLEGAL; |
| - | } |
| - | if(blksize > TFTP_BLKSIZE_MAX) { |
| + | size_t blksize; |
| + | if(Curl_str_number(&value, &blksize, TFTP_BLKSIZE_MAX)) { |
| failf(data, "%s (%d)", "blksize is larger than max supported", | |
| TFTP_BLKSIZE_MAX); | |
| return CURLE_TFTP_ILLEGAL; | |
| } | |
| + | if(!blksize) { |
| + | failf(data, "invalid blocksize value in OACK packet"); |
| + | return CURLE_TFTP_ILLEGAL; |
| + | } |
| else if(blksize < TFTP_BLKSIZE_MIN) { | |
| failf(data, "%s (%d)", "blksize is smaller than min supported", | |
| TFTP_BLKSIZE_MIN); | |
| @@ -352,28 +350,26 @@ 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, "%s (%ld)", |
| - | "server requested blksize larger than allocated", blksize); |
| + | failf(data, "server requested blksize larger than allocated (%zd)", |
| + | blksize); |
| return CURLE_TFTP_ILLEGAL; | |
| } | |
| state->blksize = (int)blksize; | |
| - | infof(data, "%s (%d) %s (%d)", "blksize parsed from OACK", |
| - | state->blksize, "requested", state->requested_blksize); |
| + | infof(data, "blksize parsed from OACK (%d) requested (%d)", |
| + | state->blksize, state->requested_blksize); |
| } | |
| else if(checkprefix(TFTP_OPTION_TSIZE, option)) { | |
| - | long tsize = 0; |
| - | |
| - | tsize = strtol(value, NULL, 10); |
| - | infof(data, "%s (%ld)", "tsize parsed from OACK", tsize); |
| - | |
| + | size_t tsize = 0; |
| /* tsize should be ignored on upload: Who cares about the size of the | |
| remote file? */ | |
| - | if(!data->state.upload) { |
| + | if(!data->state.upload && |
| + | !Curl_str_number(&value, &tsize, SIZE_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); |
| Curl_pgrsSetDownloadSize(data, tsize); | |
| } | |
| } | |
| @@ -776,7 +772,7 @@ static CURLcode tftp_tx(struct tftp_state_data *state, tftp_event_t event) | |
| &cb, &eos); | |
| if(result) | |
| return result; | |
| - | state->sbytes += (int)cb; |
| + | state->sbytes += cb; |
| bufptr += cb; | |
| } while(state->sbytes < state->blksize && cb); | |
| @@ -119,7 +119,7 @@ | |
| #include "altsvc.h" | |
| #include "dynbuf.h" | |
| #include "headers.h" | |
| - | |
| + | #include "strparse.h" |
| /* The last 3 #include files should be in this order */ | |
| #include "curl_printf.h" | |
| #include "curl_memory.h" | |
| @@ -1680,9 +1680,9 @@ static void zonefrom_url(CURLU *uh, struct Curl_easy *data, | |
| #endif | |
| if(!uc && zoneid) { | |
| - | char *endp; |
| - | unsigned long scope = strtoul(zoneid, &endp, 10); |
| - | if(!*endp && (scope < UINT_MAX)) |
| + | const char *p = zoneid; |
| + | size_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; | |
| #if defined(HAVE_IF_NAMETOINDEX) | |
| @@ -1919,10 +1919,17 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data, | |
| return CURLE_OUT_OF_MEMORY; | |
| } | |
| else { | |
| - | unsigned long port = strtoul(data->state.up.port, NULL, 10); |
| - | conn->primary.remote_port = conn->remote_port = |
| - | (data->set.use_port && data->state.allow_port) ? |
| - | data->set.use_port : curlx_ultous(port); |
| + | size_t port; |
| + | bool valid = TRUE; |
| + | if(data->set.use_port && data->state.allow_port) |
| + | port = data->set.use_port; |
| + | else { |
| + | const char *p = data->state.up.port; |
| + | if(Curl_str_number(&p, &port, 0xffff)) |
| + | valid = FALSE; |
| + | } |
| + | if(valid) |
| + | conn->primary.remote_port = conn->remote_port = (unsigned short)port; |
| } | |
| (void)curl_url_get(uh, CURLUPART_QUERY, &data->state.up.query, 0); | |
| @@ -2251,7 +2258,10 @@ static CURLcode parse_proxy(struct Curl_easy *data, | |
| (void)curl_url_get(uhp, CURLUPART_PORT, &portptr, 0); | |
| if(portptr) { | |
| - | port = (int)strtol(portptr, NULL, 10); |
| + | size_t num; |
| + | const char *p = portptr; |
| + | if(!Curl_str_number(&p, &num, 0xffff)) |
| + | port = (int)num; |
| free(portptr); | |
| } | |
| else { | |
| @@ -2889,19 +2899,18 @@ static CURLcode parse_connect_to_host_port(struct Curl_easy *data, | |
| /* Get port number off server.com:1080 */ | |
| host_portno = strchr(portptr, ':'); | |
| if(host_portno) { | |
| - | char *endp = NULL; |
| *host_portno = '\0'; /* cut off number from hostname */ | |
| host_portno++; | |
| if(*host_portno) { | |
| - | long portparse = strtol(host_portno, &endp, 10); |
| - | if((endp && *endp) || (portparse < 0) || (portparse > 65535)) { |
| + | size_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)", | |
| host_portno); | |
| result = CURLE_SETOPT_OPTION_SYNTAX; | |
| goto error; | |
| } | |
| - | else |
| - | port = (int)portparse; /* we know it will fit */ |
| + | port = (int)portparse; /* we know it will fit */ |
| } | |
| } | |
| @@ -2972,12 +2981,11 @@ 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) { | |
| - | char *endp = NULL; |
| - | long port_to_match = strtol(ptr, &endp, 10); |
| - | if((endp == ptr_next) && (port_to_match == conn->remote_port)) { |
| + | size_t port_to_match; |
| + | if(!Curl_str_number(&ptr, &port_to_match, 0xffff) && |
| + | (port_to_match == (size_t)conn->remote_port)) |
| port_match = TRUE; | |
| - | ptr = ptr_next + 1; |
| - | } |
| + | ptr = ptr_next + 1; |
| } | |
| } | |
| } | |
| @@ -34,6 +34,7 @@ | |
| #include "inet_ntop.h" | |
| #include "strdup.h" | |
| #include "idn.h" | |
| + | #include "strparse.h" |
| /* The last 3 #include files should be in this order */ | |
| #include "curl_printf.h" | |
| @@ -445,7 +446,7 @@ out: | |
| UNITTEST CURLUcode Curl_parse_port(struct Curl_URL *u, struct dynbuf *host, | |
| bool has_scheme) | |
| { | |
| - | char *portptr; |
| + | const char *portptr; |
| char *hostname = Curl_dyn_ptr(host); | |
| /* | |
| * Find the end of an IPv6 address on the ']' ending bracket. | |
| @@ -467,8 +468,7 @@ UNITTEST CURLUcode Curl_parse_port(struct Curl_URL *u, struct dynbuf *host, | |
| portptr = strchr(hostname, ':'); | |
| if(portptr) { | |
| - | char *rest = NULL; |
| - | unsigned long port; |
| + | size_t port; |
| size_t keep = portptr - hostname; | |
| /* Browser behavior adaptation. If there is a colon with no digits after, | |
| @@ -483,19 +483,13 @@ UNITTEST CURLUcode Curl_parse_port(struct Curl_URL *u, struct dynbuf *host, | |
| if(!*portptr) | |
| return has_scheme ? CURLUE_OK : CURLUE_BAD_PORT_NUMBER; | |
| - | if(!ISDIGIT(*portptr)) |
| - | return CURLUE_BAD_PORT_NUMBER; |
| - | |
| - | errno = 0; |
| - | port = strtoul(portptr, &rest, 10); /* Port number must be decimal */ |
| - | |
| - | if(errno || (port > 0xffff) || *rest) |
| + | if(Curl_str_number(&portptr, &port, 0xffff) || *portptr) |
| return CURLUE_BAD_PORT_NUMBER; | |
| u->portnum = (unsigned short) port; | |
| /* generate a new port number string to get rid of leading zeroes etc */ | |
| free(u->port); | |
| - | u->port = aprintf("%ld", port); |
| + | u->port = aprintf("%zd", port); |
| if(!u->port) | |
| return CURLUE_OUT_OF_MEMORY; | |
| } | |
| @@ -1751,14 +1745,11 @@ CURLUcode curl_url_set(CURLU *u, CURLUPart what, | |
| return CURLUE_BAD_PORT_NUMBER; | |
| else { | |
| char *tmp; | |
| - | char *endp; |
| - | unsigned long port; |
| - | errno = 0; |
| - | port = strtoul(part, &endp, 10); /* must be decimal */ |
| - | if(errno || (port > 0xffff) || *endp) |
| + | size_t port; |
| + | if(Curl_str_number(&part, &port, 0xffff) || *part) |
| /* weirdly provided number, not good! */ | |
| return CURLUE_BAD_PORT_NUMBER; | |
| - | tmp = strdup(part); |
| + | tmp = aprintf("%zd", port); |
| if(!tmp) | |
| return CURLUE_OUT_OF_MEMORY; | |
| free(u->port); | |
| @@ -93,9 +93,9 @@ Curl_str_number | |
| 6: ("00000000000000000000000000001234") 0, [1234] line 32 | |
| 7: ("0123 345") 0, [123] line 4 | |
| 8: ("0123O345") 0, [123] line 4 | |
| - | 9: ("-12") 0, [0] line 0 |
| - | 10: (" 123") 0, [0] line 0 |
| - | 11: ("") 0, [0] line 0 |
| + | 9: ("-12") 8, [0] line 0 |
| + | 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 | |