0095f98464
Daniel Stenberg
2024-10-11
Subject
libssh2: split the statemachine function into smaller sub functions
Binary
Architecture & Compiler Flags
—
Build Log
$ git checkout -f 0095f98464d85a3b2863d1c9ef7c5a71c9739450
Previous HEAD position was 617feb7c93 RELEASE-NOTES: synced
HEAD is now at 0095f98464 libssh2: split the statemachine function into smaller sub functions
$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing buildinfo.txt
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/base64.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curl_multibyte.o
Removing lib/dynbuf.o
Removing lib/libcurl.la
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-thread.lo
Removing lib/libcurl_la-asyn-thread.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-c-hyper.lo
Removing lib/libcurl_la-c-hyper.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_path.lo
Removing lib/libcurl_la-curl_path.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_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-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-strtok.lo
Removing lib/libcurl_la-strtok.o
Removing lib/libcurl_la-strtoofft.lo
Removing lib/libcurl_la-strtoofft.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-timediff.lo
Removing lib/libcurl_la-timediff.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/nonblock.o
Removing lib/stamp-h1
Removing lib/strtoofft.o
Removing lib/timediff.o
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/version_win32.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_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-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-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/warnless.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/slist_wc.o
Removing src/terminal.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_ca_embed.c
Removing src/tool_ca_embed.o
Removing src/tool_cb_dbg.o
Removing src/tool_cb_hdr.o
Removing src/tool_cb_prg.o
Removing src/tool_cb_rea.o
Removing src/tool_cb_see.o
Removing src/tool_cb_soc.o
Removing src/tool_cb_wrt.o
Removing src/tool_cfgable.o
Removing src/tool_dirhie.o
Removing src/tool_doswin.o
Removing src/tool_easysrc.o
Removing src/tool_filetime.o
Removing src/tool_findfile.o
Removing src/tool_formparse.o
Removing src/tool_getparam.o
Removing src/tool_getpass.o
Removing src/tool_help.o
Removing src/tool_helpers.o
Removing src/tool_hugehelp.c
Removing src/tool_hugehelp.o
Removing src/tool_ipfs.o
Removing src/tool_libinfo.o
Removing src/tool_listhelp.o
Removing src/tool_main.o
Removing src/tool_msgs.o
Removing src/tool_operate.o
Removing src/tool_operhlp.o
Removing src/tool_paramhlp.o
Removing src/tool_parsecfg.o
Removing src/tool_progress.o
Removing src/tool_setopt.o
Removing src/tool_sleep.o
Removing src/tool_stderr.o
Removing src/tool_strdup.o
Removing src/tool_urlglob.o
Removing src/tool_util.o
Removing src/tool_vms.o
Removing src/tool_writeout.o
Removing src/tool_writeout_json.o
Removing src/tool_xattr.o
Removing src/var.o
Removing 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:125: installing './compile'
configure.ac:437: installing './config.guess'
configure.ac:437: installing './config.sub'
configure.ac:125: installing './install-sh'
configure.ac:131: 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 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.11.0-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... /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 file API... no
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 stdlib.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netinet/udp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/stat.h... (cached) yes
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for fcntl.h... yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for sys/eventfd.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking whether build target is a native Windows one... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gethostbyname can be linked... yes
checking if gethostbyname is prototyped... yes
checking if gethostbyname is compilable... yes
checking if gethostbyname usage allowed... yes
checking if gethostbyname might be used... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for 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 strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking if strtok_r can be linked... yes
checking if strtok_r is prototyped... yes
checking if strtok_r is compilable... yes
checking if strtok_r usage allowed... yes
checking if strtok_r might be used... yes
checking if strtoll can be linked... yes
checking if strtoll is prototyped... yes
checking if strtoll is compilable... yes
checking if strtoll usage allowed... yes
checking if strtoll might be used... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for _fseeki64... no
checking for eventfd... yes
checking for fnmatch... yes
checking for geteuid... yes
checking for getpass_r... no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for if_nametoindex... yes
checking for mach_absolute_time... no
checking for pipe... yes
checking for poll... yes
checking for sched_yield... 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 arc4random... no
checking for fseeko... yes
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking whether to enable the threaded resolver... yes
checking whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
checking whether to use POSIX threads for threaded resolver... auto
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:
LIBS: -lpsl -lz
curl version: 8.11.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build 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)
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-amigaos.lo
CC libcurl_la-asyn-ares.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-c-hyper.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_path.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-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-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-cram.lo
CC vauth/libcurl_la-cleartext.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-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-tls.lo
CC vquic/libcurl_la-vquic.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in 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 slist_wc.o
CC tool_binmode.o
CC terminal.o
CC tool_cb_dbg.o
CC tool_bname.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_rea.o
CC tool_cb_see.o
CC tool_cb_soc.o
CC tool_cfgable.o
CC tool_cb_wrt.o
CC tool_dirhie.o
CC tool_doswin.o
CC tool_easysrc.o
CC tool_filetime.o
CC tool_findfile.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
echo '#include "tool_hugehelp.h"' >> tool_hugehelp.c
CC tool_helpers.o
CC tool_ipfs.o
CC tool_libinfo.o
CC tool_listhelp.o
CC tool_main.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_stderr.o
CC tool_strdup.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
echo 'extern const void *curl_ca_embed; const void *curl_ca_embed;' > tool_ca_embed.c
CC tool_hugehelp.o
CC tool_ca_embed.o
CC ../lib/base64.o
CC ../lib/curl_multibyte.o
CC ../lib/dynbuf.o
CC ../lib/nonblock.o
CC ../lib/strtoofft.o
CC ../lib/version_win32.o
CC ../lib/timediff.o
CC ../lib/warnless.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/vssh/libssh2.c+804 -812
| @@ -959,25 +959,750 @@ static CURLcode ssh_force_knownhost_key_type(struct Curl_easy *data) | |
| return result; | |
| } | |
| + | static CURLcode sftp_quote(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp) |
| + | { |
| + | const char *cp; |
| + | CURLcode result = CURLE_OK; |
| + | |
| + | /* |
| + | * Support some of the "FTP" commands |
| + | * |
| + | * 'sshc->quote_item' is already verified to be non-NULL before it |
| + | * switched to this state. |
| + | */ |
| + | char *cmd = sshc->quote_item->data; |
| + | sshc->acceptfail = FALSE; |
| + | |
| + | /* if a command starts with an asterisk, which a legal SFTP command never |
| + | can, the command will be allowed to fail without it causing any |
| + | aborts or cancels etc. It will cause libcurl to act as if the command |
| + | is successful, whatever the server responds. */ |
| + | |
| + | if(cmd[0] == '*') { |
| + | cmd++; |
| + | sshc->acceptfail = TRUE; |
| + | } |
| + | |
| + | if(strcasecompare("pwd", cmd)) { |
| + | /* output debug output if that is requested */ |
| + | char *tmp = aprintf("257 \"%s\" is current directory.\n", sshp->path); |
| + | if(!tmp) |
| + | return CURLE_OUT_OF_MEMORY; |
| + | Curl_debug(data, CURLINFO_HEADER_OUT, (char *)"PWD\n", 4); |
| + | Curl_debug(data, CURLINFO_HEADER_IN, tmp, strlen(tmp)); |
| + | |
| + | /* this sends an FTP-like "header" to the header callback so that the |
| + | current directory can be read very similar to how it is read when |
| + | using ordinary FTP. */ |
| + | result = Curl_client_write(data, CLIENTWRITE_HEADER, tmp, strlen(tmp)); |
| + | free(tmp); |
| + | if(!result) |
| + | state(data, SSH_SFTP_NEXT_QUOTE); |
| + | return result; |
| + | } |
| + | |
| + | /* |
| + | * the arguments following the command must be separated from the |
| + | * command with a space so we can check for it unconditionally |
| + | */ |
| + | cp = strchr(cmd, ' '); |
| + | if(!cp) { |
| + | failf(data, "Syntax error command '%s', missing parameter", cmd); |
| + | return result; |
| + | } |
| + | |
| + | /* |
| + | * also, every command takes at least one argument so we get that |
| + | * first argument right now |
| + | */ |
| + | result = Curl_get_pathname(&cp, &sshc->quote_path1, sshc->homedir); |
| + | if(result) { |
| + | if(result != CURLE_OUT_OF_MEMORY) |
| + | failf(data, "Syntax error: Bad first parameter to '%s'", cmd); |
| + | return result; |
| + | } |
| + | |
| + | /* |
| + | * SFTP is a binary protocol, so we do not send text commands to the server. |
| + | * Instead, we scan for commands used by OpenSSH's sftp program and call the |
| + | * appropriate libssh2 functions. |
| + | */ |
| + | if(strncasecompare(cmd, "chgrp ", 6) || |
| + | strncasecompare(cmd, "chmod ", 6) || |
| + | strncasecompare(cmd, "chown ", 6) || |
| + | strncasecompare(cmd, "atime ", 6) || |
| + | strncasecompare(cmd, "mtime ", 6)) { |
| + | /* attribute change */ |
| + | |
| + | /* sshc->quote_path1 contains the mode to set */ |
| + | /* get the destination */ |
| + | result = Curl_get_pathname(&cp, &sshc->quote_path2, sshc->homedir); |
| + | if(result) { |
| + | if(result != CURLE_OUT_OF_MEMORY) |
| + | failf(data, "Syntax error in %s: Bad second parameter", cmd); |
| + | Curl_safefree(sshc->quote_path1); |
| + | return result; |
| + | } |
| + | memset(&sshp->quote_attrs, 0, sizeof(LIBSSH2_SFTP_ATTRIBUTES)); |
| + | state(data, SSH_SFTP_QUOTE_STAT); |
| + | return result; |
| + | } |
| + | if(strncasecompare(cmd, "ln ", 3) || |
| + | strncasecompare(cmd, "symlink ", 8)) { |
| + | /* symbolic linking */ |
| + | /* sshc->quote_path1 is the source */ |
| + | /* get the destination */ |
| + | result = Curl_get_pathname(&cp, &sshc->quote_path2, sshc->homedir); |
| + | if(result) { |
| + | if(result != CURLE_OUT_OF_MEMORY) |
| + | failf(data, "Syntax error in ln/symlink: Bad second parameter"); |
| + | Curl_safefree(sshc->quote_path1); |
| + | return result; |
| + | } |
| + | state(data, SSH_SFTP_QUOTE_SYMLINK); |
| + | return result; |
| + | } |
| + | else if(strncasecompare(cmd, "mkdir ", 6)) { |
| + | /* create dir */ |
| + | state(data, SSH_SFTP_QUOTE_MKDIR); |
| + | return result; |
| + | } |
| + | else if(strncasecompare(cmd, "rename ", 7)) { |
| + | /* rename file */ |
| + | /* first param is the source path */ |
| + | /* second param is the dest. path */ |
| + | result = Curl_get_pathname(&cp, &sshc->quote_path2, sshc->homedir); |
| + | if(result) { |
| + | if(result != CURLE_OUT_OF_MEMORY) |
| + | failf(data, "Syntax error in rename: Bad second parameter"); |
| + | Curl_safefree(sshc->quote_path1); |
| + | return result; |
| + | } |
| + | state(data, SSH_SFTP_QUOTE_RENAME); |
| + | return result; |
| + | } |
| + | else if(strncasecompare(cmd, "rmdir ", 6)) { |
| + | /* delete dir */ |
| + | state(data, SSH_SFTP_QUOTE_RMDIR); |
| + | return result; |
| + | } |
| + | else if(strncasecompare(cmd, "rm ", 3)) { |
| + | state(data, SSH_SFTP_QUOTE_UNLINK); |
| + | return result; |
| + | } |
| + | #ifdef HAS_STATVFS_SUPPORT |
| + | else if(strncasecompare(cmd, "statvfs ", 8)) { |
| + | state(data, SSH_SFTP_QUOTE_STATVFS); |
| + | return result; |
| + | } |
| + | #endif |
| + | |
| + | failf(data, "Unknown SFTP command"); |
| + | Curl_safefree(sshc->quote_path1); |
| + | Curl_safefree(sshc->quote_path2); |
| + | return CURLE_QUOTE_ERROR; |
| + | } |
| + | |
| + | static CURLcode |
| + | sftp_upload_init(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp, |
| + | bool *blockp) |
| + | { |
| + | unsigned long flags; |
| + | |
| + | /* |
| + | * NOTE!!! libssh2 requires that the destination path is a full path |
| + | * that includes the destination file and name OR ends in a "/" |
| + | * If this is not done the destination file will be named the |
| + | * same name as the last directory in the path. |
| + | */ |
| + | |
| + | if(data->state.resume_from) { |
| + | LIBSSH2_SFTP_ATTRIBUTES attrs; |
| + | if(data->state.resume_from < 0) { |
| + | int rc = libssh2_sftp_stat_ex(sshc->sftp_session, sshp->path, |
| + | curlx_uztoui(strlen(sshp->path)), |
| + | LIBSSH2_SFTP_STAT, &attrs); |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| + | *blockp = TRUE; |
| + | return CURLE_OK; |
| + | } |
| + | if(rc) { |
| + | data->state.resume_from = 0; |
| + | } |
| + | else { |
| + | curl_off_t size = attrs.filesize; |
| + | if(size < 0) { |
| + | failf(data, "Bad file size (%" FMT_OFF_T ")", size); |
| + | return CURLE_BAD_DOWNLOAD_RESUME; |
| + | } |
| + | data->state.resume_from = attrs.filesize; |
| + | } |
| + | } |
| + | } |
| + | |
| + | if(data->set.remote_append) |
| + | /* Try to open for append, but create if nonexisting */ |
| + | flags = LIBSSH2_FXF_WRITE|LIBSSH2_FXF_CREAT|LIBSSH2_FXF_APPEND; |
| + | else if(data->state.resume_from > 0) |
| + | /* If we have restart position then open for append */ |
| + | flags = LIBSSH2_FXF_WRITE|LIBSSH2_FXF_APPEND; |
| + | else |
| + | /* Clear file before writing (normal behavior) */ |
| + | flags = LIBSSH2_FXF_WRITE|LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC; |
| + | |
| + | sshc->sftp_handle = |
| + | libssh2_sftp_open_ex(sshc->sftp_session, sshp->path, |
| + | curlx_uztoui(strlen(sshp->path)), |
| + | flags, (long)data->set.new_file_perms, |
| + | LIBSSH2_SFTP_OPENFILE); |
| + | |
| + | if(!sshc->sftp_handle) { |
| + | unsigned long sftperr; |
| + | int rc = libssh2_session_last_errno(sshc->ssh_session); |
| + | |
| + | if(LIBSSH2_ERROR_EAGAIN == rc) { |
| + | *blockp = TRUE; |
| + | return CURLE_OK; |
| + | } |
| + | |
| + | if(LIBSSH2_ERROR_SFTP_PROTOCOL == rc) |
| + | /* only when there was an SFTP protocol error can we extract |
| + | the sftp error! */ |
| + | sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| + | else |
| + | sftperr = LIBSSH2_FX_OK; /* not an sftp error at all */ |
| + | |
| + | if(sshc->secondCreateDirs) { |
| + | state(data, SSH_SFTP_CLOSE); |
| + | sshc->actualcode = sftperr != LIBSSH2_FX_OK ? |
| + | sftp_libssh2_error_to_CURLE(sftperr) : CURLE_SSH; |
| + | failf(data, "Creating the dir/file failed: %s", |
| + | sftp_libssh2_strerror(sftperr)); |
| + | return CURLE_OK; |
| + | } |
| + | if(((sftperr == LIBSSH2_FX_NO_SUCH_FILE) || |
| + | (sftperr == LIBSSH2_FX_FAILURE) || |
| + | (sftperr == LIBSSH2_FX_NO_SUCH_PATH)) && |
| + | (data->set.ftp_create_missing_dirs && |
| + | (strlen(sshp->path) > 1))) { |
| + | /* try to create the path remotely */ |
| + | sshc->secondCreateDirs = 1; |
| + | state(data, SSH_SFTP_CREATE_DIRS_INIT); |
| + | return CURLE_OK; |
| + | } |
| + | state(data, SSH_SFTP_CLOSE); |
| + | sshc->actualcode = sftperr != LIBSSH2_FX_OK ? |
| + | sftp_libssh2_error_to_CURLE(sftperr) : CURLE_SSH; |
| + | if(!sshc->actualcode) { |
| + | /* Sometimes, for some reason libssh2_sftp_last_error() returns zero |
| + | even though libssh2_sftp_open() failed previously! We need to |
| + | work around that! */ |
| + | sshc->actualcode = CURLE_SSH; |
| + | sftperr = LIBSSH2_FX_OK; |
| + | } |
| + | failf(data, "Upload failed: %s (%lu/%d)", |
| + | sftperr != LIBSSH2_FX_OK ? |
| + | sftp_libssh2_strerror(sftperr) : "ssh error", |
| + | sftperr, rc); |
| + | return sshc->actualcode; |
| + | } |
| + | |
| + | /* If we have a restart point then we need to seek to the correct |
| + | position. */ |
| + | if(data->state.resume_from > 0) { |
| + | int seekerr = CURL_SEEKFUNC_OK; |
| + | /* Let's read off the proper amount of bytes from the input. */ |
| + | if(data->set.seek_func) { |
| + | Curl_set_in_callback(data, TRUE); |
| + | seekerr = data->set.seek_func(data->set.seek_client, |
| + | data->state.resume_from, SEEK_SET); |
| + | Curl_set_in_callback(data, FALSE); |
| + | } |
| + | |
| + | if(seekerr != CURL_SEEKFUNC_OK) { |
| + | curl_off_t passed = 0; |
| + | |
| + | if(seekerr != CURL_SEEKFUNC_CANTSEEK) { |
| + | failf(data, "Could not seek stream"); |
| + | return CURLE_FTP_COULDNT_USE_REST; |
| + | } |
| + | /* seekerr == CURL_SEEKFUNC_CANTSEEK (cannot seek to offset) */ |
| + | do { |
| + | char scratch[4*1024]; |
| + | size_t readthisamountnow = |
| + | (data->state.resume_from - passed > |
| + | (curl_off_t)sizeof(scratch)) ? |
| + | sizeof(scratch) : curlx_sotouz(data->state.resume_from - passed); |
| + | |
| + | size_t actuallyread; |
| + | Curl_set_in_callback(data, TRUE); |
| + | actuallyread = data->state.fread_func(scratch, 1, |
| + | readthisamountnow, |
| + | data->state.in); |
| + | Curl_set_in_callback(data, FALSE); |
| + | |
| + | passed += actuallyread; |
| + | if((actuallyread == 0) || (actuallyread > readthisamountnow)) { |
| + | /* this checks for greater-than only to make sure that the |
| + | CURL_READFUNC_ABORT return code still aborts */ |
| + | failf(data, "Failed to read data"); |
| + | return CURLE_FTP_COULDNT_USE_REST; |
| + | } |
| + | } while(passed < data->state.resume_from); |
| + | } |
| + | |
| + | /* now, decrease the size of the read */ |
| + | if(data->state.infilesize > 0) { |
| + | data->state.infilesize -= data->state.resume_from; |
| + | data->req.size = data->state.infilesize; |
| + | Curl_pgrsSetUploadSize(data, data->state.infilesize); |
| + | } |
| + | |
| + | SFTP_SEEK(sshc->sftp_handle, data->state.resume_from); |
| + | } |
| + | if(data->state.infilesize > 0) { |
| + | data->req.size = data->state.infilesize; |
| + | Curl_pgrsSetUploadSize(data, data->state.infilesize); |
| + | } |
| + | /* upload data */ |
| + | Curl_xfer_setup1(data, CURL_XFER_SEND, -1, FALSE); |
| + | |
| + | /* not set by Curl_xfer_setup to preserve keepon bits */ |
| + | data->conn->sockfd = data->conn->writesockfd; |
| + | |
| + | /* store this original bitmask setup to use later on if we cannot |
| + | figure out a "real" bitmask */ |
| + | sshc->orig_waitfor = data->req.keepon; |
| + | |
| + | /* we want to use the _sending_ function even when the socket turns |
| + | out readable as the underlying libssh2 sftp send function will deal |
| + | with both accordingly */ |
| + | data->state.select_bits = CURL_CSELECT_OUT; |
| + | |
| + | /* since we do not really wait for anything at this point, we want the |
| + | state machine to move on as soon as possible so we set a very short |
| + | timeout here */ |
| + | Curl_expire(data, 0, EXPIRE_RUN_NOW); |
| + | |
| + | state(data, SSH_STOP); |
| + | return CURLE_OK; |
| + | } |
| + | |
| + | static CURLcode |
| + | sftp_pkey_init(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| + | { |
| + | /* |
| + | * Check the supported auth types in the order I feel is most secure |
| + | * with the requested type of authentication |
| + | */ |
| + | sshc->authed = FALSE; |
| + | |
| + | if((data->set.ssh_auth_types & CURLSSH_AUTH_PUBLICKEY) && |
| + | (strstr(sshc->authlist, "publickey") != NULL)) { |
| + | bool out_of_memory = FALSE; |
| + | |
| + | sshc->rsa_pub = sshc->rsa = NULL; |
| + | |
| + | if(data->set.str[STRING_SSH_PRIVATE_KEY]) |
| + | sshc->rsa = strdup(data->set.str[STRING_SSH_PRIVATE_KEY]); |
| + | else { |
| + | /* To ponder about: should really the lib be messing about with the |
| + | HOME environment variable etc? */ |
| + | char *home = curl_getenv("HOME"); |
| + | struct_stat sbuf; |
| + | |
| + | /* If no private key file is specified, try some common paths. */ |
| + | if(home) { |
| + | /* Try ~/.ssh first. */ |
| + | sshc->rsa = aprintf("%s/.ssh/id_rsa", home); |
| + | if(!sshc->rsa) |
| + | out_of_memory = TRUE; |
| + | else if(stat(sshc->rsa, &sbuf)) { |
| + | Curl_safefree(sshc->rsa); |
| + | sshc->rsa = aprintf("%s/.ssh/id_dsa", home); |
| + | if(!sshc->rsa) |
| + | out_of_memory = TRUE; |
| + | else if(stat(sshc->rsa, &sbuf)) { |
| + | Curl_safefree(sshc->rsa); |
| + | } |
| + | } |
| + | free(home); |
| + | } |
| + | if(!out_of_memory && !sshc->rsa) { |
| + | /* Nothing found; try the current dir. */ |
| + | sshc->rsa = strdup("id_rsa"); |
| + | if(sshc->rsa && stat(sshc->rsa, &sbuf)) { |
| + | Curl_safefree(sshc->rsa); |
| + | sshc->rsa = strdup("id_dsa"); |
| + | if(sshc->rsa && stat(sshc->rsa, &sbuf)) { |
| + | Curl_safefree(sshc->rsa); |
| + | /* Out of guesses. Set to the empty string to avoid |
| + | * surprising info messages. */ |
| + | sshc->rsa = strdup(""); |
| + | } |
| + | } |
| + | } |
| + | } |
| + | |
| + | /* |
| + | * Unless the user explicitly specifies a public key file, let |
| + | * libssh2 extract the public key from the private key file. |
| + | * This is done by simply passing sshc->rsa_pub = NULL. |
| + | */ |
| + | if(data->set.str[STRING_SSH_PUBLIC_KEY] |
| + | /* treat empty string the same way as NULL */ |
| + | && data->set.str[STRING_SSH_PUBLIC_KEY][0]) { |
| + | sshc->rsa_pub = strdup(data->set.str[STRING_SSH_PUBLIC_KEY]); |
| + | if(!sshc->rsa_pub) |
| + | out_of_memory = TRUE; |
| + | } |
| + | |
| + | if(out_of_memory || !sshc->rsa) { |
| + | Curl_safefree(sshc->rsa); |
| + | Curl_safefree(sshc->rsa_pub); |
| + | state(data, SSH_SESSION_FREE); |
| + | sshc->actualcode = CURLE_OUT_OF_MEMORY; |
| + | return CURLE_OUT_OF_MEMORY; |
| + | } |
| + | |
| + | sshc->passphrase = data->set.ssl.key_passwd; |
| + | if(!sshc->passphrase) |
| + | sshc->passphrase = ""; |
| + | |
| + | if(sshc->rsa_pub) |
| + | infof(data, "Using SSH public key file '%s'", sshc->rsa_pub); |
| + | infof(data, "Using SSH private key file '%s'", sshc->rsa); |
| + | |
| + | state(data, SSH_AUTH_PKEY); |
| + | } |
| + | else { |
| + | state(data, SSH_AUTH_PASS_INIT); |
| + | } |
| + | return CURLE_OK; |
| + | } |
| + | |
| + | static CURLcode |
| + | sftp_quote_stat(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp, |
| + | bool *blockp) |
| + | { |
| + | char *cmd = sshc->quote_item->data; |
| + | sshc->acceptfail = FALSE; |
| + | |
| + | /* if a command starts with an asterisk, which a legal SFTP command never |
| + | can, the command will be allowed to fail without it causing any aborts or |
| + | cancels etc. It will cause libcurl to act as if the command is |
| + | successful, whatever the server responds. */ |
| + | |
| + | if(cmd[0] == '*') { |
| + | cmd++; |
| + | sshc->acceptfail = TRUE; |
| + | } |
| + | |
| + | if(!strncasecompare(cmd, "chmod", 5)) { |
| + | /* Since chown and chgrp only set owner OR group but libssh2 wants to set |
| + | * them both at once, we need to obtain the current ownership first. This |
| + | * takes an extra protocol round trip. |
| + | */ |
| + | int rc = libssh2_sftp_stat_ex(sshc->sftp_session, sshc->quote_path2, |
| + | curlx_uztoui(strlen(sshc->quote_path2)), |
| + | LIBSSH2_SFTP_STAT, |
| + | &sshp->quote_attrs); |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| + | *blockp = TRUE; |
| + | return CURLE_OK; |
| + | } |
| + | if(rc && !sshc->acceptfail) { /* get those attributes */ |
| + | unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| + | failf(data, "Attempt to get SFTP stats failed: %s", |
| + | sftp_libssh2_strerror(sftperr)); |
| + | goto fail; |
| + | } |
| + | } |
| + | |
| + | /* Now set the new attributes... */ |
| + | if(strncasecompare(cmd, "chgrp", 5)) { |
| + | sshp->quote_attrs.gid = strtoul(sshc->quote_path1, NULL, 10); |
| + | sshp->quote_attrs.flags = LIBSSH2_SFTP_ATTR_UIDGID; |
| + | if(sshp->quote_attrs.gid == 0 && !ISDIGIT(sshc->quote_path1[0]) && |
| + | !sshc->acceptfail) { |
| + | failf(data, "Syntax error: chgrp gid not a number"); |
| + | goto fail; |
| + | } |
| + | } |
| + | else if(strncasecompare(cmd, "chmod", 5)) { |
| + | sshp->quote_attrs.permissions = strtoul(sshc->quote_path1, NULL, 8); |
| + | sshp->quote_attrs.flags = LIBSSH2_SFTP_ATTR_PERMISSIONS; |
| + | /* permissions are octal */ |
| + | if(sshp->quote_attrs.permissions == 0 && |
| + | !ISDIGIT(sshc->quote_path1[0])) { |
| + | failf(data, "Syntax error: chmod permissions not a number"); |
| + | goto fail; |
| + | } |
| + | } |
| + | else if(strncasecompare(cmd, "chown", 5)) { |
| + | sshp->quote_attrs.uid = strtoul(sshc->quote_path1, NULL, 10); |
| + | sshp->quote_attrs.flags = LIBSSH2_SFTP_ATTR_UIDGID; |
| + | if(sshp->quote_attrs.uid == 0 && !ISDIGIT(sshc->quote_path1[0]) && |
| + | !sshc->acceptfail) { |
| + | failf(data, "Syntax error: chown uid not a number"); |
| + | goto fail; |
| + | } |
| + | } |
| + | else if(strncasecompare(cmd, "atime", 5) || |
| + | strncasecompare(cmd, "mtime", 5)) { |
| + | time_t date = Curl_getdate_capped(sshc->quote_path1); |
| + | bool fail = FALSE; |
| + | |
| + | if(date == -1) { |
| + | failf(data, "incorrect date format for %.*s", 5, cmd); |
| + | fail = TRUE; |
| + | } |
| + | #if SIZEOF_TIME_T > SIZEOF_LONG |
| + | if(date > 0xffffffff) { |
| + | /* if 'long' cannot old >32-bit, this date cannot be sent */ |
| + | failf(data, "date overflow"); |
| + | fail = TRUE; |
| + | } |
| + | #endif |
| + | if(fail) |
| + | goto fail; |
| + | if(strncasecompare(cmd, "atime", 5)) |
| + | sshp->quote_attrs.atime = (unsigned long)date; |
| + | else /* mtime */ |
| + | sshp->quote_attrs.mtime = (unsigned long)date; |
| + | |
| + | sshp->quote_attrs.flags = LIBSSH2_SFTP_ATTR_ACMODTIME; |
| + | } |
| + | |
| + | /* Now send the completed structure... */ |
| + | state(data, SSH_SFTP_QUOTE_SETSTAT); |
| + | return CURLE_OK; |
| + | fail: |
| + | Curl_safefree(sshc->quote_path1); |
| + | Curl_safefree(sshc->quote_path2); |
| + | return CURLE_QUOTE_ERROR; |
| + | } |
| + | |
| + | static CURLcode |
| + | sftp_download_stat(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp, |
| + | bool *blockp) |
| + | { |
| + | LIBSSH2_SFTP_ATTRIBUTES attrs; |
| + | int rc = libssh2_sftp_stat_ex(sshc->sftp_session, sshp->path, |
| + | curlx_uztoui(strlen(sshp->path)), |
| + | LIBSSH2_SFTP_STAT, &attrs); |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| + | *blockp = TRUE; |
| + | return CURLE_OK; |
| + | } |
| + | if(rc || |
| + | !(attrs.flags & LIBSSH2_SFTP_ATTR_SIZE) || |
| + | (attrs.filesize == 0)) { |
| + | /* |
| + | * libssh2_sftp_open() did not return an error, so maybe the server |
| + | * just does not support stat() |
| + | * OR the server does not return a file size with a stat() |
| + | * OR file size is 0 |
| + | */ |
| + | data->req.size = -1; |
| + | data->req.maxdownload = -1; |
| + | Curl_pgrsSetDownloadSize(data, -1); |
| + | } |
| + | else { |
| + | curl_off_t size = attrs.filesize; |
| + | |
| + | if(size < 0) { |
| + | failf(data, "Bad file size (%" FMT_OFF_T ")", size); |
| + | return CURLE_BAD_DOWNLOAD_RESUME; |
| + | } |
| + | if(data->state.use_range) { |
| + | curl_off_t from, to; |
| + | char *ptr; |
| + | char *ptr2; |
| + | CURLofft to_t; |
| + | CURLofft from_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) |
| + | return CURLE_RANGE_ERROR; |
| + | if((to_t == CURL_OFFT_INVAL) /* no "to" value given */ |
| + | || (to >= size)) { |
| + | to = size - 1; |
| + | } |
| + | if(from_t) { |
| + | /* from is relative to end of file */ |
| + | from = size - to; |
| + | to = size - 1; |
| + | } |
| + | if(from > size) { |
| + | failf(data, "Offset (%" FMT_OFF_T ") was beyond file size (%" |
| + | FMT_OFF_T ")", from, (curl_off_t)attrs.filesize); |
| + | return CURLE_BAD_DOWNLOAD_RESUME; |
| + | } |
| + | if(from > to) { |
| + | from = to; |
| + | size = 0; |
| + | } |
| + | else { |
| + | if((to - from) == CURL_OFF_T_MAX) |
| + | return CURLE_RANGE_ERROR; |
| + | size = to - from + 1; |
| + | } |
| + | |
| + | SFTP_SEEK(sshc->sftp_handle, from); |
| + | } |
| + | data->req.size = size; |
| + | data->req.maxdownload = size; |
| + | Curl_pgrsSetDownloadSize(data, size); |
| + | } |
| + | |
| + | /* We can resume if we can seek to the resume position */ |
| + | if(data->state.resume_from) { |
| + | if(data->state.resume_from < 0) { |
| + | /* We are supposed to download the last abs(from) bytes */ |
| + | if((curl_off_t)attrs.filesize < -data->state.resume_from) { |
| + | failf(data, "Offset (%" FMT_OFF_T ") was beyond file size (%" |
| + | FMT_OFF_T ")", |
| + | data->state.resume_from, (curl_off_t)attrs.filesize); |
| + | return CURLE_BAD_DOWNLOAD_RESUME; |
| + | } |
| + | /* download from where? */ |
| + | data->state.resume_from += attrs.filesize; |
| + | } |
| + | else { |
| + | if((curl_off_t)attrs.filesize < data->state.resume_from) { |
| + | failf(data, "Offset (%" FMT_OFF_T |
| + | ") was beyond file size (%" FMT_OFF_T ")", |
| + | data->state.resume_from, (curl_off_t)attrs.filesize); |
| + | return CURLE_BAD_DOWNLOAD_RESUME; |
| + | } |
| + | } |
| + | /* Now store the number of bytes we are expected to download */ |
| + | data->req.size = attrs.filesize - data->state.resume_from; |
| + | data->req.maxdownload = attrs.filesize - data->state.resume_from; |
| + | Curl_pgrsSetDownloadSize(data, |
| + | attrs.filesize - data->state.resume_from); |
| + | SFTP_SEEK(sshc->sftp_handle, data->state.resume_from); |
| + | } |
| + | |
| + | /* Setup the actual download */ |
| + | if(data->req.size == 0) { |
| + | /* no data to transfer */ |
| + | Curl_xfer_setup_nop(data); |
| + | infof(data, "File already completely downloaded"); |
| + | state(data, SSH_STOP); |
| + | return CURLE_OK; |
| + | } |
| + | Curl_xfer_setup1(data, CURL_XFER_RECV, data->req.size, FALSE); |
| + | |
| + | /* not set by Curl_xfer_setup to preserve keepon bits */ |
| + | data->conn->writesockfd = data->conn->sockfd; |
| + | |
| + | /* we want to use the _receiving_ function even when the socket turns |
| + | out writableable as the underlying libssh2 recv function will deal |
| + | with both accordingly */ |
| + | data->state.select_bits = CURL_CSELECT_IN; |
| + | state(data, SSH_STOP); |
| + | |
| + | return CURLE_OK; |
| + | } |
| + | |
| + | static CURLcode sftp_readdir(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp, |
| + | bool *blockp) |
| + | { |
| + | CURLcode result = CURLE_OK; |
| + | int rc = libssh2_sftp_readdir_ex(sshc->sftp_handle, |
| + | sshp->readdir_filename, |
| + | PATH_MAX, |
| + | sshp->readdir_longentry, |
| + | PATH_MAX, |
| + | &sshp->readdir_attrs); |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| + | *blockp = TRUE; |
| + | return result; |
| + | } |
| + | if(rc > 0) { |
| + | size_t readdir_len = (size_t) rc; |
| + | sshp->readdir_filename[readdir_len] = '\0'; |
| + | |
| + | if(data->set.list_only) { |
| + | result = Curl_client_write(data, CLIENTWRITE_BODY, |
| + | sshp->readdir_filename, |
| + | readdir_len); |
| + | if(!result) |
| + | result = Curl_client_write(data, CLIENTWRITE_BODY, |
| + | (char *)"\n", 1); |
| + | if(result) |
| + | return result; |
| + | } |
| + | else { |
| + | result = Curl_dyn_add(&sshp->readdir, sshp->readdir_longentry); |
| + | |
| + | if(!result) { |
| + | if((sshp->readdir_attrs.flags & LIBSSH2_SFTP_ATTR_PERMISSIONS) && |
| + | ((sshp->readdir_attrs.permissions & LIBSSH2_SFTP_S_IFMT) == |
| + | LIBSSH2_SFTP_S_IFLNK)) { |
| + | Curl_dyn_init(&sshp->readdir_link, PATH_MAX); |
| + | result = Curl_dyn_addf(&sshp->readdir_link, "%s%s", sshp->path, |
| + | sshp->readdir_filename); |
| + | state(data, SSH_SFTP_READDIR_LINK); |
| + | } |
| + | else { |
| + | state(data, SSH_SFTP_READDIR_BOTTOM); |
| + | } |
| + | } |
| + | return result; |
| + | } |
| + | } |
| + | else if(rc == 0) { |
| + | Curl_safefree(sshp->readdir_filename); |
| + | Curl_safefree(sshp->readdir_longentry); |
| + | state(data, SSH_SFTP_READDIR_DONE); |
| + | } |
| + | else if(rc < 0) { |
| + | unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| + | result = sftp_libssh2_error_to_CURLE(sftperr); |
| + | sshc->actualcode = result ? result : CURLE_SSH; |
| + | failf(data, "Could not open remote file for reading: %s :: %d", |
| + | sftp_libssh2_strerror(sftperr), |
| + | libssh2_session_last_errno(sshc->ssh_session)); |
| + | Curl_safefree(sshp->readdir_filename); |
| + | Curl_safefree(sshp->readdir_longentry); |
| + | state(data, SSH_SFTP_CLOSE); |
| + | } |
| + | return result; |
| + | } |
| /* | |
| - | * ssh_statemach_act() runs the SSH state machine as far as it can without |
| + | * ssh_statemachine() runs the SSH state machine as far as it can without |
| * blocking and without reaching the end. The data the pointer 'block' points | |
| * to will be set to TRUE if the libssh2 function returns LIBSSH2_ERROR_EAGAIN | |
| * meaning it wants to be called again when the socket is ready | |
| */ | |
| - | static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) |
| + | static CURLcode ssh_statemachine(struct Curl_easy *data, bool *block) |
| { | |
| CURLcode result = CURLE_OK; | |
| struct connectdata *conn = data->conn; | |
| struct SSHPROTO *sshp = data->req.p.ssh; | |
| struct ssh_conn *sshc = &conn->proto.sshc; | |
| - | curl_socket_t sock = conn->sock[FIRSTSOCKET]; |
| + | |
| int rc = LIBSSH2_ERROR_NONE; | |
| - | int ssherr; |
| - | unsigned long sftperr; |
| - | int seekerr = CURL_SEEKFUNC_OK; |
| - | size_t readdir_len; |
| *block = 0; /* we are not blocking by default */ | |
| do { | |
| @@ -1002,7 +1727,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| FALLTHROUGH(); | |
| case SSH_S_STARTUP: | |
| - | rc = session_startup(sshc->ssh_session, sock); |
| + | rc = session_startup(sshc->ssh_session, conn->sock[FIRSTSOCKET]); |
| if(rc == LIBSSH2_ERROR_EAGAIN) { | |
| break; | |
| } | |
| @@ -1053,12 +1778,12 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| state(data, SSH_AUTH_DONE); | |
| break; | |
| } | |
| - | ssherr = libssh2_session_last_errno(sshc->ssh_session); |
| - | if(ssherr == LIBSSH2_ERROR_EAGAIN) |
| + | rc = libssh2_session_last_errno(sshc->ssh_session); |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| rc = LIBSSH2_ERROR_EAGAIN; | |
| else { | |
| state(data, SSH_SESSION_FREE); | |
| - | sshc->actualcode = libssh2_session_error_to_CURLE(ssherr); |
| + | sshc->actualcode = libssh2_session_error_to_CURLE(rc); |
| } | |
| break; | |
| } | |
| @@ -1069,93 +1794,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| break; | |
| case SSH_AUTH_PKEY_INIT: | |
| - | /* |
| - | * Check the supported auth types in the order I feel is most secure |
| - | * with the requested type of authentication |
| - | */ |
| - | sshc->authed = FALSE; |
| - | |
| - | if((data->set.ssh_auth_types & CURLSSH_AUTH_PUBLICKEY) && |
| - | (strstr(sshc->authlist, "publickey") != NULL)) { |
| - | bool out_of_memory = FALSE; |
| - | |
| - | sshc->rsa_pub = sshc->rsa = NULL; |
| - | |
| - | if(data->set.str[STRING_SSH_PRIVATE_KEY]) |
| - | sshc->rsa = strdup(data->set.str[STRING_SSH_PRIVATE_KEY]); |
| - | else { |
| - | /* To ponder about: should really the lib be messing about with the |
| - | HOME environment variable etc? */ |
| - | char *home = curl_getenv("HOME"); |
| - | struct_stat sbuf; |
| - | |
| - | /* If no private key file is specified, try some common paths. */ |
| - | if(home) { |
| - | /* Try ~/.ssh first. */ |
| - | sshc->rsa = aprintf("%s/.ssh/id_rsa", home); |
| - | if(!sshc->rsa) |
| - | out_of_memory = TRUE; |
| - | else if(stat(sshc->rsa, &sbuf)) { |
| - | Curl_safefree(sshc->rsa); |
| - | sshc->rsa = aprintf("%s/.ssh/id_dsa", home); |
| - | if(!sshc->rsa) |
| - | out_of_memory = TRUE; |
| - | else if(stat(sshc->rsa, &sbuf)) { |
| - | Curl_safefree(sshc->rsa); |
| - | } |
| - | } |
| - | free(home); |
| - | } |
| - | if(!out_of_memory && !sshc->rsa) { |
| - | /* Nothing found; try the current dir. */ |
| - | sshc->rsa = strdup("id_rsa"); |
| - | if(sshc->rsa && stat(sshc->rsa, &sbuf)) { |
| - | Curl_safefree(sshc->rsa); |
| - | sshc->rsa = strdup("id_dsa"); |
| - | if(sshc->rsa && stat(sshc->rsa, &sbuf)) { |
| - | Curl_safefree(sshc->rsa); |
| - | /* Out of guesses. Set to the empty string to avoid |
| - | * surprising info messages. */ |
| - | sshc->rsa = strdup(""); |
| - | } |
| - | } |
| - | } |
| - | } |
| - | |
| - | /* |
| - | * Unless the user explicitly specifies a public key file, let |
| - | * libssh2 extract the public key from the private key file. |
| - | * This is done by simply passing sshc->rsa_pub = NULL. |
| - | */ |
| - | if(data->set.str[STRING_SSH_PUBLIC_KEY] |
| - | /* treat empty string the same way as NULL */ |
| - | && data->set.str[STRING_SSH_PUBLIC_KEY][0]) { |
| - | sshc->rsa_pub = strdup(data->set.str[STRING_SSH_PUBLIC_KEY]); |
| - | if(!sshc->rsa_pub) |
| - | out_of_memory = TRUE; |
| - | } |
| - | |
| - | if(out_of_memory || !sshc->rsa) { |
| - | Curl_safefree(sshc->rsa); |
| - | Curl_safefree(sshc->rsa_pub); |
| - | state(data, SSH_SESSION_FREE); |
| - | sshc->actualcode = CURLE_OUT_OF_MEMORY; |
| - | break; |
| - | } |
| - | |
| - | sshc->passphrase = data->set.ssl.key_passwd; |
| - | if(!sshc->passphrase) |
| - | sshc->passphrase = ""; |
| - | |
| - | if(sshc->rsa_pub) |
| - | infof(data, "Using SSH public key file '%s'", sshc->rsa_pub); |
| - | infof(data, "Using SSH private key file '%s'", sshc->rsa); |
| - | |
| - | state(data, SSH_AUTH_PKEY); |
| - | } |
| - | else { |
| - | state(data, SSH_AUTH_PASS_INIT); |
| - | } |
| + | result = sftp_pkey_init(data, sshc); |
| break; | |
| case SSH_AUTH_PKEY: | |
| @@ -1378,7 +2017,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| Curl_pgrsTime(data, TIMER_APPCONNECT); /* SSH is connected */ | |
| - | conn->sockfd = sock; |
| + | conn->sockfd = conn->sock[FIRSTSOCKET]; |
| conn->writesockfd = CURL_SOCKET_BAD; | |
| if(conn->handler->protocol == CURLPROTO_SFTP) { | |
| @@ -1437,7 +2076,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| } | |
| else { | |
| /* Return the error type */ | |
| - | sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| + | unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| if(sftperr) | |
| result = sftp_libssh2_error_to_CURLE(sftperr); | |
| else | |
| @@ -1463,214 +2102,41 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| result = Curl_getworkingpath(data, sshc->homedir, &sshp->path); | |
| if(result) { | |
| - | sshc->actualcode = result; |
| - | state(data, SSH_STOP); |
| - | break; |
| - | } |
| - | |
| - | if(data->set.quote) { |
| - | infof(data, "Sending quote commands"); |
| - | sshc->quote_item = data->set.quote; |
| - | state(data, SSH_SFTP_QUOTE); |
| - | } |
| - | else { |
| - | state(data, SSH_SFTP_GETINFO); |
| - | } |
| - | break; |
| - | |
| - | case SSH_SFTP_POSTQUOTE_INIT: |
| - | if(data->set.postquote) { |
| - | infof(data, "Sending quote commands"); |
| - | sshc->quote_item = data->set.postquote; |
| - | state(data, SSH_SFTP_QUOTE); |
| - | } |
| - | else { |
| - | state(data, SSH_STOP); |
| - | } |
| - | break; |
| - | |
| - | case SSH_SFTP_QUOTE: |
| - | /* Send any quote commands */ |
| - | { |
| - | const char *cp; |
| - | |
| - | /* |
| - | * Support some of the "FTP" commands |
| - | * |
| - | * 'sshc->quote_item' is already verified to be non-NULL before it |
| - | * switched to this state. |
| - | */ |
| - | char *cmd = sshc->quote_item->data; |
| - | sshc->acceptfail = FALSE; |
| - | |
| - | /* if a command starts with an asterisk, which a legal SFTP command never |
| - | can, the command will be allowed to fail without it causing any |
| - | aborts or cancels etc. It will cause libcurl to act as if the command |
| - | is successful, whatever the server responds. */ |
| - | |
| - | if(cmd[0] == '*') { |
| - | cmd++; |
| - | sshc->acceptfail = TRUE; |
| - | } |
| - | |
| - | if(strcasecompare("pwd", cmd)) { |
| - | /* output debug output if that is requested */ |
| - | char *tmp = aprintf("257 \"%s\" is current directory.\n", |
| - | sshp->path); |
| - | if(!tmp) { |
| - | result = CURLE_OUT_OF_MEMORY; |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->nextstate = SSH_NO_STATE; |
| - | break; |
| - | } |
| - | Curl_debug(data, CURLINFO_HEADER_OUT, (char *)"PWD\n", 4); |
| - | Curl_debug(data, CURLINFO_HEADER_IN, tmp, strlen(tmp)); |
| - | |
| - | /* this sends an FTP-like "header" to the header callback so that the |
| - | current directory can be read very similar to how it is read when |
| - | using ordinary FTP. */ |
| - | result = Curl_client_write(data, CLIENTWRITE_HEADER, tmp, strlen(tmp)); |
| - | free(tmp); |
| - | if(result) { |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->nextstate = SSH_NO_STATE; |
| - | sshc->actualcode = result; |
| - | } |
| - | else |
| - | state(data, SSH_SFTP_NEXT_QUOTE); |
| - | break; |
| - | } |
| - | |
| - | /* |
| - | * the arguments following the command must be separated from the |
| - | * command with a space so we can check for it unconditionally |
| - | */ |
| - | cp = strchr(cmd, ' '); |
| - | if(!cp) { |
| - | failf(data, "Syntax error command '%s', missing parameter", |
| - | cmd); |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->nextstate = SSH_NO_STATE; |
| - | sshc->actualcode = CURLE_QUOTE_ERROR; |
| - | break; |
| - | } |
| - | |
| - | /* |
| - | * also, every command takes at least one argument so we get that |
| - | * first argument right now |
| - | */ |
| - | result = Curl_get_pathname(&cp, &sshc->quote_path1, sshc->homedir); |
| - | if(result) { |
| - | if(result == CURLE_OUT_OF_MEMORY) |
| - | failf(data, "Out of memory"); |
| - | else |
| - | failf(data, "Syntax error: Bad first parameter to '%s'", cmd); |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->nextstate = SSH_NO_STATE; |
| - | sshc->actualcode = result; |
| - | break; |
| - | } |
| - | |
| - | /* |
| - | * SFTP is a binary protocol, so we do not send text commands |
| - | * to the server. Instead, we scan for commands used by |
| - | * OpenSSH's sftp program and call the appropriate libssh2 |
| - | * functions. |
| - | */ |
| - | if(strncasecompare(cmd, "chgrp ", 6) || |
| - | strncasecompare(cmd, "chmod ", 6) || |
| - | strncasecompare(cmd, "chown ", 6) || |
| - | strncasecompare(cmd, "atime ", 6) || |
| - | strncasecompare(cmd, "mtime ", 6)) { |
| - | /* attribute change */ |
| - | |
| - | /* sshc->quote_path1 contains the mode to set */ |
| - | /* get the destination */ |
| - | result = Curl_get_pathname(&cp, &sshc->quote_path2, sshc->homedir); |
| - | if(result) { |
| - | if(result == CURLE_OUT_OF_MEMORY) |
| - | failf(data, "Out of memory"); |
| - | else |
| - | failf(data, "Syntax error in %s: Bad second parameter", cmd); |
| - | Curl_safefree(sshc->quote_path1); |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->nextstate = SSH_NO_STATE; |
| - | sshc->actualcode = result; |
| - | break; |
| - | } |
| - | memset(&sshp->quote_attrs, 0, sizeof(LIBSSH2_SFTP_ATTRIBUTES)); |
| - | state(data, SSH_SFTP_QUOTE_STAT); |
| - | break; |
| - | } |
| - | if(strncasecompare(cmd, "ln ", 3) || |
| - | strncasecompare(cmd, "symlink ", 8)) { |
| - | /* symbolic linking */ |
| - | /* sshc->quote_path1 is the source */ |
| - | /* get the destination */ |
| - | result = Curl_get_pathname(&cp, &sshc->quote_path2, sshc->homedir); |
| - | if(result) { |
| - | if(result == CURLE_OUT_OF_MEMORY) |
| - | failf(data, "Out of memory"); |
| - | else |
| - | failf(data, |
| - | "Syntax error in ln/symlink: Bad second parameter"); |
| - | Curl_safefree(sshc->quote_path1); |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->nextstate = SSH_NO_STATE; |
| - | sshc->actualcode = result; |
| - | break; |
| - | } |
| - | state(data, SSH_SFTP_QUOTE_SYMLINK); |
| - | break; |
| - | } |
| - | else if(strncasecompare(cmd, "mkdir ", 6)) { |
| - | /* create dir */ |
| - | state(data, SSH_SFTP_QUOTE_MKDIR); |
| - | break; |
| - | } |
| - | else if(strncasecompare(cmd, "rename ", 7)) { |
| - | /* rename file */ |
| - | /* first param is the source path */ |
| - | /* second param is the dest. path */ |
| - | result = Curl_get_pathname(&cp, &sshc->quote_path2, sshc->homedir); |
| - | if(result) { |
| - | if(result == CURLE_OUT_OF_MEMORY) |
| - | failf(data, "Out of memory"); |
| - | else |
| - | failf(data, "Syntax error in rename: Bad second parameter"); |
| - | Curl_safefree(sshc->quote_path1); |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->nextstate = SSH_NO_STATE; |
| - | sshc->actualcode = result; |
| - | break; |
| - | } |
| - | state(data, SSH_SFTP_QUOTE_RENAME); |
| + | sshc->actualcode = result; |
| + | state(data, SSH_STOP); |
| break; | |
| } | |
| - | else if(strncasecompare(cmd, "rmdir ", 6)) { |
| - | /* delete dir */ |
| - | state(data, SSH_SFTP_QUOTE_RMDIR); |
| - | break; |
| + | |
| + | if(data->set.quote) { |
| + | infof(data, "Sending quote commands"); |
| + | sshc->quote_item = data->set.quote; |
| + | state(data, SSH_SFTP_QUOTE); |
| } | |
| - | else if(strncasecompare(cmd, "rm ", 3)) { |
| - | state(data, SSH_SFTP_QUOTE_UNLINK); |
| - | break; |
| + | else { |
| + | state(data, SSH_SFTP_GETINFO); |
| } | |
| - | #ifdef HAS_STATVFS_SUPPORT |
| - | else if(strncasecompare(cmd, "statvfs ", 8)) { |
| - | state(data, SSH_SFTP_QUOTE_STATVFS); |
| - | break; |
| + | break; |
| + | |
| + | case SSH_SFTP_POSTQUOTE_INIT: |
| + | if(data->set.postquote) { |
| + | infof(data, "Sending quote commands"); |
| + | sshc->quote_item = data->set.postquote; |
| + | state(data, SSH_SFTP_QUOTE); |
| } | |
| - | #endif |
| + | else { |
| + | state(data, SSH_STOP); |
| + | } |
| + | break; |
| - | failf(data, "Unknown SFTP command"); |
| - | Curl_safefree(sshc->quote_path1); |
| - | Curl_safefree(sshc->quote_path2); |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->nextstate = SSH_NO_STATE; |
| - | sshc->actualcode = CURLE_QUOTE_ERROR; |
| + | case SSH_SFTP_QUOTE: |
| + | /* Send quote commands */ |
| + | result = sftp_quote(data, sshc, sshp); |
| + | if(result) { |
| + | state(data, SSH_SFTP_CLOSE); |
| + | sshc->nextstate = SSH_NO_STATE; |
| + | sshc->actualcode = result; |
| + | } |
| break; | |
| - | } |
| case SSH_SFTP_NEXT_QUOTE: | |
| Curl_safefree(sshc->quote_path1); | |
| @@ -1693,125 +2159,13 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| break; | |
| case SSH_SFTP_QUOTE_STAT: | |
| - | { |
| - | char *cmd = sshc->quote_item->data; |
| - | sshc->acceptfail = FALSE; |
| - | |
| - | /* if a command starts with an asterisk, which a legal SFTP command never |
| - | can, the command will be allowed to fail without it causing any |
| - | aborts or cancels etc. It will cause libcurl to act as if the command |
| - | is successful, whatever the server responds. */ |
| - | |
| - | if(cmd[0] == '*') { |
| - | cmd++; |
| - | sshc->acceptfail = TRUE; |
| - | } |
| - | |
| - | if(!strncasecompare(cmd, "chmod", 5)) { |
| - | /* Since chown and chgrp only set owner OR group but libssh2 wants to |
| - | * set them both at once, we need to obtain the current ownership |
| - | * first. This takes an extra protocol round trip. |
| - | */ |
| - | rc = libssh2_sftp_stat_ex(sshc->sftp_session, sshc->quote_path2, |
| - | curlx_uztoui(strlen(sshc->quote_path2)), |
| - | LIBSSH2_SFTP_STAT, |
| - | &sshp->quote_attrs); |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | break; |
| - | } |
| - | if(rc && !sshc->acceptfail) { /* get those attributes */ |
| - | sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| - | Curl_safefree(sshc->quote_path1); |
| - | Curl_safefree(sshc->quote_path2); |
| - | failf(data, "Attempt to get SFTP stats failed: %s", |
| - | sftp_libssh2_strerror(sftperr)); |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->nextstate = SSH_NO_STATE; |
| - | sshc->actualcode = CURLE_QUOTE_ERROR; |
| - | break; |
| - | } |
| - | } |
| - | |
| - | /* Now set the new attributes... */ |
| - | if(strncasecompare(cmd, "chgrp", 5)) { |
| - | sshp->quote_attrs.gid = strtoul(sshc->quote_path1, NULL, 10); |
| - | sshp->quote_attrs.flags = LIBSSH2_SFTP_ATTR_UIDGID; |
| - | if(sshp->quote_attrs.gid == 0 && !ISDIGIT(sshc->quote_path1[0]) && |
| - | !sshc->acceptfail) { |
| - | Curl_safefree(sshc->quote_path1); |
| - | Curl_safefree(sshc->quote_path2); |
| - | failf(data, "Syntax error: chgrp gid not a number"); |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->nextstate = SSH_NO_STATE; |
| - | sshc->actualcode = CURLE_QUOTE_ERROR; |
| - | break; |
| - | } |
| - | } |
| - | else if(strncasecompare(cmd, "chmod", 5)) { |
| - | sshp->quote_attrs.permissions = strtoul(sshc->quote_path1, NULL, 8); |
| - | sshp->quote_attrs.flags = LIBSSH2_SFTP_ATTR_PERMISSIONS; |
| - | /* permissions are octal */ |
| - | if(sshp->quote_attrs.permissions == 0 && |
| - | !ISDIGIT(sshc->quote_path1[0])) { |
| - | Curl_safefree(sshc->quote_path1); |
| - | Curl_safefree(sshc->quote_path2); |
| - | failf(data, "Syntax error: chmod permissions not a number"); |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->nextstate = SSH_NO_STATE; |
| - | sshc->actualcode = CURLE_QUOTE_ERROR; |
| - | break; |
| - | } |
| - | } |
| - | else if(strncasecompare(cmd, "chown", 5)) { |
| - | sshp->quote_attrs.uid = strtoul(sshc->quote_path1, NULL, 10); |
| - | sshp->quote_attrs.flags = LIBSSH2_SFTP_ATTR_UIDGID; |
| - | if(sshp->quote_attrs.uid == 0 && !ISDIGIT(sshc->quote_path1[0]) && |
| - | !sshc->acceptfail) { |
| - | Curl_safefree(sshc->quote_path1); |
| - | Curl_safefree(sshc->quote_path2); |
| - | failf(data, "Syntax error: chown uid not a number"); |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->nextstate = SSH_NO_STATE; |
| - | sshc->actualcode = CURLE_QUOTE_ERROR; |
| - | break; |
| - | } |
| - | } |
| - | else if(strncasecompare(cmd, "atime", 5) || |
| - | strncasecompare(cmd, "mtime", 5)) { |
| - | time_t date = Curl_getdate_capped(sshc->quote_path1); |
| - | bool fail = FALSE; |
| - | |
| - | if(date == -1) { |
| - | failf(data, "incorrect date format for %.*s", 5, cmd); |
| - | fail = TRUE; |
| - | } |
| - | #if SIZEOF_TIME_T > SIZEOF_LONG |
| - | if(date > 0xffffffff) { |
| - | /* if 'long' cannot old >32-bit, this date cannot be sent */ |
| - | failf(data, "date overflow"); |
| - | fail = TRUE; |
| - | } |
| - | #endif |
| - | if(fail) { |
| - | Curl_safefree(sshc->quote_path1); |
| - | Curl_safefree(sshc->quote_path2); |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->nextstate = SSH_NO_STATE; |
| - | sshc->actualcode = CURLE_QUOTE_ERROR; |
| - | break; |
| - | } |
| - | if(strncasecompare(cmd, "atime", 5)) |
| - | sshp->quote_attrs.atime = (unsigned long)date; |
| - | else /* mtime */ |
| - | sshp->quote_attrs.mtime = (unsigned long)date; |
| - | |
| - | sshp->quote_attrs.flags = LIBSSH2_SFTP_ATTR_ACMODTIME; |
| + | result = sftp_quote_stat(data, sshc, sshp, block); |
| + | if(result) { |
| + | state(data, SSH_SFTP_CLOSE); |
| + | sshc->nextstate = SSH_NO_STATE; |
| + | sshc->actualcode = result; |
| } | |
| - | |
| - | /* Now send the completed structure... */ |
| - | state(data, SSH_SFTP_QUOTE_SETSTAT); |
| break; | |
| - | } |
| case SSH_SFTP_QUOTE_SETSTAT: | |
| rc = libssh2_sftp_stat_ex(sshc->sftp_session, sshc->quote_path2, | |
| @@ -1822,7 +2176,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| break; | |
| } | |
| if(rc && !sshc->acceptfail) { | |
| - | sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| + | unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| Curl_safefree(sshc->quote_path1); | |
| Curl_safefree(sshc->quote_path2); | |
| failf(data, "Attempt to set SFTP stats failed: %s", | |
| @@ -1845,7 +2199,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| break; | |
| } | |
| if(rc && !sshc->acceptfail) { | |
| - | sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| + | unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| Curl_safefree(sshc->quote_path1); | |
| Curl_safefree(sshc->quote_path2); | |
| failf(data, "symlink command failed: %s", | |
| @@ -1866,7 +2220,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| break; | |
| } | |
| if(rc && !sshc->acceptfail) { | |
| - | sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| + | unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| Curl_safefree(sshc->quote_path1); | |
| failf(data, "mkdir command failed: %s", | |
| sftp_libssh2_strerror(sftperr)); | |
| @@ -1891,7 +2245,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| break; | |
| } | |
| if(rc && !sshc->acceptfail) { | |
| - | sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| + | unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| Curl_safefree(sshc->quote_path1); | |
| Curl_safefree(sshc->quote_path2); | |
| failf(data, "rename command failed: %s", | |
| @@ -1911,7 +2265,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| break; | |
| } | |
| if(rc && !sshc->acceptfail) { | |
| - | sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| + | unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| Curl_safefree(sshc->quote_path1); | |
| failf(data, "rmdir command failed: %s", | |
| sftp_libssh2_strerror(sftperr)); | |
| @@ -1930,7 +2284,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| break; | |
| } | |
| if(rc && !sshc->acceptfail) { | |
| - | sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| + | unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| Curl_safefree(sshc->quote_path1); | |
| failf(data, "rm command failed: %s", sftp_libssh2_strerror(sftperr)); | |
| state(data, SSH_SFTP_CLOSE); | |
| @@ -1953,7 +2307,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| break; | |
| } | |
| if(rc && !sshc->acceptfail) { | |
| - | sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| + | unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| Curl_safefree(sshc->quote_path1); | |
| failf(data, "statvfs command failed: %s", | |
| sftp_libssh2_strerror(sftperr)); | |
| @@ -1963,11 +2317,11 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| break; | |
| } | |
| else if(rc == 0) { | |
| - | #ifdef _MSC_VER |
| - | #define CURL_LIBSSH2_VFS_SIZE_MASK "I64u" |
| - | #else |
| - | #define CURL_LIBSSH2_VFS_SIZE_MASK "llu" |
| - | #endif |
| + | #ifdef _MSC_VER |
| + | #define CURL_LIBSSH2_VFS_SIZE_MASK "I64u" |
| + | #else |
| + | #define CURL_LIBSSH2_VFS_SIZE_MASK "llu" |
| + | #endif |
| char *tmp = aprintf("statvfs:\n" | |
| "f_bsize: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n" | |
| "f_frsize: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n" | |
| @@ -2046,188 +2400,13 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| break; | |
| case SSH_SFTP_UPLOAD_INIT: | |
| - | { |
| - | unsigned long flags; |
| - | /* |
| - | * NOTE!!! libssh2 requires that the destination path is a full path |
| - | * that includes the destination file and name OR ends in a "/" |
| - | * If this is not done the destination file will be named the |
| - | * same name as the last directory in the path. |
| - | */ |
| - | |
| - | if(data->state.resume_from) { |
| - | LIBSSH2_SFTP_ATTRIBUTES attrs; |
| - | if(data->state.resume_from < 0) { |
| - | rc = libssh2_sftp_stat_ex(sshc->sftp_session, sshp->path, |
| - | curlx_uztoui(strlen(sshp->path)), |
| - | LIBSSH2_SFTP_STAT, &attrs); |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | break; |
| - | } |
| - | if(rc) { |
| - | data->state.resume_from = 0; |
| - | } |
| - | else { |
| - | curl_off_t size = attrs.filesize; |
| - | if(size < 0) { |
| - | failf(data, "Bad file size (%" FMT_OFF_T ")", size); |
| - | return CURLE_BAD_DOWNLOAD_RESUME; |
| - | } |
| - | data->state.resume_from = attrs.filesize; |
| - | } |
| - | } |
| - | } |
| - | |
| - | if(data->set.remote_append) |
| - | /* Try to open for append, but create if nonexisting */ |
| - | flags = LIBSSH2_FXF_WRITE|LIBSSH2_FXF_CREAT|LIBSSH2_FXF_APPEND; |
| - | else if(data->state.resume_from > 0) |
| - | /* If we have restart position then open for append */ |
| - | flags = LIBSSH2_FXF_WRITE|LIBSSH2_FXF_APPEND; |
| - | else |
| - | /* Clear file before writing (normal behavior) */ |
| - | flags = LIBSSH2_FXF_WRITE|LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC; |
| - | |
| - | sshc->sftp_handle = |
| - | libssh2_sftp_open_ex(sshc->sftp_session, sshp->path, |
| - | curlx_uztoui(strlen(sshp->path)), |
| - | flags, (long)data->set.new_file_perms, |
| - | LIBSSH2_SFTP_OPENFILE); |
| - | |
| - | if(!sshc->sftp_handle) { |
| - | rc = libssh2_session_last_errno(sshc->ssh_session); |
| - | |
| - | if(LIBSSH2_ERROR_EAGAIN == rc) |
| - | break; |
| - | |
| - | if(LIBSSH2_ERROR_SFTP_PROTOCOL == rc) |
| - | /* only when there was an SFTP protocol error can we extract |
| - | the sftp error! */ |
| - | sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| - | else |
| - | sftperr = LIBSSH2_FX_OK; /* not an sftp error at all */ |
| - | |
| - | if(sshc->secondCreateDirs) { |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->actualcode = sftperr != LIBSSH2_FX_OK ? |
| - | sftp_libssh2_error_to_CURLE(sftperr) : CURLE_SSH; |
| - | failf(data, "Creating the dir/file failed: %s", |
| - | sftp_libssh2_strerror(sftperr)); |
| - | break; |
| - | } |
| - | if(((sftperr == LIBSSH2_FX_NO_SUCH_FILE) || |
| - | (sftperr == LIBSSH2_FX_FAILURE) || |
| - | (sftperr == LIBSSH2_FX_NO_SUCH_PATH)) && |
| - | (data->set.ftp_create_missing_dirs && |
| - | (strlen(sshp->path) > 1))) { |
| - | /* try to create the path remotely */ |
| - | rc = 0; /* clear rc and continue */ |
| - | sshc->secondCreateDirs = 1; |
| - | state(data, SSH_SFTP_CREATE_DIRS_INIT); |
| - | break; |
| - | } |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->actualcode = sftperr != LIBSSH2_FX_OK ? |
| - | sftp_libssh2_error_to_CURLE(sftperr) : CURLE_SSH; |
| - | if(!sshc->actualcode) { |
| - | /* Sometimes, for some reason libssh2_sftp_last_error() returns zero |
| - | even though libssh2_sftp_open() failed previously! We need to |
| - | work around that! */ |
| - | sshc->actualcode = CURLE_SSH; |
| - | sftperr = LIBSSH2_FX_OK; |
| - | } |
| - | failf(data, "Upload failed: %s (%lu/%d)", |
| - | sftperr != LIBSSH2_FX_OK ? |
| - | sftp_libssh2_strerror(sftperr) : "ssh error", |
| - | sftperr, rc); |
| - | break; |
| - | } |
| - | |
| - | /* If we have a restart point then we need to seek to the correct |
| - | position. */ |
| - | if(data->state.resume_from > 0) { |
| - | /* Let's read off the proper amount of bytes from the input. */ |
| - | if(data->set.seek_func) { |
| - | Curl_set_in_callback(data, TRUE); |
| - | seekerr = data->set.seek_func(data->set.seek_client, |
| - | data->state.resume_from, SEEK_SET); |
| - | Curl_set_in_callback(data, FALSE); |
| - | } |
| - | |
| - | if(seekerr != CURL_SEEKFUNC_OK) { |
| - | curl_off_t passed = 0; |
| - | |
| - | if(seekerr != CURL_SEEKFUNC_CANTSEEK) { |
| - | failf(data, "Could not seek stream"); |
| - | return CURLE_FTP_COULDNT_USE_REST; |
| - | } |
| - | /* seekerr == CURL_SEEKFUNC_CANTSEEK (cannot seek to offset) */ |
| - | do { |
| - | char scratch[4*1024]; |
| - | size_t readthisamountnow = |
| - | (data->state.resume_from - passed > |
| - | (curl_off_t)sizeof(scratch)) ? |
| - | sizeof(scratch) : curlx_sotouz(data->state.resume_from - passed); |
| - | |
| - | size_t actuallyread; |
| - | Curl_set_in_callback(data, TRUE); |
| - | actuallyread = data->state.fread_func(scratch, 1, |
| - | readthisamountnow, |
| - | data->state.in); |
| - | Curl_set_in_callback(data, FALSE); |
| - | |
| - | passed += actuallyread; |
| - | if((actuallyread == 0) || (actuallyread > readthisamountnow)) { |
| - | /* this checks for greater-than only to make sure that the |
| - | CURL_READFUNC_ABORT return code still aborts */ |
| - | failf(data, "Failed to read data"); |
| - | return CURLE_FTP_COULDNT_USE_REST; |
| - | } |
| - | } while(passed < data->state.resume_from); |
| - | } |
| - | |
| - | /* now, decrease the size of the read */ |
| - | if(data->state.infilesize > 0) { |
| - | data->state.infilesize -= data->state.resume_from; |
| - | data->req.size = data->state.infilesize; |
| - | Curl_pgrsSetUploadSize(data, data->state.infilesize); |
| - | } |
| - | |
| - | SFTP_SEEK(sshc->sftp_handle, data->state.resume_from); |
| - | } |
| - | if(data->state.infilesize > 0) { |
| - | data->req.size = data->state.infilesize; |
| - | Curl_pgrsSetUploadSize(data, data->state.infilesize); |
| - | } |
| - | /* upload data */ |
| - | Curl_xfer_setup1(data, CURL_XFER_SEND, -1, FALSE); |
| - | |
| - | /* not set by Curl_xfer_setup to preserve keepon bits */ |
| - | conn->sockfd = conn->writesockfd; |
| - | |
| + | result = sftp_upload_init(data, sshc, sshp, block); |
| if(result) { | |
| state(data, SSH_SFTP_CLOSE); | |
| + | sshc->nextstate = SSH_NO_STATE; |
| sshc->actualcode = result; | |
| } | |
| - | else { |
| - | /* store this original bitmask setup to use later on if we cannot |
| - | figure out a "real" bitmask */ |
| - | sshc->orig_waitfor = data->req.keepon; |
| - | |
| - | /* we want to use the _sending_ function even when the socket turns |
| - | out readable as the underlying libssh2 sftp send function will deal |
| - | with both accordingly */ |
| - | data->state.select_bits = CURL_CSELECT_OUT; |
| - | |
| - | /* since we do not really wait for anything at this point, we want the |
| - | state machine to move on as soon as possible so we set a very short |
| - | timeout here */ |
| - | Curl_expire(data, 0, EXPIRE_RUN_NOW); |
| - | |
| - | state(data, SSH_STOP); |
| - | } |
| break; | |
| - | } |
| case SSH_SFTP_CREATE_DIRS_INIT: | |
| if(strlen(sshp->path) > 1) { | |
| @@ -2267,7 +2446,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| * permission was denied (creation might succeed further down the | |
| * path) - retry on unspecific FAILURE also | |
| */ | |
| - | sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| + | unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| if((sftperr != LIBSSH2_FX_FILE_ALREADY_EXISTS) && | |
| (sftperr != LIBSSH2_FX_FAILURE) && | |
| (sftperr != LIBSSH2_FX_PERMISSION_DENIED)) { | |
| @@ -2292,12 +2471,12 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| * This is a directory that we are trying to get, so produce a directory | |
| * listing | |
| */ | |
| - | sshc->sftp_handle = libssh2_sftp_open_ex(sshc->sftp_session, |
| - | sshp->path, |
| - | curlx_uztoui( |
| - | strlen(sshp->path)), |
| - | 0, 0, LIBSSH2_SFTP_OPENDIR); |
| + | sshc->sftp_handle = |
| + | libssh2_sftp_open_ex(sshc->sftp_session, sshp->path, |
| + | curlx_uztoui(strlen(sshp->path)), |
| + | 0, 0, LIBSSH2_SFTP_OPENDIR); |
| if(!sshc->sftp_handle) { | |
| + | unsigned long sftperr; |
| if(libssh2_session_last_errno(sshc->ssh_session) == | |
| LIBSSH2_ERROR_EAGAIN) { | |
| rc = LIBSSH2_ERROR_EAGAIN; | |
| @@ -2329,75 +2508,13 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| break; | |
| case SSH_SFTP_READDIR: | |
| - | rc = libssh2_sftp_readdir_ex(sshc->sftp_handle, |
| - | sshp->readdir_filename, |
| - | PATH_MAX, |
| - | sshp->readdir_longentry, |
| - | PATH_MAX, |
| - | &sshp->readdir_attrs); |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | break; |
| - | } |
| - | if(rc > 0) { |
| - | readdir_len = (size_t) rc; |
| - | sshp->readdir_filename[readdir_len] = '\0'; |
| - | |
| - | if(data->set.list_only) { |
| - | result = Curl_client_write(data, CLIENTWRITE_BODY, |
| - | sshp->readdir_filename, |
| - | readdir_len); |
| - | if(!result) |
| - | result = Curl_client_write(data, CLIENTWRITE_BODY, |
| - | (char *)"\n", 1); |
| - | if(result) { |
| - | state(data, SSH_STOP); |
| - | break; |
| - | } |
| - | |
| - | } |
| - | else { |
| - | result = Curl_dyn_add(&sshp->readdir, sshp->readdir_longentry); |
| - | |
| - | if(!result) { |
| - | if((sshp->readdir_attrs.flags & LIBSSH2_SFTP_ATTR_PERMISSIONS) && |
| - | ((sshp->readdir_attrs.permissions & LIBSSH2_SFTP_S_IFMT) == |
| - | LIBSSH2_SFTP_S_IFLNK)) { |
| - | Curl_dyn_init(&sshp->readdir_link, PATH_MAX); |
| - | result = Curl_dyn_addf(&sshp->readdir_link, "%s%s", sshp->path, |
| - | sshp->readdir_filename); |
| - | state(data, SSH_SFTP_READDIR_LINK); |
| - | if(!result) |
| - | break; |
| - | } |
| - | else { |
| - | state(data, SSH_SFTP_READDIR_BOTTOM); |
| - | break; |
| - | } |
| - | } |
| - | sshc->actualcode = result; |
| - | state(data, SSH_SFTP_CLOSE); |
| - | break; |
| - | } |
| - | } |
| - | else if(rc == 0) { |
| - | Curl_safefree(sshp->readdir_filename); |
| - | Curl_safefree(sshp->readdir_longentry); |
| - | state(data, SSH_SFTP_READDIR_DONE); |
| - | break; |
| - | } |
| - | else if(rc < 0) { |
| - | sftperr = libssh2_sftp_last_error(sshc->sftp_session); |
| - | result = sftp_libssh2_error_to_CURLE(sftperr); |
| - | sshc->actualcode = result ? result : CURLE_SSH; |
| - | failf(data, "Could not open remote file for reading: %s :: %d", |
| - | sftp_libssh2_strerror(sftperr), |
| - | libssh2_session_last_errno(sshc->ssh_session)); |
| - | Curl_safefree(sshp->readdir_filename); |
| - | Curl_safefree(sshp->readdir_longentry); |
| + | result = sftp_readdir(data, sshc, sshp, block); |
| + | if(result) { |
| + | sshc->actualcode = result; |
| state(data, SSH_SFTP_CLOSE); | |
| - | break; |
| } | |
| break; | |
| + | break; |
| case SSH_SFTP_READDIR_LINK: | |
| rc = | |
| @@ -2468,6 +2585,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| LIBSSH2_FXF_READ, (long)data->set.new_file_perms, | |
| LIBSSH2_SFTP_OPENFILE); | |
| if(!sshc->sftp_handle) { | |
| + | unsigned long sftperr; |
| if(libssh2_session_last_errno(sshc->ssh_session) == | |
| LIBSSH2_ERROR_EAGAIN) { | |
| rc = LIBSSH2_ERROR_EAGAIN; | |
| @@ -2485,139 +2603,13 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) | |
| break; | |
| case SSH_SFTP_DOWNLOAD_STAT: | |
| - | { |
| - | LIBSSH2_SFTP_ATTRIBUTES attrs; |
| - | |
| - | rc = libssh2_sftp_stat_ex(sshc->sftp_session, sshp->path, |
| - | curlx_uztoui(strlen(sshp->path)), |
| - | LIBSSH2_SFTP_STAT, &attrs); |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | break; |
| - | } |
| - | if(rc || |
| - | !(attrs.flags & LIBSSH2_SFTP_ATTR_SIZE) || |
| - | (attrs.filesize == 0)) { |
| - | /* |
| - | * libssh2_sftp_open() did not return an error, so maybe the server |
| - | * just does not support stat() |
| - | * OR the server does not return a file size with a stat() |
| - | * OR file size is 0 |
| - | */ |
| - | data->req.size = -1; |
| - | data->req.maxdownload = -1; |
| - | Curl_pgrsSetDownloadSize(data, -1); |
| - | } |
| - | else { |
| - | curl_off_t size = attrs.filesize; |
| - | |
| - | if(size < 0) { |
| - | failf(data, "Bad file size (%" FMT_OFF_T ")", size); |
| - | return CURLE_BAD_DOWNLOAD_RESUME; |
| - | } |
| - | if(data->state.use_range) { |
| - | curl_off_t from, to; |
| - | char *ptr; |
| - | char *ptr2; |
| - | CURLofft to_t; |
| - | CURLofft from_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) |
| - | return CURLE_RANGE_ERROR; |
| - | if((to_t == CURL_OFFT_INVAL) /* no "to" value given */ |
| - | || (to >= size)) { |
| - | to = size - 1; |
| - | } |
| - | if(from_t) { |
| - | /* from is relative to end of file */ |
| - | from = size - to; |
| - | to = size - 1; |
| - | } |
| - | if(from > size) { |
| - | failf(data, "Offset (%" FMT_OFF_T ") was beyond file size (%" |
| - | FMT_OFF_T ")", from, (curl_off_t)attrs.filesize); |
| - | return CURLE_BAD_DOWNLOAD_RESUME; |
| - | } |
| - | if(from > to) { |
| - | from = to; |
| - | size = 0; |
| - | } |
| - | else { |
| - | if((to - from) == CURL_OFF_T_MAX) |
| - | return CURLE_RANGE_ERROR; |
| - | size = to - from + 1; |
| - | } |
| - | |
| - | SFTP_SEEK(sshc->sftp_handle, from); |
| - | } |
| - | data->req.size = size; |
| - | data->req.maxdownload = size; |
| - | Curl_pgrsSetDownloadSize(data, size); |
| - | } |
| - | |
| - | /* We can resume if we can seek to the resume position */ |
| - | if(data->state.resume_from) { |
| - | if(data->state.resume_from < 0) { |
| - | /* We are supposed to download the last abs(from) bytes */ |
| - | if((curl_off_t)attrs.filesize < -data->state.resume_from) { |
| - | failf(data, "Offset (%" FMT_OFF_T ") was beyond file size (%" |
| - | FMT_OFF_T ")", |
| - | data->state.resume_from, (curl_off_t)attrs.filesize); |
| - | return CURLE_BAD_DOWNLOAD_RESUME; |
| - | } |
| - | /* download from where? */ |
| - | data->state.resume_from += attrs.filesize; |
| - | } |
| - | else { |
| - | if((curl_off_t)attrs.filesize < data->state.resume_from) { |
| - | failf(data, "Offset (%" FMT_OFF_T |
| - | ") was beyond file size (%" FMT_OFF_T ")", |
| - | data->state.resume_from, (curl_off_t)attrs.filesize); |
| - | return CURLE_BAD_DOWNLOAD_RESUME; |
| - | } |
| - | } |
| - | /* Now store the number of bytes we are expected to download */ |
| - | data->req.size = attrs.filesize - data->state.resume_from; |
| - | data->req.maxdownload = attrs.filesize - data->state.resume_from; |
| - | Curl_pgrsSetDownloadSize(data, |
| - | attrs.filesize - data->state.resume_from); |
| - | SFTP_SEEK(sshc->sftp_handle, data->state.resume_from); |
| + | result = sftp_download_stat(data, sshc, sshp, block); |
| + | if(result) { |
| + | state(data, SSH_SFTP_CLOSE); |
| + | sshc->nextstate = SSH_NO_STATE; |
| + | sshc->actualcode = result; |
| } | |
| - | } |
| - | |
| - | /* Setup the actual download */ |
| - | if(data->req.size == 0) { |
| - | /* no data to transfer */ |
| - | Curl_xfer_setup_nop(data); |
| - | infof(data, "File already completely downloaded"); |
| - | state(data, SSH_STOP); |
| break; | |
| - | } |
| - | Curl_xfer_setup1(data, CURL_XFER_RECV, data->req.size, FALSE); |
| - | |
| - | /* not set by Curl_xfer_setup to preserve keepon bits */ |
| - | conn->writesockfd = conn->sockfd; |
| - | |
| - | /* we want to use the _receiving_ function even when the socket turns |
| - | out writableable as the underlying libssh2 recv function will deal |
| - | with both accordingly */ |
| - | data->state.select_bits = CURL_CSELECT_IN; |
| - | |
| - | if(result) { |
| - | /* this should never occur; the close state should be entered |
| - | at the time the error occurs */ |
| - | state(data, SSH_SFTP_CLOSE); |
| - | sshc->actualcode = result; |
| - | } |
| - | else { |
| - | state(data, SSH_STOP); |
| - | } |
| - | break; |
| case SSH_SFTP_CLOSE: | |
| if(sshc->sftp_handle) { | |
| @@ -3101,7 +3093,7 @@ static CURLcode ssh_multi_statemach(struct Curl_easy *data, bool *done) | |
| bool block; /* we store the status and use that to provide a ssh_getsock() | |
| implementation */ | |
| do { | |
| - | result = ssh_statemach_act(data, &block); |
| + | result = ssh_statemachine(data, &block); |
| *done = (sshc->state == SSH_STOP) ? TRUE : FALSE; | |
| /* if there is no error, it is not done and it did not EWOULDBLOCK, then | |
| try again */ | |
| @@ -3124,7 +3116,7 @@ static CURLcode ssh_block_statemach(struct Curl_easy *data, | |
| timediff_t left = 1000; | |
| struct curltime now = Curl_now(); | |
| - | result = ssh_statemach_act(data, &block); |
| + | result = ssh_statemachine(data, &block); |
| if(result) | |
| break; | |