From: Jay Satiro <raysatiro@yahoo.com>
Date: Sat, 12 Mar 2022 23:48:18 +0000 (-0500)
Subject: libssh: Improve fix for missing SSH_S_ stat macros
X-Git-Tag: curl-7_83_0~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d55fb4675ffe3b34de92171de64ef3990dac438;p=thirdparty%2Fcurl.git

libssh: Improve fix for missing SSH_S_ stat macros

- If building libcurl against an old libssh version missing SSH_S_IFMT
  and SSH_S_IFLNK then use the values from a supported version.

Prior to this change if libssh did not define SSH_S_IFMT and SSH_S_IFLNK
then S_IFMT and S_IFLNK, respectively, were used instead. The problem
with that is the user's S_ stat macros don't have the same values across
platforms. For example Windows has values different from Linux.

Follow-up to 7b0fd39.

Ref: https://github.com/curl/curl/pull/8511#discussion_r815292391
Ref: https://github.com/curl/curl/pull/8574

Closes https://github.com/curl/curl/pull/8588
---

diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c
index 0d265a0d3a..957b938fc8 100644
--- a/lib/vssh/libssh.c
+++ b/lib/vssh/libssh.c
@@ -105,11 +105,12 @@
   } while(0)
 #endif
 
+/* These stat values may not be the same as the user's S_IFMT / S_IFLNK */
 #ifndef SSH_S_IFMT
-#define SSH_S_IFMT S_IFMT
+#define SSH_S_IFMT   00170000
 #endif
 #ifndef SSH_S_IFLNK
-#define SSH_S_IFLNK S_IFLNK
+#define SSH_S_IFLNK  0120000
 #endif
 
 /* Local functions: */