From 696400a67220b5c2617d0d55920a420d861b4ce2 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Fri, 27 Oct 2000 09:24:32 +0000 Subject: [PATCH] Stop the "Sent username %s" message coming up twice in pscp -v [originally from svn r772] --- ssh.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ssh.c b/ssh.c index 3eddd7bb..29dd3fab 100644 --- a/ssh.c +++ b/ssh.c @@ -1255,20 +1255,20 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) c_write("\r\n", 2); username[strcspn(username, "\n\r")] = '\0'; } else { - char stuff[200]; strncpy(username, cfg.username, 99); username[99] = '\0'; - if ((flags & FLAG_VERBOSE) || (flags & FLAG_INTERACTIVE)) { - sprintf(stuff, "Sent username \"%s\".\r\n", username); - c_write(stuff, strlen(stuff)); - } } send_packet(SSH1_CMSG_USER, PKT_STR, username, PKT_END); { - char userlog[20+sizeof(username)]; + char userlog[22+sizeof(username)]; sprintf(userlog, "Sent username \"%s\"", username); logevent(userlog); + if (flags & FLAG_INTERACTIVE && + (!((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE)))) { + strcat(userlog, "\r\n"); + c_write(userlog, strlen(userlog)); + } } }