From f5e6a5c6dcefee95163f75ca6121255e22f87a2d Mon Sep 17 00:00:00 2001 From: simon Date: Sun, 7 Jan 2001 13:31:49 +0000 Subject: [PATCH] Patch from Christian Biesinger: pscp guesses your Windows username by default git-svn-id: svn://svn.tartarus.org/sgt/putty@836 cda61777-01e9-0310-a592-d414129be87e --- scp.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scp.c b/scp.c index 77dd7da3..89d77502 100644 --- a/scp.c +++ b/scp.c @@ -436,6 +436,7 @@ static int get_password(const char *prompt, char *str, int maxlen) static void do_cmd(char *host, char *user, char *cmd) { char *err, *realhost; + DWORD namelen; if (host == NULL || host[0] == '\0') bump("Empty host name"); @@ -455,7 +456,15 @@ static void do_cmd(char *host, char *user, char *cmd) strncpy(cfg.username, user, sizeof(cfg.username)-1); cfg.username[sizeof(cfg.username)-1] = '\0'; } else if (cfg.username[0] == '\0') { - bump("Empty user name"); + namelen = 0; + if (GetUserName(user, &namelen) == FALSE) + bump("Empty user name"); + user = malloc(namelen * sizeof(char)); + GetUserName(user, &namelen); + if (verbose) tell_user(stderr, "Guessing user name: %s", user); + strncpy(cfg.username, user, sizeof(cfg.username)-1); + cfg.username[sizeof(cfg.username)-1] = '\0'; + free(user); } if (cfg.protocol != PROT_SSH) -- 2.11.0