diff options
| author | Andreas Schneider <mail@cynapses.org> | 2010-05-12 13:08:45 +0200 |
|---|---|---|
| committer | Andreas Schneider <mail@cynapses.org> | 2010-05-12 13:11:33 +0200 |
| commit | a009702cd6ae5954d666869a1861ecb7e59bc2b5 (patch) | |
| tree | dd1c80d59ae90f5997ae2ce3b4968bc16d056512 /libssh/misc.c | |
| parent | ed268e59485f3249c7c0e44add5c991e4c6769ef (diff) | |
Fixed Windows build warnings.
Diffstat (limited to 'libssh/misc.c')
| -rw-r--r-- | libssh/misc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libssh/misc.c b/libssh/misc.c index c3ebfd27..4b562c71 100644 --- a/libssh/misc.c +++ b/libssh/misc.c @@ -35,6 +35,7 @@ #ifdef _WIN32 #define _WIN32_IE 0x0501 //SHGetSpecialFolderPath #include <winsock2.h> // Must be the first to include +#include <ws2tcpip.h> #include <shlobj.h> #include <direct.h> #else @@ -503,7 +504,8 @@ int ssh_mkdir(const char *pathname, mode_t mode) { * @return The expanded directory, NULL on error. */ char *ssh_path_expand_tilde(const char *d) { - char *h, *r, *p; + char *h, *r; + const char *p; size_t ld; size_t lh = 0; @@ -515,6 +517,9 @@ char *ssh_path_expand_tilde(const char *d) { /* handle ~user/path */ p = strchr(d, '/'); if (p != NULL && p > d) { +#ifdef _WIN32 + return strdup(d); +#else struct passwd *pw; size_t s = p - d; char u[128]; @@ -530,6 +535,7 @@ char *ssh_path_expand_tilde(const char *d) { } ld = strlen(p); h = strdup(pw->pw_dir); +#endif } else { ld = strlen(d); p = (char *) d; |
