libssh2: remove the 'actualcode' struct field
—
$ git checkout -f 74cfba6a6729b8db6f06f7dcb73bae0af07101cb
Previous HEAD position was f5a4d3c916 formdata: split up FormAdd
HEAD is now at 74cfba6a67 libssh2: remove the 'actualcode' struct field
$ 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/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curlx/.deps/
Removing lib/curlx/.dirstamp
Removing lib/curlx/curl-base64.o
Removing lib/curlx/curl-dynbuf.o
Removing lib/curlx/curl-multibyte.o
Removing lib/curlx/curl-nonblock.o
Removing lib/curlx/curl-strparse.o
Removing lib/curlx/curl-timediff.o
Removing lib/curlx/curl-timeval.o
Removing lib/curlx/curl-version_win32.o
Removing lib/curlx/curl-warnless.o
Removing lib/curlx/libcurl_la-base64.lo
Removing lib/curlx/libcurl_la-base64.o
Removing lib/curlx/libcurl_la-dynbuf.lo
Removing lib/curlx/libcurl_la-dynbuf.o
Removing lib/curlx/libcurl_la-inet_pton.lo
Removing lib/curlx/libcurl_la-inet_pton.o
Removing lib/curlx/libcurl_la-multibyte.lo
Removing lib/curlx/libcurl_la-multibyte.o
Removing lib/curlx/libcurl_la-nonblock.lo
Removing lib/curlx/libcurl_la-nonblock.o
Removing lib/curlx/libcurl_la-strparse.lo
Removing lib/curlx/libcurl_la-strparse.o
Removing lib/curlx/libcurl_la-timediff.lo
Removing lib/curlx/libcurl_la-timediff.o
Removing lib/curlx/libcurl_la-timeval.lo
Removing lib/curlx/libcurl_la-timeval.o
Removing lib/curlx/libcurl_la-version_win32.lo
Removing lib/curlx/libcurl_la-version_win32.o
Removing lib/curlx/libcurl_la-warnless.lo
Removing lib/curlx/libcurl_la-warnless.o
Removing lib/curlx/libcurl_la-winapi.lo
Removing lib/curlx/libcurl_la-winapi.o
Removing lib/curlx/libcurltool_la-base64.lo
Removing lib/curlx/libcurltool_la-base64.o
Removing lib/curlx/libcurltool_la-dynbuf.lo
Removing lib/curlx/libcurltool_la-dynbuf.o
Removing lib/curlx/libcurltool_la-multibyte.lo
Removing lib/curlx/libcurltool_la-multibyte.o
Removing lib/curlx/libcurltool_la-nonblock.lo
Removing lib/curlx/libcurltool_la-nonblock.o
Removing lib/curlx/libcurltool_la-strparse.lo
Removing lib/curlx/libcurltool_la-strparse.o
Removing lib/curlx/libcurltool_la-timediff.lo
Removing lib/curlx/libcurltool_la-timediff.o
Removing lib/curlx/libcurltool_la-timeval.lo
Removing lib/curlx/libcurltool_la-timeval.o
Removing lib/curlx/libcurltool_la-version_win32.lo
Removing lib/curlx/libcurltool_la-version_win32.o
Removing lib/curlx/libcurltool_la-warnless.lo
Removing lib/curlx/libcurltool_la-warnless.o
Removing lib/curlx/libcurlu_la-base64.lo
Removing lib/curlx/libcurlu_la-base64.o
Removing lib/curlx/libcurlu_la-dynbuf.lo
Removing lib/curlx/libcurlu_la-dynbuf.o
Removing lib/curlx/libcurlu_la-inet_pton.lo
Removing lib/curlx/libcurlu_la-inet_pton.o
Removing lib/curlx/libcurlu_la-multibyte.lo
Removing lib/curlx/libcurlu_la-multibyte.o
Removing lib/curlx/libcurlu_la-nonblock.lo
Removing lib/curlx/libcurlu_la-nonblock.o
Removing lib/curlx/libcurlu_la-strparse.lo
Removing lib/curlx/libcurlu_la-strparse.o
Removing lib/curlx/libcurlu_la-timediff.lo
Removing lib/curlx/libcurlu_la-timediff.o
Removing lib/curlx/libcurlu_la-timeval.lo
Removing lib/curlx/libcurlu_la-timeval.o
Removing lib/curlx/libcurlu_la-version_win32.lo
Removing lib/curlx/libcurlu_la-version_win32.o
Removing lib/curlx/libcurlu_la-warnless.lo
Removing lib/curlx/libcurlu_la-warnless.o
Removing lib/curlx/libcurlu_la-winapi.lo
Removing lib/curlx/libcurlu_la-winapi.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-base.lo
Removing lib/libcurl_la-asyn-base.o
Removing lib/libcurl_la-asyn-thrdd.lo
Removing lib/libcurl_la-asyn-thrdd.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-cshutdn.lo
Removing lib/libcurl_la-cshutdn.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_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sha512_256.lo
Removing lib/libcurl_la-curl_sha512_256.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-curl_trc.lo
Removing lib/libcurl_la-curl_trc.o
Removing lib/libcurl_la-cw-out.lo
Removing lib/libcurl_la-cw-out.o
Removing lib/libcurl_la-cw-pause.lo
Removing lib/libcurl_la-cw-pause.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-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-fake_addrinfo.lo
Removing lib/libcurl_la-fake_addrinfo.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-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-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http1.lo
Removing lib/libcurl_la-http1.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-httpsrr.lo
Removing lib/libcurl_la-httpsrr.o
Removing lib/libcurl_la-idn.lo
Removing lib/libcurl_la-idn.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-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-multi_ev.lo
Removing lib/libcurl_la-multi_ev.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-request.lo
Removing lib/libcurl_la-request.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strequal.lo
Removing lib/libcurl_la-strequal.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-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-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-uint-bset.lo
Removing lib/libcurl_la-uint-bset.o
Removing lib/libcurl_la-uint-hash.lo
Removing lib/libcurl_la-uint-hash.o
Removing lib/libcurl_la-uint-spbset.lo
Removing lib/libcurl_la-uint-spbset.o
Removing lib/libcurl_la-uint-table.lo
Removing lib/libcurl_la-uint-table.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-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/libcurlu.la
Removing lib/libcurlu_la-altsvc.lo
Removing lib/libcurlu_la-altsvc.o
Removing lib/libcurlu_la-amigaos.lo
Removing lib/libcurlu_la-amigaos.o
Removing lib/libcurlu_la-asyn-ares.lo
Removing lib/libcurlu_la-asyn-ares.o
Removing lib/libcurlu_la-asyn-base.lo
Removing lib/libcurlu_la-asyn-base.o
Removing lib/libcurlu_la-asyn-thrdd.lo
Removing lib/libcurlu_la-asyn-thrdd.o
Removing lib/libcurlu_la-bufq.lo
Removing lib/libcurlu_la-bufq.o
Removing lib/libcurlu_la-bufref.lo
Removing lib/libcurlu_la-bufref.o
Removing lib/libcurlu_la-cf-h1-proxy.lo
Removing lib/libcurlu_la-cf-h1-proxy.o
Removing lib/libcurlu_la-cf-h2-proxy.lo
Removing lib/libcurlu_la-cf-h2-proxy.o
Removing lib/libcurlu_la-cf-haproxy.lo
Removing lib/libcurlu_la-cf-haproxy.o
Removing lib/libcurlu_la-cf-https-connect.lo
Removing lib/libcurlu_la-cf-https-connect.o
Removing lib/libcurlu_la-cf-socket.lo
Removing lib/libcurlu_la-cf-socket.o
Removing lib/libcurlu_la-cfilters.lo
Removing lib/libcurlu_la-cfilters.o
Removing lib/libcurlu_la-conncache.lo
Removing lib/libcurlu_la-conncache.o
Removing lib/libcurlu_la-connect.lo
Removing lib/libcurlu_la-connect.o
Removing lib/libcurlu_la-content_encoding.lo
Removing lib/libcurlu_la-content_encoding.o
Removing lib/libcurlu_la-cookie.lo
Removing lib/libcurlu_la-cookie.o
Removing lib/libcurlu_la-cshutdn.lo
Removing lib/libcurlu_la-cshutdn.o
Removing lib/libcurlu_la-curl_addrinfo.lo
Removing lib/libcurlu_la-curl_addrinfo.o
Removing lib/libcurlu_la-curl_des.lo
Removing lib/libcurlu_la-curl_des.o
Removing lib/libcurlu_la-curl_endian.lo
Removing lib/libcurlu_la-curl_endian.o
Removing lib/libcurlu_la-curl_fnmatch.lo
Removing lib/libcurlu_la-curl_fnmatch.o
Removing lib/libcurlu_la-curl_get_line.lo
Removing lib/libcurlu_la-curl_get_line.o
Removing lib/libcurlu_la-curl_gethostname.lo
Removing lib/libcurlu_la-curl_gethostname.o
Removing lib/libcurlu_la-curl_gssapi.lo
Removing lib/libcurlu_la-curl_gssapi.o
Removing lib/libcurlu_la-curl_memrchr.lo
Removing lib/libcurlu_la-curl_memrchr.o
Removing lib/libcurlu_la-curl_ntlm_core.lo
Removing lib/libcurlu_la-curl_ntlm_core.o
Removing lib/libcurlu_la-curl_range.lo
Removing lib/libcurlu_la-curl_range.o
Removing lib/libcurlu_la-curl_rtmp.lo
Removing lib/libcurlu_la-curl_rtmp.o
Removing lib/libcurlu_la-curl_sasl.lo
Removing lib/libcurlu_la-curl_sasl.o
Removing lib/libcurlu_la-curl_sha512_256.lo
Removing lib/libcurlu_la-curl_sha512_256.o
Removing lib/libcurlu_la-curl_sspi.lo
Removing lib/libcurlu_la-curl_sspi.o
Removing lib/libcurlu_la-curl_threads.lo
Removing lib/libcurlu_la-curl_threads.o
Removing lib/libcurlu_la-curl_trc.lo
Removing lib/libcurlu_la-curl_trc.o
Removing lib/libcurlu_la-cw-out.lo
Removing lib/libcurlu_la-cw-out.o
Removing lib/libcurlu_la-cw-pause.lo
Removing lib/libcurlu_la-cw-pause.o
Removing lib/libcurlu_la-dict.lo
Removing lib/libcurlu_la-dict.o
Removing lib/libcurlu_la-doh.lo
Removing lib/libcurlu_la-doh.o
Removing lib/libcurlu_la-dynhds.lo
Removing lib/libcurlu_la-dynhds.o
Removing lib/libcurlu_la-easy.lo
Removing lib/libcurlu_la-easy.o
Removing lib/libcurlu_la-easygetopt.lo
Removing lib/libcurlu_la-easygetopt.o
Removing lib/libcurlu_la-easyoptions.lo
Removing lib/libcurlu_la-easyoptions.o
Removing lib/libcurlu_la-escape.lo
Removing lib/libcurlu_la-escape.o
Removing lib/libcurlu_la-fake_addrinfo.lo
Removing lib/libcurlu_la-fake_addrinfo.o
Removing lib/libcurlu_la-file.lo
Removing lib/libcurlu_la-file.o
Removing lib/libcurlu_la-fileinfo.lo
Removing lib/libcurlu_la-fileinfo.o
Removing lib/libcurlu_la-fopen.lo
Removing lib/libcurlu_la-fopen.o
Removing lib/libcurlu_la-formdata.lo
Removing lib/libcurlu_la-formdata.o
Removing lib/libcurlu_la-ftp.lo
Removing lib/libcurlu_la-ftp.o
Removing lib/libcurlu_la-ftplistparser.lo
Removing lib/libcurlu_la-ftplistparser.o
Removing lib/libcurlu_la-getenv.lo
Removing lib/libcurlu_la-getenv.o
Removing lib/libcurlu_la-getinfo.lo
Removing lib/libcurlu_la-getinfo.o
Removing lib/libcurlu_la-gopher.lo
Removing lib/libcurlu_la-gopher.o
Removing lib/libcurlu_la-hash.lo
Removing lib/libcurlu_la-hash.o
Removing lib/libcurlu_la-headers.lo
Removing lib/libcurlu_la-headers.o
Removing lib/libcurlu_la-hmac.lo
Removing lib/libcurlu_la-hmac.o
Removing lib/libcurlu_la-hostip.lo
Removing lib/libcurlu_la-hostip.o
Removing lib/libcurlu_la-hostip4.lo
Removing lib/libcurlu_la-hostip4.o
Removing lib/libcurlu_la-hostip6.lo
Removing lib/libcurlu_la-hostip6.o
Removing lib/libcurlu_la-hsts.lo
Removing lib/libcurlu_la-hsts.o
Removing lib/libcurlu_la-http.lo
Removing lib/libcurlu_la-http.o
Removing lib/libcurlu_la-http1.lo
Removing lib/libcurlu_la-http1.o
Removing lib/libcurlu_la-http2.lo
Removing lib/libcurlu_la-http2.o
Removing lib/libcurlu_la-http_aws_sigv4.lo
Removing lib/libcurlu_la-http_aws_sigv4.o
Removing lib/libcurlu_la-http_chunks.lo
Removing lib/libcurlu_la-http_chunks.o
Removing lib/libcurlu_la-http_digest.lo
Removing lib/libcurlu_la-http_digest.o
Removing lib/libcurlu_la-http_negotiate.lo
Removing lib/libcurlu_la-http_negotiate.o
Removing lib/libcurlu_la-http_ntlm.lo
Removing lib/libcurlu_la-http_ntlm.o
Removing lib/libcurlu_la-http_proxy.lo
Removing lib/libcurlu_la-http_proxy.o
Removing lib/libcurlu_la-httpsrr.lo
Removing lib/libcurlu_la-httpsrr.o
Removing lib/libcurlu_la-idn.lo
Removing lib/libcurlu_la-idn.o
Removing lib/libcurlu_la-if2ip.lo
Removing lib/libcurlu_la-if2ip.o
Removing lib/libcurlu_la-imap.lo
Removing lib/libcurlu_la-imap.o
Removing lib/libcurlu_la-inet_ntop.lo
Removing lib/libcurlu_la-inet_ntop.o
Removing lib/libcurlu_la-krb5.lo
Removing lib/libcurlu_la-krb5.o
Removing lib/libcurlu_la-ldap.lo
Removing lib/libcurlu_la-ldap.o
Removing lib/libcurlu_la-llist.lo
Removing lib/libcurlu_la-llist.o
Removing lib/libcurlu_la-macos.lo
Removing lib/libcurlu_la-macos.o
Removing lib/libcurlu_la-md4.lo
Removing lib/libcurlu_la-md4.o
Removing lib/libcurlu_la-md5.lo
Removing lib/libcurlu_la-md5.o
Removing lib/libcurlu_la-memdebug.lo
Removing lib/libcurlu_la-memdebug.o
Removing lib/libcurlu_la-mime.lo
Removing lib/libcurlu_la-mime.o
Removing lib/libcurlu_la-mprintf.lo
Removing lib/libcurlu_la-mprintf.o
Removing lib/libcurlu_la-mqtt.lo
Removing lib/libcurlu_la-mqtt.o
Removing lib/libcurlu_la-multi.lo
Removing lib/libcurlu_la-multi.o
Removing lib/libcurlu_la-multi_ev.lo
Removing lib/libcurlu_la-multi_ev.o
Removing lib/libcurlu_la-netrc.lo
Removing lib/libcurlu_la-netrc.o
Removing lib/libcurlu_la-noproxy.lo
Removing lib/libcurlu_la-noproxy.o
Removing lib/libcurlu_la-openldap.lo
Removing lib/libcurlu_la-openldap.o
Removing lib/libcurlu_la-parsedate.lo
Removing lib/libcurlu_la-parsedate.o
Removing lib/libcurlu_la-pingpong.lo
Removing lib/libcurlu_la-pingpong.o
Removing lib/libcurlu_la-pop3.lo
Removing lib/libcurlu_la-pop3.o
Removing lib/libcurlu_la-progress.lo
Removing lib/libcurlu_la-progress.o
Removing lib/libcurlu_la-psl.lo
Removing lib/libcurlu_la-psl.o
Removing lib/libcurlu_la-rand.lo
Removing lib/libcurlu_la-rand.o
Removing lib/libcurlu_la-rename.lo
Removing lib/libcurlu_la-rename.o
Removing lib/libcurlu_la-request.lo
Removing lib/libcurlu_la-request.o
Removing lib/libcurlu_la-rtsp.lo
Removing lib/libcurlu_la-rtsp.o
Removing lib/libcurlu_la-select.lo
Removing lib/libcurlu_la-select.o
Removing lib/libcurlu_la-sendf.lo
Removing lib/libcurlu_la-sendf.o
Removing lib/libcurlu_la-setopt.lo
Removing lib/libcurlu_la-setopt.o
Removing lib/libcurlu_la-sha256.lo
Removing lib/libcurlu_la-sha256.o
Removing lib/libcurlu_la-share.lo
Removing lib/libcurlu_la-share.o
Removing lib/libcurlu_la-slist.lo
Removing lib/libcurlu_la-slist.o
Removing lib/libcurlu_la-smb.lo
Removing lib/libcurlu_la-smb.o
Removing lib/libcurlu_la-smtp.lo
Removing lib/libcurlu_la-smtp.o
Removing lib/libcurlu_la-socketpair.lo
Removing lib/libcurlu_la-socketpair.o
Removing lib/libcurlu_la-socks.lo
Removing lib/libcurlu_la-socks.o
Removing lib/libcurlu_la-socks_gssapi.lo
Removing lib/libcurlu_la-socks_gssapi.o
Removing lib/libcurlu_la-socks_sspi.lo
Removing lib/libcurlu_la-socks_sspi.o
Removing lib/libcurlu_la-speedcheck.lo
Removing lib/libcurlu_la-speedcheck.o
Removing lib/libcurlu_la-splay.lo
Removing lib/libcurlu_la-splay.o
Removing lib/libcurlu_la-strcase.lo
Removing lib/libcurlu_la-strcase.o
Removing lib/libcurlu_la-strdup.lo
Removing lib/libcurlu_la-strdup.o
Removing lib/libcurlu_la-strequal.lo
Removing lib/libcurlu_la-strequal.o
Removing lib/libcurlu_la-strerror.lo
Removing lib/libcurlu_la-strerror.o
Removing lib/libcurlu_la-system_win32.lo
Removing lib/libcurlu_la-system_win32.o
Removing lib/libcurlu_la-telnet.lo
Removing lib/libcurlu_la-telnet.o
Removing lib/libcurlu_la-tftp.lo
Removing lib/libcurlu_la-tftp.o
Removing lib/libcurlu_la-transfer.lo
Removing lib/libcurlu_la-transfer.o
Removing lib/libcurlu_la-uint-bset.lo
Removing lib/libcurlu_la-uint-bset.o
Removing lib/libcurlu_la-uint-hash.lo
Removing lib/libcurlu_la-uint-hash.o
Removing lib/libcurlu_la-uint-spbset.lo
Removing lib/libcurlu_la-uint-spbset.o
Removing lib/libcurlu_la-uint-table.lo
Removing lib/libcurlu_la-uint-table.o
Removing lib/libcurlu_la-url.lo
Removing lib/libcurlu_la-url.o
Removing lib/libcurlu_la-urlapi.lo
Removing lib/libcurlu_la-urlapi.o
Removing lib/libcurlu_la-version.lo
Removing lib/libcurlu_la-version.o
Removing lib/libcurlu_la-ws.lo
Removing lib/libcurlu_la-ws.o
Removing lib/stamp-h1
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/vauth/libcurlu_la-cleartext.lo
Removing lib/vauth/libcurlu_la-cleartext.o
Removing lib/vauth/libcurlu_la-cram.lo
Removing lib/vauth/libcurlu_la-cram.o
Removing lib/vauth/libcurlu_la-digest.lo
Removing lib/vauth/libcurlu_la-digest.o
Removing lib/vauth/libcurlu_la-digest_sspi.lo
Removing lib/vauth/libcurlu_la-digest_sspi.o
Removing lib/vauth/libcurlu_la-gsasl.lo
Removing lib/vauth/libcurlu_la-gsasl.o
Removing lib/vauth/libcurlu_la-krb5_gssapi.lo
Removing lib/vauth/libcurlu_la-krb5_gssapi.o
Removing lib/vauth/libcurlu_la-krb5_sspi.lo
Removing lib/vauth/libcurlu_la-krb5_sspi.o
Removing lib/vauth/libcurlu_la-ntlm.lo
Removing lib/vauth/libcurlu_la-ntlm.o
Removing lib/vauth/libcurlu_la-ntlm_sspi.lo
Removing lib/vauth/libcurlu_la-ntlm_sspi.o
Removing lib/vauth/libcurlu_la-oauth2.lo
Removing lib/vauth/libcurlu_la-oauth2.o
Removing lib/vauth/libcurlu_la-spnego_gssapi.lo
Removing lib/vauth/libcurlu_la-spnego_gssapi.o
Removing lib/vauth/libcurlu_la-spnego_sspi.lo
Removing lib/vauth/libcurlu_la-spnego_sspi.o
Removing lib/vauth/libcurlu_la-vauth.lo
Removing lib/vauth/libcurlu_la-vauth.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_osslq.lo
Removing lib/vquic/libcurl_la-curl_osslq.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic-tls.lo
Removing lib/vquic/libcurl_la-vquic-tls.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vquic/libcurlu_la-curl_msh3.lo
Removing lib/vquic/libcurlu_la-curl_msh3.o
Removing lib/vquic/libcurlu_la-curl_ngtcp2.lo
Removing lib/vquic/libcurlu_la-curl_ngtcp2.o
Removing lib/vquic/libcurlu_la-curl_osslq.lo
Removing lib/vquic/libcurlu_la-curl_osslq.o
Removing lib/vquic/libcurlu_la-curl_quiche.lo
Removing lib/vquic/libcurlu_la-curl_quiche.o
Removing lib/vquic/libcurlu_la-vquic-tls.lo
Removing lib/vquic/libcurlu_la-vquic-tls.o
Removing lib/vquic/libcurlu_la-vquic.lo
Removing lib/vquic/libcurlu_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-curl_path.lo
Removing lib/vssh/libcurl_la-curl_path.o
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vssh/libcurlu_la-curl_path.lo
Removing lib/vssh/libcurlu_la-curl_path.o
Removing lib/vssh/libcurlu_la-libssh.lo
Removing lib/vssh/libcurlu_la-libssh.o
Removing lib/vssh/libcurlu_la-libssh2.lo
Removing lib/vssh/libcurlu_la-libssh2.o
Removing lib/vssh/libcurlu_la-wolfssh.lo
Removing lib/vssh/libcurlu_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-cipher_suite.lo
Removing lib/vtls/libcurl_la-cipher_suite.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-vtls_scache.lo
Removing lib/vtls/libcurl_la-vtls_scache.o
Removing lib/vtls/libcurl_la-vtls_spack.lo
Removing lib/vtls/libcurl_la-vtls_spack.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/vtls/libcurlu_la-bearssl.lo
Removing lib/vtls/libcurlu_la-bearssl.o
Removing lib/vtls/libcurlu_la-cipher_suite.lo
Removing lib/vtls/libcurlu_la-cipher_suite.o
Removing lib/vtls/libcurlu_la-gtls.lo
Removing lib/vtls/libcurlu_la-gtls.o
Removing lib/vtls/libcurlu_la-hostcheck.lo
Removing lib/vtls/libcurlu_la-hostcheck.o
Removing lib/vtls/libcurlu_la-keylog.lo
Removing lib/vtls/libcurlu_la-keylog.o
Removing lib/vtls/libcurlu_la-mbedtls.lo
Removing lib/vtls/libcurlu_la-mbedtls.o
Removing lib/vtls/libcurlu_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurlu_la-mbedtls_threadlock.o
Removing lib/vtls/libcurlu_la-openssl.lo
Removing lib/vtls/libcurlu_la-openssl.o
Removing lib/vtls/libcurlu_la-rustls.lo
Removing lib/vtls/libcurlu_la-rustls.o
Removing lib/vtls/libcurlu_la-schannel.lo
Removing lib/vtls/libcurlu_la-schannel.o
Removing lib/vtls/libcurlu_la-schannel_verify.lo
Removing lib/vtls/libcurlu_la-schannel_verify.o
Removing lib/vtls/libcurlu_la-sectransp.lo
Removing lib/vtls/libcurlu_la-sectransp.o
Removing lib/vtls/libcurlu_la-vtls.lo
Removing lib/vtls/libcurlu_la-vtls.o
Removing lib/vtls/libcurlu_la-vtls_scache.lo
Removing lib/vtls/libcurlu_la-vtls_scache.o
Removing lib/vtls/libcurlu_la-vtls_spack.lo
Removing lib/vtls/libcurlu_la-vtls_spack.o
Removing lib/vtls/libcurlu_la-wolfssl.lo
Removing lib/vtls/libcurlu_la-wolfssl.o
Removing lib/vtls/libcurlu_la-x509asn1.lo
Removing lib/vtls/libcurlu_la-x509asn1.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.dirstamp
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/curl-config2setopts.o
Removing src/curl-slist_wc.o
Removing src/curl-terminal.o
Removing src/curl-tool_bname.o
Removing src/curl-tool_ca_embed.o
Removing src/curl-tool_cb_dbg.o
Removing src/curl-tool_cb_hdr.o
Removing src/curl-tool_cb_prg.o
Removing src/curl-tool_cb_rea.o
Removing src/curl-tool_cb_see.o
Removing src/curl-tool_cb_soc.o
Removing src/curl-tool_cb_wrt.o
Removing src/curl-tool_cfgable.o
Removing src/curl-tool_dirhie.o
Removing src/curl-tool_doswin.o
Removing src/curl-tool_easysrc.o
Removing src/curl-tool_filetime.o
Removing src/curl-tool_findfile.o
Removing src/curl-tool_formparse.o
Removing src/curl-tool_getparam.o
Removing src/curl-tool_getpass.o
Removing src/curl-tool_help.o
Removing src/curl-tool_helpers.o
Removing src/curl-tool_hugehelp.o
Removing src/curl-tool_ipfs.o
Removing src/curl-tool_libinfo.o
Removing src/curl-tool_listhelp.o
Removing src/curl-tool_main.o
Removing src/curl-tool_msgs.o
Removing src/curl-tool_operate.o
Removing src/curl-tool_operhlp.o
Removing src/curl-tool_paramhlp.o
Removing src/curl-tool_parsecfg.o
Removing src/curl-tool_progress.o
Removing src/curl-tool_setopt.o
Removing src/curl-tool_sleep.o
Removing src/curl-tool_ssls.o
Removing src/curl-tool_stderr.o
Removing src/curl-tool_strdup.o
Removing src/curl-tool_urlglob.o
Removing src/curl-tool_util.o
Removing src/curl-tool_vms.o
Removing src/curl-tool_writeout.o
Removing src/curl-tool_writeout_json.o
Removing src/curl-tool_xattr.o
Removing src/curl-var.o
Removing src/curlinfo
Removing src/curlinfo.o
Removing src/libcurltool.la
Removing src/libcurltool_la-config2setopts.lo
Removing src/libcurltool_la-config2setopts.o
Removing src/libcurltool_la-slist_wc.lo
Removing src/libcurltool_la-slist_wc.o
Removing src/libcurltool_la-terminal.lo
Removing src/libcurltool_la-terminal.o
Removing src/libcurltool_la-tool_bname.lo
Removing src/libcurltool_la-tool_bname.o
Removing src/libcurltool_la-tool_cb_dbg.lo
Removing src/libcurltool_la-tool_cb_dbg.o
Removing src/libcurltool_la-tool_cb_hdr.lo
Removing src/libcurltool_la-tool_cb_hdr.o
Removing src/libcurltool_la-tool_cb_prg.lo
Removing src/libcurltool_la-tool_cb_prg.o
Removing src/libcurltool_la-tool_cb_rea.lo
Removing src/libcurltool_la-tool_cb_rea.o
Removing src/libcurltool_la-tool_cb_see.lo
Removing src/libcurltool_la-tool_cb_see.o
Removing src/libcurltool_la-tool_cb_soc.lo
Removing src/libcurltool_la-tool_cb_soc.o
Removing src/libcurltool_la-tool_cb_wrt.lo
Removing src/libcurltool_la-tool_cb_wrt.o
Removing src/libcurltool_la-tool_cfgable.lo
Removing src/libcurltool_la-tool_cfgable.o
Removing src/libcurltool_la-tool_dirhie.lo
Removing src/libcurltool_la-tool_dirhie.o
Removing src/libcurltool_la-tool_doswin.lo
Removing src/libcurltool_la-tool_doswin.o
Removing src/libcurltool_la-tool_easysrc.lo
Removing src/libcurltool_la-tool_easysrc.o
Removing src/libcurltool_la-tool_filetime.lo
Removing src/libcurltool_la-tool_filetime.o
Removing src/libcurltool_la-tool_findfile.lo
Removing src/libcurltool_la-tool_findfile.o
Removing src/libcurltool_la-tool_formparse.lo
Removing src/libcurltool_la-tool_formparse.o
Removing src/libcurltool_la-tool_getparam.lo
Removing src/libcurltool_la-tool_getparam.o
Removing src/libcurltool_la-tool_getpass.lo
Removing src/libcurltool_la-tool_getpass.o
Removing src/libcurltool_la-tool_help.lo
Removing src/libcurltool_la-tool_help.o
Removing src/libcurltool_la-tool_helpers.lo
Removing src/libcurltool_la-tool_helpers.o
Removing src/libcurltool_la-tool_ipfs.lo
Removing src/libcurltool_la-tool_ipfs.o
Removing src/libcurltool_la-tool_libinfo.lo
Removing src/libcurltool_la-tool_libinfo.o
Removing src/libcurltool_la-tool_listhelp.lo
Removing src/libcurltool_la-tool_listhelp.o
Removing src/libcurltool_la-tool_main.lo
Removing src/libcurltool_la-tool_main.o
Removing src/libcurltool_la-tool_msgs.lo
Removing src/libcurltool_la-tool_msgs.o
Removing src/libcurltool_la-tool_operate.lo
Removing src/libcurltool_la-tool_operate.o
Removing src/libcurltool_la-tool_operhlp.lo
Removing src/libcurltool_la-tool_operhlp.o
Removing src/libcurltool_la-tool_paramhlp.lo
Removing src/libcurltool_la-tool_paramhlp.o
Removing src/libcurltool_la-tool_parsecfg.lo
Removing src/libcurltool_la-tool_parsecfg.o
Removing src/libcurltool_la-tool_progress.lo
Removing src/libcurltool_la-tool_progress.o
Removing src/libcurltool_la-tool_setopt.lo
Removing src/libcurltool_la-tool_setopt.o
Removing src/libcurltool_la-tool_sleep.lo
Removing src/libcurltool_la-tool_sleep.o
Removing src/libcurltool_la-tool_ssls.lo
Removing src/libcurltool_la-tool_ssls.o
Removing src/libcurltool_la-tool_stderr.lo
Removing src/libcurltool_la-tool_stderr.o
Removing src/libcurltool_la-tool_strdup.lo
Removing src/libcurltool_la-tool_strdup.o
Removing src/libcurltool_la-tool_urlglob.lo
Removing src/libcurltool_la-tool_urlglob.o
Removing src/libcurltool_la-tool_util.lo
Removing src/libcurltool_la-tool_util.o
Removing src/libcurltool_la-tool_vms.lo
Removing src/libcurltool_la-tool_vms.o
Removing src/libcurltool_la-tool_writeout.lo
Removing src/libcurltool_la-tool_writeout.o
Removing src/libcurltool_la-tool_writeout_json.lo
Removing src/libcurltool_la-tool_writeout_json.o
Removing src/libcurltool_la-tool_xattr.lo
Removing src/libcurltool_la-tool_xattr.o
Removing src/libcurltool_la-var.lo
Removing src/libcurltool_la-var.o
Removing src/tool_ca_embed.c
Removing src/tool_hugehelp.c
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/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/tunit/.deps/
Removing tests/tunit/Makefile
Removing tests/tunit/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:127: installing './compile'
configure.ac:423: installing './config.guess'
configure.ac:423: installing './config.sub'
configure.ac:127: installing './install-sh'
configure.ac:133: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;
$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;
$ chmod +x configure
$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable HTTPSRR support... no
checking whether to enable ECH support... no
checking whether to enable SSL session export support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking that grep -E works... yes
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for stdatomic.h... yes
checking if _Atomic is available... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 8.14.0-DEV
checking for httpd... no
checking for apache2... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... /usr/bin/caddy
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking compiler version... gcc '1100' (raw: '11')
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking whether build target is a native Windows one... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
no
checking whether build target supports Win32 crypto API... no
checking whether to build libcurl and curl in "unity" mode... no
checking whether to build tests into single-binary bundles... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support IPFS... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to build documentation... no
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking whether build target is a native Windows one... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for raw monotonic clock_gettime... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libpsl options with pkg-config... found
checking for psl_builtin in -lpsl... yes
checking for libpsl.h... yes
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for unistd.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netinet/udp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/stat.h... (cached) yes
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for fcntl.h... yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for stdint.h... (cached) yes
checking for sys/filio.h... no
checking for sys/eventfd.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking whether build target is a native Windows one... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking 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 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/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 unistd.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if memrchr can be linked... yes
checking if memrchr is prototyped... yes
checking if memrchr is compilable... yes
checking if memrchr usage allowed... yes
checking if memrchr might be used... yes
checking for sys/types.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking for accept4... yes
checking for eventfd... yes
checking for fnmatch... yes
checking for geteuid... yes
checking for getpass_r... no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for mach_absolute_time... no
checking for pipe... yes
checking for pipe2... yes
checking for poll... yes
checking for sendmmsg... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking for if_nametoindex... yes
checking for realpath... yes
checking for sched_yield... yes
checking 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 if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking for setmode... no
checking for arc4random... no
checking for fseeko... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking whether to enable the threaded resolver... yes
checking 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 enable HTTPS-RR support... no
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/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/tunit/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating tests/http/clients/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:
Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CFLAGS extras:
CPPFLAGS: -D_GNU_SOURCE
LDFLAGS:
curl-config:
LIBS: -lpsl -lz
curl version: 8.14.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)
HTTPS RR: no (--enable-httpsrr)
SSLS-EXPORT: no (--enable-ssls-export)
Protocols: dict file ftp gopher http imap ipfs ipns mqtt pop3 rtsp smtp telnet tftp ws
Features: alt-svc AsynchDNS IPv6 Largefile libz PSL threadsafe UnixSockets
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libidn2
$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-base.lo
CC libcurl_la-asyn-thrdd.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-cshutdn.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_ntlm_core.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sha512_256.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-cw-out.lo
CC libcurl_la-cw-pause.lo
CC libcurl_la-dict.lo
CC libcurl_la-doh.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-fake_addrinfo.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-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-httpsrr.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-imap.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-multi_ev.lo
CC libcurl_la-netrc.lo
CC libcurl_la-openldap.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-request.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strequal.lo
CC libcurl_la-strerror.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-transfer.lo
CC libcurl_la-uint-bset.lo
CC libcurl_la-uint-hash.lo
CC libcurl_la-uint-spbset.lo
CC libcurl_la-uint-table.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-ws.lo
CC libcurlu_la-altsvc.lo
CC libcurlu_la-amigaos.lo
CC libcurlu_la-asyn-ares.lo
CC libcurlu_la-asyn-base.lo
CC libcurlu_la-asyn-thrdd.lo
CC libcurlu_la-bufq.lo
CC libcurlu_la-bufref.lo
CC libcurlu_la-cf-h1-proxy.lo
CC libcurlu_la-cf-h2-proxy.lo
CC libcurlu_la-cf-haproxy.lo
CC libcurlu_la-cf-https-connect.lo
CC libcurlu_la-cf-socket.lo
CC libcurlu_la-cfilters.lo
CC libcurlu_la-conncache.lo
CC libcurlu_la-connect.lo
CC libcurlu_la-content_encoding.lo
CC libcurlu_la-cookie.lo
CC libcurlu_la-cshutdn.lo
CC libcurlu_la-curl_addrinfo.lo
CC libcurlu_la-curl_des.lo
CC libcurlu_la-curl_endian.lo
CC libcurlu_la-curl_fnmatch.lo
CC libcurlu_la-curl_get_line.lo
CC libcurlu_la-curl_gethostname.lo
CC libcurlu_la-curl_gssapi.lo
CC libcurlu_la-curl_memrchr.lo
CC libcurlu_la-curl_ntlm_core.lo
CC libcurlu_la-curl_rtmp.lo
CC libcurlu_la-curl_range.lo
CC libcurlu_la-curl_sasl.lo
CC libcurlu_la-curl_sha512_256.lo
CC libcurlu_la-curl_sspi.lo
CC libcurlu_la-curl_threads.lo
CC libcurlu_la-curl_trc.lo
CC libcurlu_la-cw-out.lo
CC libcurlu_la-cw-pause.lo
CC libcurlu_la-dict.lo
CC libcurlu_la-doh.lo
CC libcurlu_la-dynhds.lo
CC libcurlu_la-easy.lo
CC libcurlu_la-easyoptions.lo
CC libcurlu_la-easygetopt.lo
CC libcurlu_la-escape.lo
CC libcurlu_la-fake_addrinfo.lo
CC libcurlu_la-file.lo
CC libcurlu_la-fileinfo.lo
CC libcurlu_la-fopen.lo
CC libcurlu_la-formdata.lo
CC libcurlu_la-ftp.lo
CC libcurlu_la-ftplistparser.lo
CC libcurlu_la-getinfo.lo
CC libcurlu_la-getenv.lo
CC libcurlu_la-gopher.lo
CC libcurlu_la-hash.lo
CC libcurlu_la-headers.lo
CC libcurlu_la-hmac.lo
CC libcurlu_la-hostip4.lo
CC libcurlu_la-hostip.lo
CC libcurlu_la-hostip6.lo
CC libcurlu_la-hsts.lo
CC libcurlu_la-http.lo
CC libcurlu_la-http1.lo
CC libcurlu_la-http2.lo
CC libcurlu_la-http_aws_sigv4.lo
CC libcurlu_la-http_chunks.lo
CC libcurlu_la-http_digest.lo
CC libcurlu_la-http_negotiate.lo
CC libcurlu_la-http_ntlm.lo
CC libcurlu_la-http_proxy.lo
CC libcurlu_la-httpsrr.lo
CC libcurlu_la-idn.lo
CC libcurlu_la-if2ip.lo
CC libcurlu_la-imap.lo
CC libcurlu_la-inet_ntop.lo
CC libcurlu_la-krb5.lo
CC libcurlu_la-ldap.lo
CC libcurlu_la-llist.lo
CC libcurlu_la-macos.lo
CC libcurlu_la-md4.lo
CC libcurlu_la-memdebug.lo
CC libcurlu_la-md5.lo
CC libcurlu_la-mime.lo
CC libcurlu_la-mprintf.lo
CC libcurlu_la-mqtt.lo
CC libcurlu_la-multi.lo
CC libcurlu_la-multi_ev.lo
CC libcurlu_la-netrc.lo
CC libcurlu_la-noproxy.lo
CC libcurlu_la-openldap.lo
CC libcurlu_la-parsedate.lo
CC libcurlu_la-pingpong.lo
CC libcurlu_la-pop3.lo
CC libcurlu_la-progress.lo
CC libcurlu_la-psl.lo
CC libcurlu_la-rand.lo
CC libcurlu_la-rename.lo
CC libcurlu_la-request.lo
CC libcurlu_la-rtsp.lo
CC libcurlu_la-select.lo
CC libcurlu_la-sendf.lo
CC libcurlu_la-setopt.lo
CC libcurlu_la-sha256.lo
CC libcurlu_la-share.lo
CC libcurlu_la-slist.lo
CC libcurlu_la-smb.lo
CC libcurlu_la-smtp.lo
CC libcurlu_la-socketpair.lo
CC libcurlu_la-socks.lo
CC libcurlu_la-socks_gssapi.lo
CC libcurlu_la-socks_sspi.lo
CC libcurlu_la-speedcheck.lo
CC libcurlu_la-splay.lo
CC libcurlu_la-strcase.lo
CC libcurlu_la-strdup.lo
CC libcurlu_la-strequal.lo
CC libcurlu_la-strerror.lo
CC libcurlu_la-system_win32.lo
CC libcurlu_la-telnet.lo
CC libcurlu_la-tftp.lo
CC libcurlu_la-transfer.lo
CC libcurlu_la-uint-bset.lo
CC libcurlu_la-uint-hash.lo
CC libcurlu_la-uint-spbset.lo
CC libcurlu_la-uint-table.lo
CC libcurlu_la-url.lo
CC libcurlu_la-urlapi.lo
CC libcurlu_la-version.lo
CC libcurlu_la-ws.lo
CC vauth/libcurlu_la-cleartext.lo
CC vauth/libcurlu_la-cram.lo
CC vauth/libcurlu_la-digest.lo
CC vauth/libcurlu_la-digest_sspi.lo
CC vauth/libcurlu_la-gsasl.lo
CC vauth/libcurlu_la-krb5_gssapi.lo
CC vauth/libcurlu_la-krb5_sspi.lo
CC vauth/libcurlu_la-ntlm.lo
CC vauth/libcurlu_la-ntlm_sspi.lo
CC vauth/libcurlu_la-oauth2.lo
CC vauth/libcurlu_la-spnego_gssapi.lo
CC vauth/libcurlu_la-spnego_sspi.lo
CC vauth/libcurlu_la-vauth.lo
CC vtls/libcurlu_la-bearssl.lo
CC vtls/libcurlu_la-cipher_suite.lo
CC vtls/libcurlu_la-gtls.lo
CC vtls/libcurlu_la-hostcheck.lo
CC vtls/libcurlu_la-keylog.lo
CC vtls/libcurlu_la-mbedtls.lo
CC vtls/libcurlu_la-mbedtls_threadlock.lo
CC vtls/libcurlu_la-openssl.lo
CC vtls/libcurlu_la-rustls.lo
CC vtls/libcurlu_la-schannel.lo
CC vtls/libcurlu_la-schannel_verify.lo
CC vtls/libcurlu_la-sectransp.lo
CC vtls/libcurlu_la-vtls.lo
CC vtls/libcurlu_la-vtls_scache.lo
CC vtls/libcurlu_la-vtls_spack.lo
CC vtls/libcurlu_la-wolfssl.lo
CC vtls/libcurlu_la-x509asn1.lo
CC vquic/libcurlu_la-curl_msh3.lo
CC vquic/libcurlu_la-curl_ngtcp2.lo
CC vquic/libcurlu_la-curl_osslq.lo
CC vquic/libcurlu_la-curl_quiche.lo
CC vquic/libcurlu_la-vquic.lo
CC vquic/libcurlu_la-vquic-tls.lo
CC vssh/libcurlu_la-libssh.lo
CC vssh/libcurlu_la-libssh2.lo
CC vssh/libcurlu_la-curl_path.lo
CC vssh/libcurlu_la-wolfssh.lo
CC curlx/libcurlu_la-base64.lo
CC curlx/libcurlu_la-dynbuf.lo
CC curlx/libcurlu_la-inet_pton.lo
CC curlx/libcurlu_la-multibyte.lo
CC curlx/libcurlu_la-nonblock.lo
CC curlx/libcurlu_la-strparse.lo
CC curlx/libcurlu_la-timediff.lo
CC curlx/libcurlu_la-timeval.lo
CC curlx/libcurlu_la-version_win32.lo
CC curlx/libcurlu_la-warnless.lo
CC curlx/libcurlu_la-winapi.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-gsasl.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-cipher_suite.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-vtls_scache.lo
CC vtls/libcurl_la-vtls_spack.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_osslq.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vquic/libcurl_la-vquic-tls.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-curl_path.lo
CC vssh/libcurl_la-wolfssh.lo
CC curlx/libcurl_la-base64.lo
CC curlx/libcurl_la-dynbuf.lo
CC curlx/libcurl_la-inet_pton.lo
CC curlx/libcurl_la-multibyte.lo
CC curlx/libcurl_la-nonblock.lo
CC curlx/libcurl_la-strparse.lo
CC curlx/libcurl_la-timediff.lo
CC curlx/libcurl_la-timeval.lo
CC curlx/libcurl_la-version_win32.lo
CC curlx/libcurl_la-warnless.lo
CC curlx/libcurl_la-winapi.lo
CCLD libcurlu.la
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in docs
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Nothing to be done for 'all-am'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Nothing to be done for 'all'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
Making all in libcurl
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
Making all in opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[3]: Nothing to be done for 'all-am'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC curl-config2setopts.o
CC curl-slist_wc.o
CC curl-terminal.o
CC curl-tool_bname.o
CC curl-tool_cb_dbg.o
CC curl-tool_cb_hdr.o
CC curl-tool_cb_prg.o
CC curl-tool_cb_see.o
CC curl-tool_cb_rea.o
CC curl-tool_cb_soc.o
CC curl-tool_cb_wrt.o
CC curl-tool_cfgable.o
CC curl-tool_dirhie.o
CC curl-tool_doswin.o
CC curl-tool_easysrc.o
CC curl-tool_filetime.o
CC curl-tool_findfile.o
CC curl-tool_formparse.o
CC curl-tool_getparam.o
CC curl-tool_getpass.o
CC curl-tool_help.o
CC curl-tool_helpers.o
CC curl-tool_ipfs.o
CC curl-tool_libinfo.o
CC curl-tool_listhelp.o
CC curl-tool_main.o
CC curl-tool_msgs.o
CC curl-tool_operate.o
CC curl-tool_operhlp.o
CC curl-tool_paramhlp.o
CC curl-tool_parsecfg.o
CC curl-tool_progress.o
CC curl-tool_setopt.o
CC curl-tool_sleep.o
CC curl-tool_ssls.o
CC curl-tool_stderr.o
CC curl-tool_strdup.o
CC curl-tool_urlglob.o
CC curl-tool_util.o
CC curl-tool_vms.o
CC curl-tool_writeout.o
CC curl-tool_writeout_json.o
CC curl-tool_xattr.o
CC curl-var.o
CC ../lib/curlx/curl-base64.o
CC ../lib/curlx/curl-multibyte.o
CC ../lib/curlx/curl-dynbuf.o
CC ../lib/curlx/curl-nonblock.o
CC ../lib/curlx/curl-strparse.o
CC ../lib/curlx/curl-timediff.o
CC ../lib/curlx/curl-version_win32.o
CC ../lib/curlx/curl-timeval.o
CC ../lib/curlx/curl-warnless.o
echo '#include "tool_hugehelp.h"' >> ./tool_hugehelp.c
echo 'extern const void *curl_ca_embed; const void *curl_ca_embed;' > ./tool_ca_embed.c
CC curlinfo.o
CC libcurltool_la-config2setopts.lo
CC libcurltool_la-slist_wc.lo
CC libcurltool_la-terminal.lo
CC libcurltool_la-tool_bname.lo
CC libcurltool_la-tool_cb_dbg.lo
CC libcurltool_la-tool_cb_hdr.lo
CC libcurltool_la-tool_cb_prg.lo
CC libcurltool_la-tool_cb_rea.lo
CC libcurltool_la-tool_cb_see.lo
CC libcurltool_la-tool_cb_soc.lo
CC libcurltool_la-tool_cb_wrt.lo
CC libcurltool_la-tool_cfgable.lo
CC libcurltool_la-tool_dirhie.lo
CC libcurltool_la-tool_doswin.lo
CC libcurltool_la-tool_easysrc.lo
CC libcurltool_la-tool_filetime.lo
CC libcurltool_la-tool_findfile.lo
CC libcurltool_la-tool_formparse.lo
CC libcurltool_la-tool_getparam.lo
CC libcurltool_la-tool_getpass.lo
CC libcurltool_la-tool_help.lo
CC libcurltool_la-tool_helpers.lo
CC libcurltool_la-tool_ipfs.lo
CC libcurltool_la-tool_libinfo.lo
CC libcurltool_la-tool_listhelp.lo
CC libcurltool_la-tool_main.lo
CC libcurltool_la-tool_msgs.lo
CC libcurltool_la-tool_operate.lo
CC libcurltool_la-tool_operhlp.lo
CC libcurltool_la-tool_paramhlp.lo
CC libcurltool_la-tool_parsecfg.lo
CC libcurltool_la-tool_progress.lo
CC libcurltool_la-tool_setopt.lo
CC libcurltool_la-tool_sleep.lo
CC libcurltool_la-tool_ssls.lo
CC libcurltool_la-tool_stderr.lo
CC libcurltool_la-tool_strdup.lo
CC libcurltool_la-tool_urlglob.lo
CC libcurltool_la-tool_util.lo
CC libcurltool_la-tool_vms.lo
CC libcurltool_la-tool_writeout.lo
CC libcurltool_la-tool_writeout_json.lo
CC libcurltool_la-tool_xattr.lo
CC libcurltool_la-var.lo
CC ../lib/curlx/libcurltool_la-base64.lo
CC ../lib/curlx/libcurltool_la-multibyte.lo
CC ../lib/curlx/libcurltool_la-dynbuf.lo
CC ../lib/curlx/libcurltool_la-nonblock.lo
CC ../lib/curlx/libcurltool_la-strparse.lo
CC ../lib/curlx/libcurltool_la-timediff.lo
CC ../lib/curlx/libcurltool_la-timeval.lo
CC ../lib/curlx/libcurltool_la-version_win32.lo
CC ../lib/curlx/libcurltool_la-warnless.lo
CC curl-tool_hugehelp.o
CC curl-tool_ca_embed.o
CCLD libcurltool.la
CCLD curlinfo
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'
| @@ -106,8 +106,8 @@ static int ssh_getsock(struct Curl_easy *data, struct connectdata *conn, | |
| static CURLcode ssh_setup_connection(struct Curl_easy *data, | |
| struct connectdata *conn); | |
| static void ssh_attach(struct Curl_easy *data, struct connectdata *conn); | |
| - | static int sshc_cleanup(struct ssh_conn *sshc, struct Curl_easy *data, |
| - | bool block); |
| + | static CURLcode sshc_cleanup(struct ssh_conn *sshc, struct Curl_easy *data, |
| + | bool block); |
| /* | |
| * SCP protocol handler. | |
| */ | |
| @@ -548,7 +548,7 @@ static CURLcode ssh_knownhost(struct Curl_easy *data, | |
| FALLTHROUGH(); | |
| case CURLKHSTAT_DEFER: | |
| /* DEFER means bail out but keep the SSH_HOSTKEY state */ | |
| - | result = sshc->actualcode = CURLE_PEER_FAILED_VERIFICATION; |
| + | result = CURLE_PEER_FAILED_VERIFICATION; |
| break; | |
| case CURLKHSTAT_FINE_REPLACE: | |
| /* remove old host+key that does not match */ | |
| @@ -629,8 +629,7 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data, | |
| "Denied establishing ssh session: sha256 fingerprint " | |
| "not available"); | |
| myssh_state(data, sshc, SSH_SESSION_FREE); | |
| - | sshc->actualcode = CURLE_PEER_FAILED_VERIFICATION; |
| - | return sshc->actualcode; |
| + | return CURLE_PEER_FAILED_VERIFICATION; |
| } | |
| /* The length of fingerprint is 32 bytes for SHA256. | |
| @@ -638,15 +637,13 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data, | |
| if(curlx_base64_encode(fingerprint, 32, &fingerprint_b64, | |
| &fingerprint_b64_len) != CURLE_OK) { | |
| myssh_state(data, sshc, SSH_SESSION_FREE); | |
| - | sshc->actualcode = CURLE_PEER_FAILED_VERIFICATION; |
| - | return sshc->actualcode; |
| + | return CURLE_PEER_FAILED_VERIFICATION; |
| } | |
| if(!fingerprint_b64) { | |
| failf(data, "sha256 fingerprint could not be encoded"); | |
| myssh_state(data, sshc, SSH_SESSION_FREE); | |
| - | sshc->actualcode = CURLE_PEER_FAILED_VERIFICATION; |
| - | return sshc->actualcode; |
| + | return CURLE_PEER_FAILED_VERIFICATION; |
| } | |
| infof(data, "SSH SHA256 fingerprint: %s", fingerprint_b64); | |
| @@ -672,8 +669,7 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data, | |
| "Remote %s is not equal to %s", fingerprint_b64, pubkey_sha256); | |
| free(fingerprint_b64); | |
| myssh_state(data, sshc, SSH_SESSION_FREE); | |
| - | sshc->actualcode = CURLE_PEER_FAILED_VERIFICATION; |
| - | return sshc->actualcode; |
| + | return CURLE_PEER_FAILED_VERIFICATION; |
| } | |
| free(fingerprint_b64); | |
| @@ -712,8 +708,7 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data, | |
| "not available"); | |
| } | |
| myssh_state(data, sshc, SSH_SESSION_FREE); | |
| - | sshc->actualcode = CURLE_PEER_FAILED_VERIFICATION; |
| - | return sshc->actualcode; |
| + | return CURLE_PEER_FAILED_VERIFICATION; |
| } | |
| infof(data, "MD5 checksum match"); | |
| } | |
| @@ -734,14 +729,12 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data, | |
| Curl_set_in_callback(data, FALSE); | |
| if(rc!= CURLKHMATCH_OK) { | |
| myssh_state(data, sshc, SSH_SESSION_FREE); | |
| - | sshc->actualcode = CURLE_PEER_FAILED_VERIFICATION; |
| - | return sshc->actualcode; |
| + | return CURLE_PEER_FAILED_VERIFICATION; |
| } | |
| } | |
| else { | |
| myssh_state(data, sshc, SSH_SESSION_FREE); | |
| - | sshc->actualcode = CURLE_PEER_FAILED_VERIFICATION; |
| - | return sshc->actualcode; |
| + | return CURLE_PEER_FAILED_VERIFICATION; |
| } | |
| return CURLE_OK; | |
| } | |
| @@ -1101,6 +1094,7 @@ sftp_upload_init(struct Curl_easy *data, | |
| LIBSSH2_SFTP_OPENFILE); | |
| if(!sshc->sftp_handle) { | |
| + | CURLcode result; |
| unsigned long sftperr; | |
| int rc = libssh2_session_last_errno(sshc->ssh_session); | |
| @@ -1118,11 +1112,9 @@ sftp_upload_init(struct Curl_easy *data, | |
| if(sshc->secondCreateDirs) { | |
| myssh_state(data, sshc, 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; |
| + | return sftp_libssh2_error_to_CURLE(sftperr); |
| } | |
| if(((sftperr == LIBSSH2_FX_NO_SUCH_FILE) || | |
| (sftperr == LIBSSH2_FX_FAILURE) || | |
| @@ -1135,20 +1127,19 @@ sftp_upload_init(struct Curl_easy *data, | |
| return CURLE_OK; | |
| } | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| - | sshc->actualcode = sftperr != LIBSSH2_FX_OK ? |
| - | sftp_libssh2_error_to_CURLE(sftperr) : CURLE_SSH; |
| - | if(!sshc->actualcode) { |
| + | result = sftp_libssh2_error_to_CURLE(sftperr); |
| + | if(!result) { |
| /* 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; |
| + | result = 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; |
| + | return result; |
| } | |
| /* If we have a restart point then we need to seek to the correct | |
| @@ -1236,7 +1227,7 @@ sftp_upload_init(struct Curl_easy *data, | |
| /* make sure that this does not collide with an actual libssh2 error code */ | |
| #define ERROR_LIBBSH2 1 | |
| - | static int ssh_state_pkey_init(struct Curl_easy *data, |
| + | static CURLcode ssh_state_pkey_init(struct Curl_easy *data, |
| struct ssh_conn *sshc) | |
| { | |
| /* | |
| @@ -1309,8 +1300,7 @@ static int ssh_state_pkey_init(struct Curl_easy *data, | |
| Curl_safefree(sshc->rsa); | |
| Curl_safefree(sshc->rsa_pub); | |
| myssh_state(data, sshc, SSH_SESSION_FREE); | |
| - | sshc->actualcode = CURLE_OUT_OF_MEMORY; |
| - | return ERROR_LIBBSH2; |
| + | return CURLE_OUT_OF_MEMORY; |
| } | |
| sshc->passphrase = data->set.ssl.key_passwd; | |
| @@ -1622,8 +1612,7 @@ static CURLcode sftp_readdir(struct Curl_easy *data, | |
| } | |
| else { | |
| unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); | |
| - | result = sftp_libssh2_error_to_CURLE(sftperr); |
| - | sshc->actualcode = result ? result : CURLE_SSH; |
| + | result = sftperr ? sftp_libssh2_error_to_CURLE(sftperr) : CURLE_SSH; |
| failf(data, "Could not open remote file for reading: %s :: %d", | |
| sftp_libssh2_strerror(sftperr), | |
| libssh2_session_last_errno(sshc->ssh_session)); | |
| @@ -1632,54 +1621,49 @@ static CURLcode sftp_readdir(struct Curl_easy *data, | |
| return result; | |
| } | |
| - | static int ssh_state_init(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_init(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| CURLcode result; | |
| sshc->secondCreateDirs = 0; | |
| sshc->nextstate = SSH_NO_STATE; | |
| - | sshc->actualcode = CURLE_OK; |
| /* Set libssh2 to non-blocking, since everything internally is | |
| non-blocking */ | |
| libssh2_session_set_blocking(sshc->ssh_session, 0); | |
| result = ssh_force_knownhost_key_type(data, sshc); | |
| - | if(result) { |
| + | if(result) |
| myssh_state(data, sshc, SSH_SESSION_FREE); | |
| - | sshc->actualcode = result; |
| - | return ERROR_LIBBSH2; |
| - | } |
| - | |
| - | myssh_state(data, sshc, SSH_S_STARTUP); |
| - | return 0; |
| + | else |
| + | myssh_state(data, sshc, SSH_S_STARTUP); |
| + | return result; |
| } | |
| - | static int ssh_state_startup(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_startup(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| struct connectdata *conn = data->conn; | |
| int rc = libssh2_session_handshake(sshc->ssh_session, | |
| conn->sock[FIRSTSOCKET]); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| if(rc) { | |
| char *err_msg = NULL; | |
| (void)libssh2_session_last_error(sshc->ssh_session, &err_msg, NULL, 0); | |
| failf(data, "Failure establishing ssh session: %d, %s", rc, err_msg); | |
| myssh_state(data, sshc, SSH_SESSION_FREE); | |
| - | sshc->actualcode = CURLE_FAILED_INIT; |
| - | return rc; |
| + | return CURLE_FAILED_INIT; |
| } | |
| myssh_state(data, sshc, SSH_HOSTKEY); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_hostkey(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_hostkey(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| /* | |
| * Before we authenticate we should check the hostkey's fingerprint | |
| @@ -1687,15 +1671,13 @@ static int ssh_state_hostkey(struct Curl_easy *data, | |
| * whatever) is up to us. | |
| */ | |
| CURLcode result = ssh_check_fingerprint(data, sshc); | |
| - | if(!result) { |
| + | if(!result) |
| myssh_state(data, sshc, SSH_AUTHLIST); | |
| - | return 0; |
| - | } |
| - | return ERROR_LIBBSH2; |
| + | return result; |
| } | |
| - | static int ssh_state_authlist(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_authlist(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| /* | |
| * Figure out authentication methods | |
| @@ -1718,26 +1700,24 @@ static int ssh_state_authlist(struct Curl_easy *data, | |
| sshc->authed = TRUE; | |
| infof(data, "SSH user accepted with no authentication"); | |
| myssh_state(data, sshc, SSH_AUTH_DONE); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| rc = libssh2_session_last_errno(sshc->ssh_session); | |
| if(rc == LIBSSH2_ERROR_EAGAIN) | |
| - | rc = LIBSSH2_ERROR_EAGAIN; |
| - | else { |
| - | myssh_state(data, sshc, SSH_SESSION_FREE); |
| - | sshc->actualcode = libssh2_session_error_to_CURLE(rc); |
| - | } |
| - | return rc; |
| + | return CURLE_AGAIN; |
| + | |
| + | myssh_state(data, sshc, SSH_SESSION_FREE); |
| + | return libssh2_session_error_to_CURLE(rc); |
| } | |
| infof(data, "SSH authentication methods available: %s", | |
| sshc->authlist); | |
| myssh_state(data, sshc, SSH_AUTH_PKEY_INIT); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_auth_pkey(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_auth_pkey(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| /* The function below checks if the files exists, no need to stat() here. | |
| */ | |
| @@ -1750,7 +1730,7 @@ static int ssh_state_auth_pkey(struct Curl_easy *data, | |
| sshc->rsa_pub, | |
| sshc->rsa, sshc->passphrase); | |
| if(rc == LIBSSH2_ERROR_EAGAIN) | |
| - | return rc; |
| + | return CURLE_AGAIN; |
| Curl_safefree(sshc->rsa_pub); | |
| Curl_safefree(sshc->rsa); | |
| @@ -1774,13 +1754,12 @@ static int ssh_state_auth_pkey(struct Curl_easy *data, | |
| } | |
| infof(data, "SSH public key authentication failed: %s", err_msg); | |
| myssh_state(data, sshc, SSH_AUTH_PASS_INIT); | |
| - | rc = 0; /* clear rc and continue */ |
| } | |
| - | return rc; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_auth_pass_init(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_auth_pass_init(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| if((data->set.ssh_auth_types & CURLSSH_AUTH_PASSWORD) && | |
| (strstr(sshc->authlist, "password") != NULL)) { | |
| @@ -1789,11 +1768,11 @@ static int ssh_state_auth_pass_init(struct Curl_easy *data, | |
| else { | |
| myssh_state(data, sshc, SSH_AUTH_HOST_INIT); | |
| } | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_auth_pass(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_auth_pass(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| struct connectdata *conn = data->conn; | |
| int rc = | |
| @@ -1803,7 +1782,7 @@ static int ssh_state_auth_pass(struct Curl_easy *data, | |
| curlx_uztoui(strlen(conn->passwd)), | |
| NULL); | |
| if(rc == LIBSSH2_ERROR_EAGAIN) { | |
| - | return rc; |
| + | return CURLE_AGAIN; |
| } | |
| if(rc == 0) { | |
| sshc->authed = TRUE; | |
| @@ -1812,13 +1791,12 @@ static int ssh_state_auth_pass(struct Curl_easy *data, | |
| } | |
| else { | |
| myssh_state(data, sshc, SSH_AUTH_HOST_INIT); | |
| - | rc = 0; /* clear rc and continue */ |
| } | |
| - | return rc; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_auth_host_init(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_auth_host_init(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| if((data->set.ssh_auth_types & CURLSSH_AUTH_HOST) && | |
| (strstr(sshc->authlist, "hostbased") != NULL)) { | |
| @@ -1827,10 +1805,10 @@ static int ssh_state_auth_host_init(struct Curl_easy *data, | |
| else { | |
| myssh_state(data, sshc, SSH_AUTH_AGENT_INIT); | |
| } | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_auth_agent_init(struct Curl_easy *data, |
| + | static CURLcode ssh_state_auth_agent_init(struct Curl_easy *data, |
| struct ssh_conn *sshc) | |
| { | |
| int rc = 0; | |
| @@ -1846,17 +1824,16 @@ static int ssh_state_auth_agent_init(struct Curl_easy *data, | |
| infof(data, "Could not create agent object"); | |
| myssh_state(data, sshc, SSH_AUTH_KEY_INIT); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| } | |
| rc = libssh2_agent_connect(sshc->ssh_agent); | |
| if(rc == LIBSSH2_ERROR_EAGAIN) | |
| - | return rc; |
| + | return CURLE_AGAIN; |
| if(rc < 0) { | |
| infof(data, "Failure connecting to agent"); | |
| myssh_state(data, sshc, SSH_AUTH_KEY_INIT); | |
| - | rc = 0; /* clear rc and continue */ |
| } | |
| else { | |
| myssh_state(data, sshc, SSH_AUTH_AGENT_LIST); | |
| @@ -1864,30 +1841,29 @@ static int ssh_state_auth_agent_init(struct Curl_easy *data, | |
| } | |
| else | |
| myssh_state(data, sshc, SSH_AUTH_KEY_INIT); | |
| - | return rc; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_auth_agent_list(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_auth_agent_list(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| int rc = libssh2_agent_list_identities(sshc->ssh_agent); | |
| if(rc == LIBSSH2_ERROR_EAGAIN) | |
| - | return rc; |
| + | return CURLE_AGAIN; |
| if(rc < 0) { | |
| infof(data, "Failure requesting identities to agent"); | |
| myssh_state(data, sshc, SSH_AUTH_KEY_INIT); | |
| - | rc = 0; /* clear rc and continue */ |
| } | |
| else { | |
| myssh_state(data, sshc, SSH_AUTH_AGENT); | |
| sshc->sshagent_prev_identity = NULL; | |
| } | |
| - | return rc; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_auth_agent(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_auth_agent(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| /* as prev_identity evolves only after an identity user auth finished we | |
| can safely request it again as long as EAGAIN is returned here or by | |
| @@ -1896,7 +1872,7 @@ static int ssh_state_auth_agent(struct Curl_easy *data, | |
| &sshc->sshagent_identity, | |
| sshc->sshagent_prev_identity); | |
| if(rc == LIBSSH2_ERROR_EAGAIN) | |
| - | return rc; |
| + | return CURLE_AGAIN; |
| if(rc == 0) { | |
| struct connectdata *conn = data->conn; | |
| @@ -1908,7 +1884,7 @@ static int ssh_state_auth_agent(struct Curl_easy *data, | |
| /* tried and failed? go to next identity */ | |
| sshc->sshagent_prev_identity = sshc->sshagent_identity; | |
| } | |
| - | return rc; |
| + | return CURLE_OK; |
| } | |
| } | |
| @@ -1924,13 +1900,12 @@ static int ssh_state_auth_agent(struct Curl_easy *data, | |
| } | |
| else { | |
| myssh_state(data, sshc, SSH_AUTH_KEY_INIT); | |
| - | rc = 0; /* clear rc and continue */ |
| } | |
| - | return rc; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_auth_key_init(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_auth_key_init(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| if((data->set.ssh_auth_types & CURLSSH_AUTH_KEYBOARD) | |
| && (strstr(sshc->authlist, "keyboard-interactive") != NULL)) { | |
| @@ -1939,10 +1914,10 @@ static int ssh_state_auth_key_init(struct Curl_easy *data, | |
| else { | |
| myssh_state(data, sshc, SSH_AUTH_DONE); | |
| } | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_auth_key(struct Curl_easy *data, |
| + | static CURLcode ssh_state_auth_key(struct Curl_easy *data, |
| struct ssh_conn *sshc) | |
| { | |
| /* Authentication failed. Continue with keyboard-interactive now. */ | |
| @@ -1953,26 +1928,26 @@ static int ssh_state_auth_key(struct Curl_easy *data, | |
| curlx_uztoui( | |
| strlen(conn->user)), | |
| &kbd_callback); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| if(rc == 0) { | |
| sshc->authed = TRUE; | |
| infof(data, "Initialized keyboard interactive authentication"); | |
| + | myssh_state(data, sshc, SSH_AUTH_DONE); |
| + | return CURLE_OK; |
| } | |
| - | myssh_state(data, sshc, SSH_AUTH_DONE); |
| - | return rc; |
| + | return CURLE_LOGIN_DENIED; |
| } | |
| - | static int ssh_state_auth_done(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_auth_done(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| struct connectdata *conn = data->conn; | |
| if(!sshc->authed) { | |
| failf(data, "Authentication failure"); | |
| myssh_state(data, sshc, SSH_SESSION_FREE); | |
| - | sshc->actualcode = CURLE_LOGIN_DENIED; |
| - | return ERROR_LIBBSH2; |
| + | return CURLE_LOGIN_DENIED; |
| } | |
| /* | |
| @@ -1987,15 +1962,15 @@ static int ssh_state_auth_done(struct Curl_easy *data, | |
| if(conn->handler->protocol == CURLPROTO_SFTP) { | |
| myssh_state(data, sshc, SSH_SFTP_INIT); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| infof(data, "SSH CONNECT phase done"); | |
| myssh_state(data, sshc, SSH_STOP); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_init(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_sftp_init(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| /* | |
| * Start the libssh2 sftp session | |
| @@ -2005,22 +1980,21 @@ static int ssh_state_sftp_init(struct Curl_easy *data, | |
| char *err_msg = NULL; | |
| if(libssh2_session_last_errno(sshc->ssh_session) == | |
| LIBSSH2_ERROR_EAGAIN) | |
| - | return LIBSSH2_ERROR_EAGAIN; |
| + | return CURLE_AGAIN; |
| (void)libssh2_session_last_error(sshc->ssh_session, | |
| &err_msg, NULL, 0); | |
| failf(data, "Failure initializing sftp session: %s", err_msg); | |
| myssh_state(data, sshc, SSH_SESSION_FREE); | |
| - | sshc->actualcode = CURLE_FAILED_INIT; |
| - | return ERROR_LIBBSH2; |
| + | return CURLE_FAILED_INIT; |
| } | |
| myssh_state(data, sshc, SSH_SFTP_REALPATH); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_realpath(struct Curl_easy *data, |
| - | struct ssh_conn *sshc, |
| - | struct SSHPROTO *sshp) |
| + | static CURLcode ssh_state_sftp_realpath(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp) |
| { | |
| /* | |
| * Get the "home" directory | |
| @@ -2029,9 +2003,9 @@ static int ssh_state_sftp_realpath(struct Curl_easy *data, | |
| ".", curlx_uztoui(strlen(".")), | |
| sshp->readdir_filename, CURL_PATH_MAX, | |
| LIBSSH2_SFTP_REALPATH); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| if(rc > 0) { | |
| /* It seems that this string is not always NULL terminated */ | |
| sshp->readdir_filename[rc] = '\0'; | |
| @@ -2039,13 +2013,12 @@ static int ssh_state_sftp_realpath(struct Curl_easy *data, | |
| sshc->homedir = strdup(sshp->readdir_filename); | |
| if(!sshc->homedir) { | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| - | sshc->actualcode = CURLE_OUT_OF_MEMORY; |
| - | return ERROR_LIBBSH2; |
| + | return CURLE_OUT_OF_MEMORY; |
| } | |
| free(data->state.most_recent_ftp_entrypath); | |
| data->state.most_recent_ftp_entrypath = strdup(sshc->homedir); | |
| if(!data->state.most_recent_ftp_entrypath) | |
| - | return ERROR_LIBBSH2; |
| + | return CURLE_OUT_OF_MEMORY; |
| } | |
| else { | |
| /* Return the error type */ | |
| @@ -2057,11 +2030,10 @@ static int ssh_state_sftp_realpath(struct Curl_easy *data, | |
| /* in this case, the error was not in the SFTP level but for example | |
| a time-out or similar */ | |
| result = CURLE_SSH; | |
| - | sshc->actualcode = result; |
| DEBUGF(infof(data, "error = %lu makes libcurl = %d", | |
| sftperr, (int)result)); | |
| myssh_state(data, sshc, SSH_STOP); | |
| - | return 0; |
| + | return result; |
| } | |
| /* This is the last step in the SFTP connect phase. Do note that while | |
| @@ -2070,18 +2042,17 @@ static int ssh_state_sftp_realpath(struct Curl_easy *data, | |
| working path will not. */ | |
| DEBUGF(infof(data, "SSH CONNECT phase done")); | |
| myssh_state(data, sshc, SSH_STOP); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_quote_init(struct Curl_easy *data, |
| - | struct ssh_conn *sshc, |
| - | struct SSHPROTO *sshp) |
| + | static CURLcode ssh_state_sftp_quote_init(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp) |
| { | |
| CURLcode result = Curl_getworkingpath(data, sshc->homedir, &sshp->path); | |
| if(result) { | |
| - | sshc->actualcode = result; |
| myssh_state(data, sshc, SSH_STOP); | |
| - | return ERROR_LIBBSH2; |
| + | return result; |
| } | |
| if(data->set.quote) { | |
| @@ -2092,11 +2063,11 @@ static int ssh_state_sftp_quote_init(struct Curl_easy *data, | |
| else { | |
| myssh_state(data, sshc, SSH_SFTP_GETINFO); | |
| } | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_postquote_init(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_sftp_postquote_init(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| if(data->set.postquote) { | |
| infof(data, "Sending quote commands"); | |
| @@ -2106,25 +2077,24 @@ static int ssh_state_sftp_postquote_init(struct Curl_easy *data, | |
| else { | |
| myssh_state(data, sshc, SSH_STOP); | |
| } | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_quote(struct Curl_easy *data, |
| - | struct ssh_conn *sshc, |
| - | struct SSHPROTO *sshp) |
| + | static CURLcode ssh_state_sftp_quote(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp) |
| { | |
| /* Send quote commands */ | |
| CURLcode result = sftp_quote(data, sshc, sshp); | |
| if(result) { | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| sshc->nextstate = SSH_NO_STATE; | |
| - | sshc->actualcode = result; |
| } | |
| - | return 0; |
| + | return result; |
| } | |
| - | static int ssh_state_sftp_next_quote(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_sftp_next_quote(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| Curl_safefree(sshc->quote_path1); | |
| Curl_safefree(sshc->quote_path2); | |
| @@ -2143,36 +2113,34 @@ static int ssh_state_sftp_next_quote(struct Curl_easy *data, | |
| myssh_state(data, sshc, SSH_SFTP_GETINFO); | |
| } | |
| } | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_quote_stat(struct Curl_easy *data, |
| - | struct ssh_conn *sshc, |
| - | struct SSHPROTO *sshp, |
| - | bool *blockp) |
| + | static CURLcode ssh_state_sftp_quote_stat(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp, |
| + | bool *blockp) |
| { | |
| CURLcode result = sftp_quote_stat(data, sshc, sshp, blockp); | |
| if(result) { | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| sshc->nextstate = SSH_NO_STATE; | |
| - | sshc->actualcode = result; |
| - | return ERROR_LIBBSH2; |
| } | |
| - | return 0; |
| + | return result; |
| } | |
| - | static int ssh_state_sftp_quote_setstat(struct Curl_easy *data, |
| - | struct ssh_conn *sshc, |
| - | struct SSHPROTO *sshp) |
| + | static CURLcode ssh_state_sftp_quote_setstat(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp) |
| { | |
| int rc = | |
| libssh2_sftp_stat_ex(sshc->sftp_session, sshc->quote_path2, | |
| curlx_uztoui(strlen(sshc->quote_path2)), | |
| LIBSSH2_SFTP_SETSTAT, | |
| &sshp->quote_attrs); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| if(rc && !sshc->acceptfail) { | |
| unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); | |
| Curl_safefree(sshc->quote_path1); | |
| @@ -2181,15 +2149,14 @@ static int ssh_state_sftp_quote_setstat(struct Curl_easy *data, | |
| sftp_libssh2_strerror(sftperr)); | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| sshc->nextstate = SSH_NO_STATE; | |
| - | sshc->actualcode = CURLE_QUOTE_ERROR; |
| - | return ERROR_LIBBSH2; |
| + | return CURLE_QUOTE_ERROR; |
| } | |
| myssh_state(data, sshc, SSH_SFTP_NEXT_QUOTE); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_quote_symlink(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_sftp_quote_symlink(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| int rc = | |
| libssh2_sftp_symlink_ex(sshc->sftp_session, sshc->quote_path1, | |
| @@ -2197,9 +2164,9 @@ static int ssh_state_sftp_quote_symlink(struct Curl_easy *data, | |
| sshc->quote_path2, | |
| curlx_uztoui(strlen(sshc->quote_path2)), | |
| LIBSSH2_SFTP_SYMLINK); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| if(rc && !sshc->acceptfail) { | |
| unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); | |
| Curl_safefree(sshc->quote_path1); | |
| @@ -2208,22 +2175,21 @@ static int ssh_state_sftp_quote_symlink(struct Curl_easy *data, | |
| sftp_libssh2_strerror(sftperr)); | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| sshc->nextstate = SSH_NO_STATE; | |
| - | sshc->actualcode = CURLE_QUOTE_ERROR; |
| - | return ERROR_LIBBSH2; |
| + | return CURLE_QUOTE_ERROR; |
| } | |
| myssh_state(data, sshc, SSH_SFTP_NEXT_QUOTE); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_quote_mkdir(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_sftp_quote_mkdir(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| int rc = libssh2_sftp_mkdir_ex(sshc->sftp_session, sshc->quote_path1, | |
| curlx_uztoui(strlen(sshc->quote_path1)), | |
| (long)data->set.new_directory_perms); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| if(rc && !sshc->acceptfail) { | |
| unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); | |
| Curl_safefree(sshc->quote_path1); | |
| @@ -2231,15 +2197,14 @@ static int ssh_state_sftp_quote_mkdir(struct Curl_easy *data, | |
| sftp_libssh2_strerror(sftperr)); | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| sshc->nextstate = SSH_NO_STATE; | |
| - | sshc->actualcode = CURLE_QUOTE_ERROR; |
| - | return ERROR_LIBBSH2; |
| + | return CURLE_QUOTE_ERROR; |
| } | |
| myssh_state(data, sshc, SSH_SFTP_NEXT_QUOTE); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_quote_rename(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_sftp_quote_rename(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| int rc = | |
| libssh2_sftp_rename_ex(sshc->sftp_session, sshc->quote_path1, | |
| @@ -2250,9 +2215,9 @@ static int ssh_state_sftp_quote_rename(struct Curl_easy *data, | |
| LIBSSH2_SFTP_RENAME_ATOMIC | | |
| LIBSSH2_SFTP_RENAME_NATIVE); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| if(rc && !sshc->acceptfail) { | |
| unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); | |
| Curl_safefree(sshc->quote_path1); | |
| @@ -2261,21 +2226,20 @@ static int ssh_state_sftp_quote_rename(struct Curl_easy *data, | |
| sftp_libssh2_strerror(sftperr)); | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| sshc->nextstate = SSH_NO_STATE; | |
| - | sshc->actualcode = CURLE_QUOTE_ERROR; |
| - | return ERROR_LIBBSH2; |
| + | return CURLE_QUOTE_ERROR; |
| } | |
| myssh_state(data, sshc, SSH_SFTP_NEXT_QUOTE); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_quote_rmdir(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_sftp_quote_rmdir(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| int rc = libssh2_sftp_rmdir_ex(sshc->sftp_session, sshc->quote_path1, | |
| curlx_uztoui(strlen(sshc->quote_path1))); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| if(rc && !sshc->acceptfail) { | |
| unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); | |
| Curl_safefree(sshc->quote_path1); | |
| @@ -2283,35 +2247,33 @@ static int ssh_state_sftp_quote_rmdir(struct Curl_easy *data, | |
| sftp_libssh2_strerror(sftperr)); | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| sshc->nextstate = SSH_NO_STATE; | |
| - | sshc->actualcode = CURLE_QUOTE_ERROR; |
| - | return ERROR_LIBBSH2; |
| + | return CURLE_QUOTE_ERROR; |
| } | |
| myssh_state(data, sshc, SSH_SFTP_NEXT_QUOTE); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_quote_unlink(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_sftp_quote_unlink(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| int rc = libssh2_sftp_unlink_ex(sshc->sftp_session, sshc->quote_path1, | |
| curlx_uztoui(strlen(sshc->quote_path1))); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| if(rc && !sshc->acceptfail) { | |
| 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)); | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| sshc->nextstate = SSH_NO_STATE; | |
| - | sshc->actualcode = CURLE_QUOTE_ERROR; |
| - | return ERROR_LIBBSH2; |
| + | return CURLE_QUOTE_ERROR; |
| } | |
| myssh_state(data, sshc, SSH_SFTP_NEXT_QUOTE); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_quote_statvfs(struct Curl_easy *data, |
| + | static CURLcode ssh_state_sftp_quote_statvfs(struct Curl_easy *data, |
| struct ssh_conn *sshc) | |
| { | |
| LIBSSH2_SFTP_STATVFS statvfs; | |
| @@ -2319,9 +2281,9 @@ static int ssh_state_sftp_quote_statvfs(struct Curl_easy *data, | |
| curlx_uztoui(strlen(sshc->quote_path1)), | |
| &statvfs); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| if(rc && !sshc->acceptfail) { | |
| unsigned long sftperr = libssh2_sftp_last_error(sshc->sftp_session); | |
| Curl_safefree(sshc->quote_path1); | |
| @@ -2329,8 +2291,7 @@ static int ssh_state_sftp_quote_statvfs(struct Curl_easy *data, | |
| sftp_libssh2_strerror(sftperr)); | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| sshc->nextstate = SSH_NO_STATE; | |
| - | sshc->actualcode = CURLE_QUOTE_ERROR; |
| - | return ERROR_LIBBSH2; |
| + | return CURLE_QUOTE_ERROR; |
| } | |
| else if(rc == 0) { | |
| #ifdef _MSC_VER | |
| @@ -2358,10 +2319,9 @@ static int ssh_state_sftp_quote_statvfs(struct Curl_easy *data, | |
| statvfs.f_fsid, statvfs.f_flag, | |
| statvfs.f_namemax); | |
| if(!tmp) { | |
| - | sshc->actualcode = CURLE_OUT_OF_MEMORY; |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| sshc->nextstate = SSH_NO_STATE; | |
| - | return ERROR_LIBBSH2; |
| + | return CURLE_OUT_OF_MEMORY; |
| } | |
| result = Curl_client_write(data, CLIENTWRITE_HEADER, tmp, strlen(tmp)); | |
| @@ -2369,24 +2329,24 @@ static int ssh_state_sftp_quote_statvfs(struct Curl_easy *data, | |
| if(result) { | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| sshc->nextstate = SSH_NO_STATE; | |
| - | sshc->actualcode = result; |
| + | return result; |
| } | |
| } | |
| myssh_state(data, sshc, SSH_SFTP_NEXT_QUOTE); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_create_dirs_mkdir(struct Curl_easy *data, |
| - | struct ssh_conn *sshc, |
| - | struct SSHPROTO *sshp) |
| + | static CURLcode ssh_state_sftp_create_dirs_mkdir(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp) |
| { | |
| /* 'mode' - parameter is preliminary - default to 0644 */ | |
| int rc = libssh2_sftp_mkdir_ex(sshc->sftp_session, sshp->path, | |
| curlx_uztoui(strlen(sshp->path)), | |
| (long)data->set.new_directory_perms); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| *sshc->slash_pos = '/'; | |
| ++sshc->slash_pos; | |
| if(rc < 0) { | |
| @@ -2395,30 +2355,26 @@ static int ssh_state_sftp_create_dirs_mkdir(struct Curl_easy *data, | |
| * permission was denied (creation might succeed further down the | |
| * path) - retry on unspecific FAILURE also | |
| */ | |
| - | CURLcode result; |
| 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)) { | |
| - | result = sftp_libssh2_error_to_CURLE(sftperr); |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| - | sshc->actualcode = result ? result : CURLE_SSH; |
| - | return ERROR_LIBBSH2; |
| + | return sftp_libssh2_error_to_CURLE(sftperr); |
| } | |
| - | rc = 0; /* clear rc and continue */ |
| } | |
| myssh_state(data, sshc, SSH_SFTP_CREATE_DIRS); | |
| - | return rc; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_readdir_init(struct Curl_easy *data, |
| - | struct ssh_conn *sshc, |
| - | struct SSHPROTO *sshp) |
| + | static CURLcode ssh_state_sftp_readdir_init(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp) |
| { | |
| Curl_pgrsSetDownloadSize(data, -1); | |
| if(data->req.no_body) { | |
| myssh_state(data, sshc, SSH_STOP); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| /* | |
| @@ -2431,26 +2387,22 @@ static int ssh_state_sftp_readdir_init(struct Curl_easy *data, | |
| 0, 0, LIBSSH2_SFTP_OPENDIR); | |
| if(!sshc->sftp_handle) { | |
| unsigned long sftperr; | |
| - | CURLcode result; |
| - | if(libssh2_session_last_errno(sshc->ssh_session) == |
| - | LIBSSH2_ERROR_EAGAIN) { |
| - | return LIBSSH2_ERROR_EAGAIN; |
| - | } |
| + | if(libssh2_session_last_errno(sshc->ssh_session) == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| sftperr = libssh2_sftp_last_error(sshc->sftp_session); | |
| failf(data, "Could not open directory for reading: %s", | |
| sftp_libssh2_strerror(sftperr)); | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| - | result = sftp_libssh2_error_to_CURLE(sftperr); |
| - | sshc->actualcode = result ? result : CURLE_SSH; |
| - | return ERROR_LIBBSH2; |
| + | return sftp_libssh2_error_to_CURLE(sftperr); |
| } | |
| myssh_state(data, sshc, SSH_SFTP_READDIR); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_readdir_link(struct Curl_easy *data, |
| - | struct ssh_conn *sshc, |
| - | struct SSHPROTO *sshp) |
| + | static CURLcode ssh_state_sftp_readdir_link(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp) |
| { | |
| CURLcode result; | |
| int rc = | |
| @@ -2460,28 +2412,23 @@ static int ssh_state_sftp_readdir_link(struct Curl_easy *data, | |
| curlx_dyn_len(&sshp->readdir_link), | |
| sshp->readdir_filename, | |
| CURL_PATH_MAX, LIBSSH2_SFTP_READLINK); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| curlx_dyn_free(&sshp->readdir_link); | |
| /* append filename and extra output */ | |
| - | result = curlx_dyn_addf(&sshp->readdir, " -> %s", |
| - | sshp->readdir_filename); |
| - | |
| - | if(result) { |
| + | result = curlx_dyn_addf(&sshp->readdir, " -> %s", sshp->readdir_filename); |
| + | if(result) |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| - | sshc->actualcode = result; |
| - | return ERROR_LIBBSH2; |
| - | } |
| - | |
| - | myssh_state(data, sshc, SSH_SFTP_READDIR_BOTTOM); |
| - | return 0; |
| + | else |
| + | myssh_state(data, sshc, SSH_SFTP_READDIR_BOTTOM); |
| + | return result; |
| } | |
| - | static int ssh_state_scp_download_init(struct Curl_easy *data, |
| - | struct ssh_conn *sshc, |
| - | struct SSHPROTO *sshp) |
| + | static CURLcode ssh_state_scp_download_init(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp) |
| { | |
| curl_off_t bytecount; | |
| @@ -2512,16 +2459,14 @@ static int ssh_state_scp_download_init(struct Curl_easy *data, | |
| char *err_msg = NULL; | |
| if(libssh2_session_last_errno(sshc->ssh_session) == | |
| - | LIBSSH2_ERROR_EAGAIN) { |
| - | return LIBSSH2_ERROR_EAGAIN; |
| - | } |
| + | LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| ssh_err = (int)(libssh2_session_last_error(sshc->ssh_session, | |
| &err_msg, NULL, 0)); | |
| failf(data, "%s", err_msg); | |
| myssh_state(data, sshc, SSH_SCP_CHANNEL_FREE); | |
| - | sshc->actualcode = libssh2_session_error_to_CURLE(ssh_err); |
| - | return ERROR_LIBBSH2; |
| + | return libssh2_session_error_to_CURLE(ssh_err); |
| } | |
| /* download data */ | |
| @@ -2538,19 +2483,19 @@ static int ssh_state_scp_download_init(struct Curl_easy *data, | |
| data->state.select_bits = CURL_CSELECT_IN; | |
| myssh_state(data, sshc, SSH_STOP); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_close(struct Curl_easy *data, |
| - | struct ssh_conn *sshc, |
| - | struct SSHPROTO *sshp) |
| + | static CURLcode ssh_state_sftp_close(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp) |
| { | |
| int rc = 0; | |
| if(sshc->sftp_handle) { | |
| rc = libssh2_sftp_close(sshc->sftp_handle); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| if(rc < 0) { | |
| char *err_msg = NULL; | |
| (void)libssh2_session_last_error(sshc->ssh_session, | |
| @@ -2575,10 +2520,10 @@ static int ssh_state_sftp_close(struct Curl_easy *data, | |
| else | |
| myssh_state(data, sshc, SSH_STOP); | |
| - | return rc; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_shutdown(struct Curl_easy *data, |
| + | static CURLcode ssh_state_sftp_shutdown(struct Curl_easy *data, |
| struct ssh_conn *sshc) | |
| { | |
| /* during times we get here due to a broken transfer and then the | |
| @@ -2587,9 +2532,9 @@ static int ssh_state_sftp_shutdown(struct Curl_easy *data, | |
| int rc = 0; | |
| if(sshc->sftp_handle) { | |
| rc = libssh2_sftp_close(sshc->sftp_handle); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| if(rc < 0) { | |
| char *err_msg = NULL; | |
| (void)libssh2_session_last_error(sshc->ssh_session, &err_msg, | |
| @@ -2600,9 +2545,9 @@ static int ssh_state_sftp_shutdown(struct Curl_easy *data, | |
| } | |
| if(sshc->sftp_session) { | |
| rc = libssh2_sftp_shutdown(sshc->sftp_session); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| if(rc < 0) { | |
| infof(data, "Failed to stop libssh2 sftp subsystem"); | |
| } | |
| @@ -2612,12 +2557,12 @@ static int ssh_state_sftp_shutdown(struct Curl_easy *data, | |
| Curl_safefree(sshc->homedir); | |
| myssh_state(data, sshc, SSH_SESSION_DISCONNECT); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_sftp_download_init(struct Curl_easy *data, |
| - | struct ssh_conn *sshc, |
| - | struct SSHPROTO *sshp) |
| + | static CURLcode ssh_state_sftp_download_init(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp) |
| { | |
| /* | |
| * Work on getting the specified file | |
| @@ -2629,26 +2574,23 @@ static int ssh_state_sftp_download_init(struct Curl_easy *data, | |
| LIBSSH2_SFTP_OPENFILE); | |
| if(!sshc->sftp_handle) { | |
| unsigned long sftperr; | |
| - | CURLcode result; |
| if(libssh2_session_last_errno(sshc->ssh_session) == | |
| LIBSSH2_ERROR_EAGAIN) { | |
| - | return LIBSSH2_ERROR_EAGAIN; |
| + | return CURLE_AGAIN; |
| } | |
| sftperr = libssh2_sftp_last_error(sshc->sftp_session); | |
| failf(data, "Could not open remote file for reading: %s", | |
| sftp_libssh2_strerror(sftperr)); | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| - | result = sftp_libssh2_error_to_CURLE(sftperr); |
| - | sshc->actualcode = result ? result : CURLE_SSH; |
| - | return ERROR_LIBBSH2; |
| + | return sftp_libssh2_error_to_CURLE(sftperr); |
| } | |
| myssh_state(data, sshc, SSH_SFTP_DOWNLOAD_STAT); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_scp_upload_init(struct Curl_easy *data, |
| - | struct ssh_conn *sshc, |
| - | struct SSHPROTO *sshp) |
| + | static CURLcode ssh_state_scp_upload_init(struct Curl_easy *data, |
| + | struct ssh_conn *sshc, |
| + | struct SSHPROTO *sshp) |
| { | |
| /* | |
| * libssh2 requires that the destination path is a full path that | |
| @@ -2663,22 +2605,22 @@ static int ssh_state_scp_upload_init(struct Curl_easy *data, | |
| if(!sshc->ssh_channel) { | |
| int ssh_err; | |
| char *err_msg = NULL; | |
| - | |
| + | CURLcode result; |
| if(libssh2_session_last_errno(sshc->ssh_session) == | |
| - | LIBSSH2_ERROR_EAGAIN) { |
| - | return LIBSSH2_ERROR_EAGAIN; |
| - | } |
| + | LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| ssh_err = (int)(libssh2_session_last_error(sshc->ssh_session, | |
| &err_msg, NULL, 0)); | |
| failf(data, "%s", err_msg); | |
| myssh_state(data, sshc, SSH_SCP_CHANNEL_FREE); | |
| - | sshc->actualcode = libssh2_session_error_to_CURLE(ssh_err); |
| + | result = libssh2_session_error_to_CURLE(ssh_err); |
| + | |
| /* Map generic errors to upload failed */ | |
| - | if(sshc->actualcode == CURLE_SSH || |
| - | sshc->actualcode == CURLE_REMOTE_FILE_NOT_FOUND) |
| - | sshc->actualcode = CURLE_UPLOAD_FAILED; |
| - | return ERROR_LIBBSH2; |
| + | if(result == CURLE_SSH || |
| + | result == CURLE_REMOTE_FILE_NOT_FOUND) |
| + | result = CURLE_UPLOAD_FAILED; |
| + | return result; |
| } | |
| /* upload data */ | |
| @@ -2700,11 +2642,11 @@ static int ssh_state_scp_upload_init(struct Curl_easy *data, | |
| myssh_state(data, sshc, SSH_STOP); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| - | static int ssh_state_session_disconnect(struct Curl_easy *data, |
| - | struct ssh_conn *sshc) |
| + | static CURLcode ssh_state_session_disconnect(struct Curl_easy *data, |
| + | struct ssh_conn *sshc) |
| { | |
| /* during weird times when we have been prematurely aborted, the channel | |
| is still alive when we reach this state and we MUST kill the channel | |
| @@ -2712,9 +2654,9 @@ static int ssh_state_session_disconnect(struct Curl_easy *data, | |
| int rc = 0; | |
| if(sshc->ssh_channel) { | |
| rc = libssh2_channel_free(sshc->ssh_channel); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_OK; |
| + | |
| if(rc < 0) { | |
| char *err_msg = NULL; | |
| (void)libssh2_session_last_error(sshc->ssh_session, | |
| @@ -2727,9 +2669,9 @@ static int ssh_state_session_disconnect(struct Curl_easy *data, | |
| if(sshc->ssh_session) { | |
| rc = libssh2_session_disconnect(sshc->ssh_session, "Shutdown"); | |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| - | return rc; |
| - | } |
| + | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | return CURLE_AGAIN; |
| + | |
| if(rc < 0) { | |
| char *err_msg = NULL; | |
| (void)libssh2_session_last_error(sshc->ssh_session, | |
| @@ -2742,7 +2684,7 @@ static int ssh_state_session_disconnect(struct Curl_easy *data, | |
| Curl_safefree(sshc->homedir); | |
| myssh_state(data, sshc, SSH_SESSION_FREE); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| /* | |
| * ssh_statemachine() runs the SSH state machine as far as it can without | |
| @@ -2758,49 +2700,48 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, | |
| { | |
| CURLcode result = CURLE_OK; | |
| struct connectdata *conn = data->conn; | |
| - | int rc = LIBSSH2_ERROR_NONE; |
| *block = 0; /* we are not blocking by default */ | |
| do { | |
| switch(sshc->state) { | |
| case SSH_INIT: | |
| - | rc = ssh_state_init(data, sshc); |
| - | if(rc) |
| + | result = ssh_state_init(data, sshc); |
| + | if(result) |
| break; | |
| FALLTHROUGH(); | |
| case SSH_S_STARTUP: | |
| - | rc = ssh_state_startup(data, sshc); |
| - | if(rc) |
| + | result = ssh_state_startup(data, sshc); |
| + | if(result) |
| break; | |
| FALLTHROUGH(); | |
| case SSH_HOSTKEY: | |
| - | rc = ssh_state_hostkey(data, sshc); |
| + | result = ssh_state_hostkey(data, sshc); |
| break; | |
| case SSH_AUTHLIST: | |
| - | rc = ssh_state_authlist(data, sshc); |
| + | result = ssh_state_authlist(data, sshc); |
| break; | |
| case SSH_AUTH_PKEY_INIT: | |
| - | rc = ssh_state_pkey_init(data, sshc); |
| + | result = ssh_state_pkey_init(data, sshc); |
| break; | |
| case SSH_AUTH_PKEY: | |
| - | rc = ssh_state_auth_pkey(data, sshc); |
| + | result = ssh_state_auth_pkey(data, sshc); |
| break; | |
| case SSH_AUTH_PASS_INIT: | |
| - | rc = ssh_state_auth_pass_init(data, sshc); |
| + | result = ssh_state_auth_pass_init(data, sshc); |
| break; | |
| case SSH_AUTH_PASS: | |
| - | rc = ssh_state_auth_pass(data, sshc); |
| + | result = ssh_state_auth_pass(data, sshc); |
| break; | |
| case SSH_AUTH_HOST_INIT: | |
| - | rc = ssh_state_auth_host_init(data, sshc); |
| + | result = ssh_state_auth_host_init(data, sshc); |
| break; | |
| case SSH_AUTH_HOST: | |
| @@ -2808,83 +2749,83 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, | |
| break; | |
| case SSH_AUTH_AGENT_INIT: | |
| - | rc = ssh_state_auth_agent_init(data, sshc); |
| + | result = ssh_state_auth_agent_init(data, sshc); |
| break; | |
| case SSH_AUTH_AGENT_LIST: | |
| - | rc = ssh_state_auth_agent_list(data, sshc); |
| + | result = ssh_state_auth_agent_list(data, sshc); |
| break; | |
| case SSH_AUTH_AGENT: | |
| - | rc = ssh_state_auth_agent(data, sshc); |
| + | result = ssh_state_auth_agent(data, sshc); |
| break; | |
| case SSH_AUTH_KEY_INIT: | |
| - | rc = ssh_state_auth_key_init(data, sshc); |
| + | result = ssh_state_auth_key_init(data, sshc); |
| break; | |
| case SSH_AUTH_KEY: | |
| - | rc = ssh_state_auth_key(data, sshc); |
| + | result = ssh_state_auth_key(data, sshc); |
| break; | |
| case SSH_AUTH_DONE: | |
| - | rc = ssh_state_auth_done(data, sshc); |
| + | result = ssh_state_auth_done(data, sshc); |
| break; | |
| case SSH_SFTP_INIT: | |
| - | rc = ssh_state_sftp_init(data, sshc); |
| + | result = ssh_state_sftp_init(data, sshc); |
| break; | |
| case SSH_SFTP_REALPATH: | |
| - | rc = ssh_state_sftp_realpath(data, sshc, sshp); |
| + | result = ssh_state_sftp_realpath(data, sshc, sshp); |
| break; | |
| case SSH_SFTP_QUOTE_INIT: | |
| - | rc = ssh_state_sftp_quote_init(data, sshc, sshp); |
| + | result = ssh_state_sftp_quote_init(data, sshc, sshp); |
| break; | |
| case SSH_SFTP_POSTQUOTE_INIT: | |
| - | rc = ssh_state_sftp_postquote_init(data, sshc); |
| + | result = ssh_state_sftp_postquote_init(data, sshc); |
| break; | |
| case SSH_SFTP_QUOTE: | |
| - | rc = ssh_state_sftp_quote(data, sshc, sshp); |
| + | result = ssh_state_sftp_quote(data, sshc, sshp); |
| break; | |
| case SSH_SFTP_NEXT_QUOTE: | |
| - | rc = ssh_state_sftp_next_quote(data, sshc); |
| + | result = ssh_state_sftp_next_quote(data, sshc); |
| break; | |
| case SSH_SFTP_QUOTE_STAT: | |
| - | rc = ssh_state_sftp_quote_stat(data, sshc, sshp, block); |
| + | result = ssh_state_sftp_quote_stat(data, sshc, sshp, block); |
| break; | |
| case SSH_SFTP_QUOTE_SETSTAT: | |
| - | rc = ssh_state_sftp_quote_setstat(data, sshc, sshp); |
| + | result = ssh_state_sftp_quote_setstat(data, sshc, sshp); |
| break; | |
| case SSH_SFTP_QUOTE_SYMLINK: | |
| - | rc = ssh_state_sftp_quote_symlink(data, sshc); |
| + | result = ssh_state_sftp_quote_symlink(data, sshc); |
| break; | |
| case SSH_SFTP_QUOTE_MKDIR: | |
| - | rc = ssh_state_sftp_quote_mkdir(data, sshc); |
| + | result = ssh_state_sftp_quote_mkdir(data, sshc); |
| break; | |
| case SSH_SFTP_QUOTE_RENAME: | |
| - | rc = ssh_state_sftp_quote_rename(data, sshc); |
| + | result = ssh_state_sftp_quote_rename(data, sshc); |
| break; | |
| case SSH_SFTP_QUOTE_RMDIR: | |
| - | rc = ssh_state_sftp_quote_rmdir(data, sshc); |
| + | result = ssh_state_sftp_quote_rmdir(data, sshc); |
| break; | |
| case SSH_SFTP_QUOTE_UNLINK: | |
| - | rc = ssh_state_sftp_quote_unlink(data, sshc); |
| + | result = ssh_state_sftp_quote_unlink(data, sshc); |
| break; | |
| case SSH_SFTP_QUOTE_STATVFS: | |
| - | rc = ssh_state_sftp_quote_statvfs(data, sshc); |
| + | result = ssh_state_sftp_quote_statvfs(data, sshc); |
| break; | |
| case SSH_SFTP_GETINFO: | |
| @@ -2900,10 +2841,11 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, | |
| { | |
| LIBSSH2_SFTP_ATTRIBUTES attrs; | |
| - | rc = libssh2_sftp_stat_ex(sshc->sftp_session, sshp->path, |
| - | curlx_uztoui(strlen(sshp->path)), |
| - | LIBSSH2_SFTP_STAT, &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) { | |
| + | result = CURLE_AGAIN; |
| break; | |
| } | |
| if(rc == 0) { | |
| @@ -2930,7 +2872,6 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, | |
| if(result) { | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| sshc->nextstate = SSH_NO_STATE; | |
| - | sshc->actualcode = result; |
| } | |
| break; | |
| @@ -2957,24 +2898,22 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, | |
| break; | |
| case SSH_SFTP_CREATE_DIRS_MKDIR: | |
| - | rc = ssh_state_sftp_create_dirs_mkdir(data, sshc, sshp); |
| + | result = ssh_state_sftp_create_dirs_mkdir(data, sshc, sshp); |
| break; | |
| case SSH_SFTP_READDIR_INIT: | |
| - | rc = ssh_state_sftp_readdir_init(data, sshc, sshp); |
| + | result = ssh_state_sftp_readdir_init(data, sshc, sshp); |
| break; | |
| case SSH_SFTP_READDIR: | |
| result = sftp_readdir(data, sshc, sshp, block); | |
| if(result) { | |
| - | sshc->actualcode = result; |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| - | rc = ERROR_LIBBSH2; |
| } | |
| break; | |
| case SSH_SFTP_READDIR_LINK: | |
| - | rc = ssh_state_sftp_readdir_link(data, sshc, sshp); |
| + | result = ssh_state_sftp_readdir_link(data, sshc, sshp); |
| break; | |
| case SSH_SFTP_READDIR_BOTTOM: | |
| @@ -2985,7 +2924,6 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, | |
| curlx_dyn_len(&sshp->readdir)); | |
| if(result) { | |
| - | sshc->actualcode = result; |
| curlx_dyn_free(&sshp->readdir); | |
| myssh_state(data, sshc, SSH_STOP); | |
| } | |
| @@ -2996,20 +2934,19 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, | |
| break; | |
| case SSH_SFTP_READDIR_DONE: | |
| - | if(libssh2_sftp_closedir(sshc->sftp_handle) == |
| - | LIBSSH2_ERROR_EAGAIN) { |
| - | rc = LIBSSH2_ERROR_EAGAIN; |
| - | break; |
| - | } |
| - | sshc->sftp_handle = NULL; |
| + | if(libssh2_sftp_closedir(sshc->sftp_handle) == LIBSSH2_ERROR_EAGAIN) |
| + | result = CURLE_AGAIN; |
| + | else { |
| + | sshc->sftp_handle = NULL; |
| - | /* no data to transfer */ |
| - | Curl_xfer_setup_nop(data); |
| - | myssh_state(data, sshc, SSH_STOP); |
| + | /* no data to transfer */ |
| + | Curl_xfer_setup_nop(data); |
| + | myssh_state(data, sshc, SSH_STOP); |
| + | } |
| break; | |
| case SSH_SFTP_DOWNLOAD_INIT: | |
| - | rc = ssh_state_sftp_download_init(data, sshc, sshp); |
| + | result = ssh_state_sftp_download_init(data, sshc, sshp); |
| break; | |
| case SSH_SFTP_DOWNLOAD_STAT: | |
| @@ -3017,22 +2954,20 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, | |
| if(result) { | |
| myssh_state(data, sshc, SSH_SFTP_CLOSE); | |
| sshc->nextstate = SSH_NO_STATE; | |
| - | sshc->actualcode = result; |
| } | |
| break; | |
| case SSH_SFTP_CLOSE: | |
| - | rc = ssh_state_sftp_close(data, sshc, sshp); |
| + | result = ssh_state_sftp_close(data, sshc, sshp); |
| break; | |
| case SSH_SFTP_SHUTDOWN: | |
| - | rc = ssh_state_sftp_shutdown(data, sshc); |
| + | result = ssh_state_sftp_shutdown(data, sshc); |
| break; | |
| case SSH_SCP_TRANS_INIT: | |
| result = Curl_getworkingpath(data, sshc->homedir, &sshp->path); | |
| if(result) { | |
| - | sshc->actualcode = result; |
| myssh_state(data, sshc, SSH_STOP); | |
| break; | |
| } | |
| @@ -3040,7 +2975,7 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, | |
| if(data->state.upload) { | |
| if(data->state.infilesize < 0) { | |
| failf(data, "SCP requires a known file size for upload"); | |
| - | sshc->actualcode = CURLE_UPLOAD_FAILED; |
| + | result = CURLE_UPLOAD_FAILED; |
| myssh_state(data, sshc, SSH_SCP_CHANNEL_FREE); | |
| break; | |
| } | |
| @@ -3052,11 +2987,11 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, | |
| break; | |
| case SSH_SCP_UPLOAD_INIT: | |
| - | rc = ssh_state_scp_upload_init(data, sshc, sshp); |
| + | result = ssh_state_scp_upload_init(data, sshc, sshp); |
| break; | |
| case SSH_SCP_DOWNLOAD_INIT: | |
| - | rc = ssh_state_scp_download_init(data, sshc, sshp); |
| + | result = ssh_state_scp_download_init(data, sshc, sshp); |
| break; | |
| case SSH_SCP_DONE: | |
| @@ -3068,8 +3003,9 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, | |
| case SSH_SCP_SEND_EOF: | |
| if(sshc->ssh_channel) { | |
| - | rc = libssh2_channel_send_eof(sshc->ssh_channel); |
| + | int rc = libssh2_channel_send_eof(sshc->ssh_channel); |
| if(rc == LIBSSH2_ERROR_EAGAIN) { | |
| + | result = CURLE_AGAIN; |
| break; | |
| } | |
| if(rc) { | |
| @@ -3085,8 +3021,9 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, | |
| case SSH_SCP_WAIT_EOF: | |
| if(sshc->ssh_channel) { | |
| - | rc = libssh2_channel_wait_eof(sshc->ssh_channel); |
| + | int rc = libssh2_channel_wait_eof(sshc->ssh_channel); |
| if(rc == LIBSSH2_ERROR_EAGAIN) { | |
| + | result = CURLE_AGAIN; |
| break; | |
| } | |
| if(rc) { | |
| @@ -3101,8 +3038,9 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, | |
| case SSH_SCP_WAIT_CLOSE: | |
| if(sshc->ssh_channel) { | |
| - | rc = libssh2_channel_wait_closed(sshc->ssh_channel); |
| + | int rc = libssh2_channel_wait_closed(sshc->ssh_channel); |
| if(rc == LIBSSH2_ERROR_EAGAIN) { | |
| + | result = CURLE_AGAIN; |
| break; | |
| } | |
| if(rc) { | |
| @@ -3117,8 +3055,9 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, | |
| case SSH_SCP_CHANNEL_FREE: | |
| if(sshc->ssh_channel) { | |
| - | rc = libssh2_channel_free(sshc->ssh_channel); |
| + | int rc = libssh2_channel_free(sshc->ssh_channel); |
| if(rc == LIBSSH2_ERROR_EAGAIN) { | |
| + | result = CURLE_AGAIN; |
| break; | |
| } | |
| if(rc < 0) { | |
| @@ -3131,45 +3070,41 @@ static CURLcode ssh_statemachine(struct Curl_easy *data, | |
| sshc->ssh_channel = NULL; | |
| } | |
| DEBUGF(infof(data, "SCP DONE phase complete")); | |
| - | #if 0 /* PREV */ |
| - | myssh_state(data, sshc, SSH_SESSION_DISCONNECT); |
| - | #endif |
| myssh_state(data, sshc, SSH_STOP); | |
| break; | |
| case SSH_SESSION_DISCONNECT: | |
| - | rc = ssh_state_session_disconnect(data, sshc); |
| + | result = ssh_state_session_disconnect(data, sshc); |
| break; | |
| case SSH_SESSION_FREE: | |
| - | rc = sshc_cleanup(sshc, data, FALSE); |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) |
| + | result = sshc_cleanup(sshc, data, FALSE); |
| + | if(result) |
| break; | |
| /* the code we are about to return */ | |
| memset(sshc, 0, sizeof(struct ssh_conn)); | |
| connclose(conn, "SSH session free"); | |
| sshc->state = SSH_SESSION_FREE; /* current */ | |
| - | sshc->nextstate = SSH_NO_STATE; |
| myssh_state(data, sshc, SSH_STOP); | |
| break; | |
| case SSH_QUIT: | |
| default: | |
| /* internal error */ | |
| - | sshc->nextstate = SSH_NO_STATE; |
| myssh_state(data, sshc, SSH_STOP); | |
| break; | |
| } | |
| - | } while(!rc && (sshc->state != SSH_STOP)); |
| + | } while(!result && (sshc->state != SSH_STOP)); |
| - | if(rc == LIBSSH2_ERROR_EAGAIN) { |
| + | if(result == CURLE_AGAIN) { |
| /* we would block, we need to wait for the socket to be ready (in the | |
| right direction too)! */ | |
| *block = TRUE; | |
| + | result = CURLE_OK; |
| } | |
| - | return sshc->actualcode; |
| + | return result; |
| } | |
| /* called by the multi interface to figure out what socket(s) to wait for and | |
| @@ -3655,8 +3590,6 @@ static CURLcode ssh_do(struct Curl_easy *data, bool *done) | |
| return CURLE_FAILED_INIT; | |
| data->req.size = -1; /* make sure this is unknown at this point */ | |
| - | |
| - | sshc->actualcode = CURLE_OK; /* reset error code */ |
| sshc->secondCreateDirs = 0; /* reset the create dir attempt state | |
| variable */ | |
| @@ -3673,8 +3606,8 @@ static CURLcode ssh_do(struct Curl_easy *data, bool *done) | |
| return result; | |
| } | |
| - | static int sshc_cleanup(struct ssh_conn *sshc, struct Curl_easy *data, |
| - | bool block) |
| + | static CURLcode sshc_cleanup(struct ssh_conn *sshc, struct Curl_easy *data, |
| + | bool block) |
| { | |
| int rc; | |
| @@ -3686,9 +3619,9 @@ static int sshc_cleanup(struct ssh_conn *sshc, struct Curl_easy *data, | |
| if(sshc->ssh_agent) { | |
| rc = libssh2_agent_disconnect(sshc->ssh_agent); | |
| - | if(!block && (rc == LIBSSH2_ERROR_EAGAIN)) { |
| - | return rc; |
| - | } |
| + | if(!block && (rc == LIBSSH2_ERROR_EAGAIN)) |
| + | return CURLE_AGAIN; |
| + | |
| if((rc < 0) && data) { | |
| char *err_msg = NULL; | |
| (void)libssh2_session_last_error(sshc->ssh_session, | |
| @@ -3707,9 +3640,9 @@ static int sshc_cleanup(struct ssh_conn *sshc, struct Curl_easy *data, | |
| if(sshc->sftp_handle) { | |
| rc = libssh2_sftp_close(sshc->sftp_handle); | |
| - | if(!block && (rc == LIBSSH2_ERROR_EAGAIN)) { |
| - | return rc; |
| - | } |
| + | if(!block && (rc == LIBSSH2_ERROR_EAGAIN)) |
| + | return CURLE_AGAIN; |
| + | |
| if((rc < 0) && data) { | |
| char *err_msg = NULL; | |
| (void)libssh2_session_last_error(sshc->ssh_session, &err_msg, | |
| @@ -3721,9 +3654,9 @@ static int sshc_cleanup(struct ssh_conn *sshc, struct Curl_easy *data, | |
| if(sshc->ssh_channel) { | |
| rc = libssh2_channel_free(sshc->ssh_channel); | |
| - | if(!block && (rc == LIBSSH2_ERROR_EAGAIN)) { |
| - | return rc; |
| - | } |
| + | if(!block && (rc == LIBSSH2_ERROR_EAGAIN)) |
| + | return CURLE_AGAIN; |
| + | |
| if((rc < 0) && data) { | |
| char *err_msg = NULL; | |
| (void)libssh2_session_last_error(sshc->ssh_session, | |
| @@ -3736,9 +3669,9 @@ static int sshc_cleanup(struct ssh_conn *sshc, struct Curl_easy *data, | |
| if(sshc->sftp_session) { | |
| rc = libssh2_sftp_shutdown(sshc->sftp_session); | |
| - | if(!block && (rc == LIBSSH2_ERROR_EAGAIN)) { |
| - | return rc; |
| - | } |
| + | if(!block && (rc == LIBSSH2_ERROR_EAGAIN)) |
| + | return CURLE_AGAIN; |
| + | |
| if((rc < 0) && data) | |
| infof(data, "Failed to stop libssh2 sftp subsystem"); | |
| sshc->sftp_session = NULL; | |
| @@ -3746,9 +3679,9 @@ static int sshc_cleanup(struct ssh_conn *sshc, struct Curl_easy *data, | |
| if(sshc->ssh_session) { | |
| rc = libssh2_session_free(sshc->ssh_session); | |
| - | if(!block && (rc == LIBSSH2_ERROR_EAGAIN)) { |
| - | return rc; |
| - | } |
| + | if(!block && (rc == LIBSSH2_ERROR_EAGAIN)) |
| + | return CURLE_AGAIN; |
| + | |
| if((rc < 0) && data) { | |
| char *err_msg = NULL; | |
| (void)libssh2_session_last_error(sshc->ssh_session, | |
| @@ -3773,7 +3706,7 @@ static int sshc_cleanup(struct ssh_conn *sshc, struct Curl_easy *data, | |
| Curl_safefree(sshc->homedir); | |
| sshc->initialised = FALSE; | |
| } | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
| @@ -3796,7 +3729,7 @@ static CURLcode scp_disconnect(struct Curl_easy *data, | |
| } | |
| if(sshc) | |
| - | sshc_cleanup(sshc, data, TRUE); |
| + | return sshc_cleanup(sshc, data, TRUE); |
| return result; | |
| } | |
| @@ -148,7 +148,6 @@ struct ssh_conn { | |
| char *rsa; /* strdup'ed private key file */ | |
| sshstate state; /* always use ssh.c:state() to change state! */ | |
| sshstate nextstate; /* the state to goto after stopping */ | |
| - | CURLcode actualcode; /* the actual error code */ |
| struct curl_slist *quote_item; /* for the quote option */ | |
| char *quote_path1; /* two generic pointers for the QUOTE stuff */ | |
| char *quote_path2; | |
| @@ -164,6 +163,7 @@ struct ssh_conn { | |
| char *slash_pos; /* used by the SFTP_CREATE_DIRS state */ | |
| #if defined(USE_LIBSSH) | |
| + | CURLcode actualcode; /* the actual error code */ |
| char *readdir_linkPath; | |
| size_t readdir_len; | |
| struct dynbuf readdir_buf; | |
| @@ -208,6 +208,7 @@ struct ssh_conn { | |
| struct libssh2_agent_publickey *sshagent_prev_identity; | |
| LIBSSH2_KNOWNHOSTS *kh; | |
| #elif defined(USE_WOLFSSH) | |
| + | CURLcode actualcode; /* the actual error code */ |
| WOLFSSH *ssh_session; | |
| WOLFSSH_CTX *ctx; | |
| word32 handleSz; | |