X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/dcbde23605bb045df116a1dd522d4ddb4d9288fa..bace54316e12bf47756c5c53cd97baf533d95db5:/scp.c

diff --git a/scp.c b/scp.c
index 77dd7da3..fcd5e1a7 100644
--- 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;
@@ -436,6 +446,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 +466,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 +1199,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);
 }