nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix for `hostname-whitespace'; thanks to Justin Bradford.

Browse Source 
[originally from svn r2080]
This commit is contained in:
Simon Tatham 2002-10-16 11:35:13 +00:00
parent 5bc8f34f58
commit a24d9d3029
4 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plink.c
View File

@ -458,6 +458,21 @@ int main(int argc, char **argv)
*/ */
cfg.host[strcspn(cfg.host, ":")] = '\0'; cfg.host[strcspn(cfg.host, ":")] = '\0';
/*
* Remove any remaining whitespace from the hostname.
*/
{
int p1 = 0, p2 = 0;
while (cfg.host[p2] != '\0') {
if (cfg.host[p2] != ' ' && cfg.host[p2] != '\t') {
cfg.host[p1] = cfg.host[p2];
p1++;
}
p2++;
}
cfg.host[p1] = '\0';
}
if (!*cfg.remote_cmd_ptr) if (!*cfg.remote_cmd_ptr)
flags |= FLAG_INTERACTIVE; flags |= FLAG_INTERACTIVE;

15
psftp.c
View File

@ -1745,6 +1745,21 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
*/ */
cfg.host[strcspn(cfg.host, ":")] = '\0'; cfg.host[strcspn(cfg.host, ":")] = '\0';
/*
* Remove any remaining whitespace from the hostname.
*/
{
int p1 = 0, p2 = 0;
while (cfg.host[p2] != '\0') {
if (cfg.host[p2] != ' ' && cfg.host[p2] != '\t') {
cfg.host[p1] = cfg.host[p2];
p1++;
}
p2++;
}
cfg.host[p1] = '\0';
}
/* Set username */ /* Set username */
if (user != NULL && user[0] != '\0') { if (user != NULL && user[0] != '\0') {
strncpy(cfg.username, user, sizeof(cfg.username) - 1); strncpy(cfg.username, user, sizeof(cfg.username) - 1);

15
scp.c
View File

@ -512,6 +512,21 @@ static void do_cmd(char *host, char *user, char *cmd)
*/ */
cfg.host[strcspn(cfg.host, ":")] = '\0'; cfg.host[strcspn(cfg.host, ":")] = '\0';
/*
* Remove any remaining whitespace from the hostname.
*/
{
int p1 = 0, p2 = 0;
while (cfg.host[p2] != '\0') {
if (cfg.host[p2] != ' ' && cfg.host[p2] != '\t') {
cfg.host[p1] = cfg.host[p2];
p1++;
}
p2++;
}
cfg.host[p1] = '\0';
}
/* Set username */ /* Set username */
if (user != NULL && user[0] != '\0') { if (user != NULL && user[0] != '\0') {
strncpy(cfg.username, user, sizeof(cfg.username) - 1); strncpy(cfg.username, user, sizeof(cfg.username) - 1);

15
window.c
View File

@ -430,6 +430,21 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
* Trim a colon suffix off the hostname if it's there. * Trim a colon suffix off the hostname if it's there.
*/ */
cfg.host[strcspn(cfg.host, ":")] = '\0'; cfg.host[strcspn(cfg.host, ":")] = '\0';
/*
* Remove any remaining whitespace from the hostname.
*/
{
int p1 = 0, p2 = 0;
while (cfg.host[p2] != '\0') {
if (cfg.host[p2] != ' ' && cfg.host[p2] != '\t') {
cfg.host[p1] = cfg.host[p2];
p1++;
}
p2++;
}
cfg.host[p1] = '\0';
}
} }
/* /*