Add Norman Brandinger's suggested `-m' option in plink, to read the

[u/mdw/putty] / scp.c

diff --git a/scp.c b/scp.c
index a4c0303..2d02191 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+#include <assert.h>
 /* GUI Adaptation - Sept 2000 */
 #include <winuser.h>
 #include <winbase.h>
@@ -74,9 +75,18 @@ static void send_str_msg(unsigned int msg_id, char *str);
 static void gui_update_stats(char *name, unsigned long size,
                              int percentage, unsigned long elapsed);
 
-void begin_session(void) { }
 void logevent(char *string) { }
 
+void ldisc_send(char *buf, int len) {
+    /*
+     * This is only here because of the calls to ldisc_send(NULL,
+     * 0) in ssh.c. Nothing in PSCP actually needs to use the ldisc
+     * as an ldisc. So if we get called with any real data, I want
+     * to know about it.
+     */
+    assert(len == 0);
+}
+
 void verify_ssh_host_key(char *host, int port, char *keytype,
                          char *keystr, char *fingerprint) {
     int ret;
@@ -299,8 +309,8 @@ void from_backend(int is_stderr, char *data, int datalen) {
     if (len > 0) {
         if (pendsize < pendlen + len) {
             pendsize = pendlen + len + 4096;
-            pending = (pending ? realloc(pending, pendsize) :
-                       malloc(pendsize));
+            pending = (pending ? srealloc(pending, pendsize) :
+                       smalloc(pendsize));
             if (!pending)
                 fatalbox("Out of memory");
         }
@@ -327,7 +337,7 @@ static int ssh_scp_recv(unsigned char *buf, int len) {
         pendlen -= pendused;
         if (pendlen == 0) {
             pendsize = 0;
-            free(pending);
+            sfree(pending);
             pending = NULL;
         }
         if (outlen == 0)
@@ -385,12 +395,12 @@ static void bump(char *fmt, ...)
     exit(1);
 }
 
-static int get_password(const char *prompt, char *str, int maxlen)
+static int get_line(const char *prompt, char *str, int maxlen, int is_pw)
 {
     HANDLE hin, hout;
-    DWORD savemode, i;
+    DWORD savemode, newmode, i;
 
-    if (password) {
+    if (is_pw && password) {
         static int tried_once = 0;
 
         if (tried_once) {
@@ -413,8 +423,12 @@ static int get_password(const char *prompt, char *str, int maxlen)
            bump("Cannot get standard input/output handles");
 
        GetConsoleMode(hin, &savemode);
-       SetConsoleMode(hin, (savemode & (~ENABLE_ECHO_INPUT)) |
-                      ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT);
+        newmode = savemode | ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT;
+        if (is_pw)
+            newmode &= ~ENABLE_ECHO_INPUT;
+        else
+            newmode |= ENABLE_ECHO_INPUT;
+        SetConsoleMode(hin, newmode);
 
        WriteFile(hout, prompt, strlen(prompt), &i, NULL);
        ReadFile(hin, str, maxlen-1, &i, NULL);
@@ -424,7 +438,8 @@ static int get_password(const char *prompt, char *str, int maxlen)
        if ((int)i > maxlen) i = maxlen-1; else i = i - 2;
        str[i] = '\0';
 
-       WriteFile(hout, "\r\n", 2, &i, NULL);
+       if (is_pw)
+            WriteFile(hout, "\r\n", 2, &i, NULL);
     }
 
     return 1;
@@ -436,6 +451,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 +471,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 = smalloc(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)
@@ -1180,8 +1204,16 @@ static void usage(void)
     printf("  -v        show verbose messages\n");
     printf("  -P port   connect to specified port\n");
     printf("  -pw passw login with specified password\n");
-    /* GUI Adaptation - Sept 2000 */
+#if 0
+    /*
+     * -gui is an internal option, used by GUI front ends to get
+     * pscp to pass progress reports back to them. It's not an
+     * ordinary user-accessible option, so it shouldn't be part of
+     * the command-line help. The only people who need to know
+     * about it are programmers, and they can read the source.
+     */
     printf("  -gui hWnd GUI mode with the windows handle for receiving messages\n");
+#endif
     exit(1);
 }
 
@@ -1196,7 +1228,7 @@ int main(int argc, char *argv[])
     default_protocol = PROT_TELNET;
 
     flags = FLAG_STDERR;
-    ssh_get_password = &get_password;
+    ssh_get_line = &get_line;
     init_winsock();
     sk_init();