Fossil SCM
Make "plink" the default ssh client on Windows, no matter what win32 compiler fossil was compiled with.
Commit
e6d7b35a2469fba345255d06c877ea7923d6ff52
Parent
2e51be8ec2df7cd…
1 file changed
+3
-3
+3
-3
| --- src/http_transport.c | ||
| +++ src/http_transport.c | ||
| @@ -77,12 +77,12 @@ | ||
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /* |
| 80 | 80 | ** Default SSH command |
| 81 | 81 | */ |
| 82 | -#ifdef __MINGW32__ | |
| 83 | -static char zDefaultSshCmd[] = "ssh -T"; | |
| 82 | +#ifdef _WIN32 | |
| 83 | +static char zDefaultSshCmd[] = "plink -ssh -T"; | |
| 84 | 84 | #else |
| 85 | 85 | static char zDefaultSshCmd[] = "ssh -e none -T"; |
| 86 | 86 | #endif |
| 87 | 87 | |
| 88 | 88 | /* |
| @@ -99,11 +99,11 @@ | ||
| 99 | 99 | |
| 100 | 100 | socket_ssh_resolve_addr(pUrlData); |
| 101 | 101 | zSsh = db_get("ssh-command", zDefaultSshCmd); |
| 102 | 102 | blob_init(&zCmd, zSsh, -1); |
| 103 | 103 | if( pUrlData->port!=pUrlData->dfltPort && pUrlData->port ){ |
| 104 | -#ifdef __MINGW32__ | |
| 104 | +#ifdef _WIN32 | |
| 105 | 105 | blob_appendf(&zCmd, " -P %d", pUrlData->port); |
| 106 | 106 | #else |
| 107 | 107 | blob_appendf(&zCmd, " -p %d", pUrlData->port); |
| 108 | 108 | #endif |
| 109 | 109 | } |
| 110 | 110 |
| --- src/http_transport.c | |
| +++ src/http_transport.c | |
| @@ -77,12 +77,12 @@ | |
| 77 | } |
| 78 | |
| 79 | /* |
| 80 | ** Default SSH command |
| 81 | */ |
| 82 | #ifdef __MINGW32__ |
| 83 | static char zDefaultSshCmd[] = "ssh -T"; |
| 84 | #else |
| 85 | static char zDefaultSshCmd[] = "ssh -e none -T"; |
| 86 | #endif |
| 87 | |
| 88 | /* |
| @@ -99,11 +99,11 @@ | |
| 99 | |
| 100 | socket_ssh_resolve_addr(pUrlData); |
| 101 | zSsh = db_get("ssh-command", zDefaultSshCmd); |
| 102 | blob_init(&zCmd, zSsh, -1); |
| 103 | if( pUrlData->port!=pUrlData->dfltPort && pUrlData->port ){ |
| 104 | #ifdef __MINGW32__ |
| 105 | blob_appendf(&zCmd, " -P %d", pUrlData->port); |
| 106 | #else |
| 107 | blob_appendf(&zCmd, " -p %d", pUrlData->port); |
| 108 | #endif |
| 109 | } |
| 110 |
| --- src/http_transport.c | |
| +++ src/http_transport.c | |
| @@ -77,12 +77,12 @@ | |
| 77 | } |
| 78 | |
| 79 | /* |
| 80 | ** Default SSH command |
| 81 | */ |
| 82 | #ifdef _WIN32 |
| 83 | static char zDefaultSshCmd[] = "plink -ssh -T"; |
| 84 | #else |
| 85 | static char zDefaultSshCmd[] = "ssh -e none -T"; |
| 86 | #endif |
| 87 | |
| 88 | /* |
| @@ -99,11 +99,11 @@ | |
| 99 | |
| 100 | socket_ssh_resolve_addr(pUrlData); |
| 101 | zSsh = db_get("ssh-command", zDefaultSshCmd); |
| 102 | blob_init(&zCmd, zSsh, -1); |
| 103 | if( pUrlData->port!=pUrlData->dfltPort && pUrlData->port ){ |
| 104 | #ifdef _WIN32 |
| 105 | blob_appendf(&zCmd, " -P %d", pUrlData->port); |
| 106 | #else |
| 107 | blob_appendf(&zCmd, " -p %d", pUrlData->port); |
| 108 | #endif |
| 109 | } |
| 110 |