lib: Move lib/ssh.h -> lib/vssh/ssh.h

Follow-up to 5b2d703 which moved ssh source files to vssh.

Closes https://github.com/curl/curl/pull/4609

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 72ef428ee66f9a26dd51b58fe1070bdd9be4380d..3a561d4d181099d4a24a9ce078de2c5265d4c0b0 100644 (file)
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -43,6 +43,8 @@ LIB_VQUIC_HFILES = vquic/ngtcp2.h vquic/quiche.h
 
 LIB_VSSH_CFILES = vssh/libssh2.c vssh/libssh.c
 
+LIB_VSSH_HFILES = vssh/ssh.h
+
 LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c   \
   cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c       \
   ldap.c version.c getenv.c escape.c mprintf.c telnet.c netrc.c         \
@@ -72,7 +74,7 @@ LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \
   http_negotiate.h inet_pton.h amigaos.h strtoofft.h strerror.h         \
   inet_ntop.h curlx.h curl_memory.h curl_setup.h transfer.h select.h    \
   easyif.h multiif.h parsedate.h tftp.h sockaddr.h splay.h strdup.h     \
-  socks.h ssh.h curl_base64.h curl_addrinfo.h curl_sspi.h      \
+  socks.h curl_base64.h curl_addrinfo.h curl_sspi.h                     \
   slist.h nonblock.h curl_memrchr.h imap.h pop3.h smtp.h pingpong.h     \
   rtsp.h curl_threads.h warnless.h curl_hmac.h curl_rtmp.h              \
   curl_gethostname.h gopher.h http_proxy.h non-ascii.h asyn.h           \
@@ -89,4 +91,4 @@ LIB_RCFILES = libcurl.rc
 CSOURCES = $(LIB_CFILES) $(LIB_VAUTH_CFILES) $(LIB_VTLS_CFILES) \
   $(LIB_VQUIC_CFILES) $(LIB_VSSH_CFILES)
 HHEADERS = $(LIB_HFILES) $(LIB_VAUTH_HFILES) $(LIB_VTLS_HFILES) \
-  $(LIB_VQUIC_HFILES)
+  $(LIB_VQUIC_HFILES) $(LIB_VSSH_HFILES)

diff --git a/lib/easy.c b/lib/easy.c
index fc5eceb6a2ef523e3e16ebc0d9629da84d8c1b38..1d02c0cc1dbe704ae4c76e8e61966083869bd077 100644 (file)
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -72,7 +72,7 @@
 #include "warnless.h"
 #include "multiif.h"
 #include "sigpipe.h"
-#include "ssh.h"
+#include "vssh/ssh.h"
 #include "setopt.h"
 #include "http_digest.h"
 #include "system_win32.h"

diff --git a/lib/sendf.c b/lib/sendf.c
index 5913ea4060ef4f3c3a29c2b1a9c2aaae6bacfee2..000fbb164165fb93460a7131baed4a01b32aee91 100644 (file)
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -36,7 +36,7 @@
 #include "sendf.h"
 #include "connect.h"
 #include "vtls/vtls.h"
-#include "ssh.h"
+#include "vssh/ssh.h"
 #include "easyif.h"
 #include "multiif.h"
 #include "non-ascii.h"

diff --git a/lib/url.c b/lib/url.c
index 4f4120146adc8d3ed402df39c159ce759407ac0b..99a8b13599b2d9cf65397bf9e1f9a96cf6f73863 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -106,7 +106,7 @@ bool curl_win32_idn_to_ascii(const char *in, char **out);
 #include "http2.h"
 #include "file.h"
 #include "curl_ldap.h"
-#include "ssh.h"
+#include "vssh/ssh.h"
 #include "imap.h"
 #include "url.h"
 #include "connect.h"

diff --git a/lib/urldata.h b/lib/urldata.h
index f9365b2e683987a92331b25e0a205750501460f7..da7e58f454526bde3183e04c703532dc4a231d6d 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -124,7 +124,7 @@ typedef ssize_t (Curl_recv)(struct connectdata *conn, /* connection data */
 #include "smtp.h"
 #include "ftp.h"
 #include "file.h"
-#include "ssh.h"
+#include "vssh/ssh.h"
 #include "http.h"
 #include "rtsp.h"
 #include "smb.h"

diff --git a/lib/version.c b/lib/version.c
index cfd09e36d72badcd1c86454bb8501f14d3f99468..6405d369d7cdec816af9134db26a6bcb08b36390 100644 (file)
--- a/lib/version.c
+++ b/lib/version.c
@@ -26,7 +26,7 @@
 #include "urldata.h"
 #include "vtls/vtls.h"
 #include "http2.h"
-#include "ssh.h"
+#include "vssh/ssh.h"
 #include "quic.h"
 #include "curl_printf.h"
 

diff --git a/lib/ssh.h b/lib/vssh/ssh.h
similarity index 100%
rename from lib/ssh.h
rename to lib/vssh/ssh.h