X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/7f1f80deed773457b474c04e6dd41a890ab4284a..4017be6d5375063f59b63474490ac072e7f09b1a:/scp.c

diff --git a/scp.c b/scp.c
index ac232fa5..68eca580 100644
--- a/scp.c
+++ b/scp.c
@@ -1,6 +1,6 @@
 /*
  *  scp.c  -  Scp (Secure Copy) client for PuTTY.
- *  Joris van Rantwijk, Aug 1999, Nov 1999.
+ *  Joris van Rantwijk, Simon Tatham
  *
  *  This is mainly based on ssh-1.2.26/scp.c by Timo Rinne & Tatu Ylonen.
  *  They, in turn, used stuff from BSD rcp.
@@ -22,7 +22,7 @@
 #define TIME_WIN_TO_POSIX(ft, t) ((t) = (unsigned long) \
 	((*(LONGLONG*)&(ft)) / (LONGLONG) 10000000 - (LONGLONG) 11644473600))
 
-int verbose = 0;
+static int verbose = 0;
 static int recursive = 0;
 static int preserve = 0;
 static int targetshouldbedirectory = 0;
@@ -37,6 +37,14 @@ static void rsource(char *src);
 static void sink(char *targ);
 
 /*
+ *  This function is needed to link with ssh.c, but it never gets called.
+ */
+void term_out(void)
+{
+    abort();
+}
+
+/*
  *  Print an error message and perform a fatal exit.
  */
 void fatalbox(char *fmt, ...)
@@ -63,22 +71,28 @@ static void bump(char *fmt, ...)
     va_end(ap);
     if (connection_open) {
 	char ch;
-	ssh_send_eof();
-	ssh_recv(&ch, 1);
+	ssh_scp_send_eof();
+	ssh_scp_recv(&ch, 1);
     }
     exit(1);
 }
 
-void ssh_get_password(char *prompt, char *str, int maxlen)
+static int get_password(const char *prompt, char *str, int maxlen)
 {
     HANDLE hin, hout;
     DWORD savemode, i;
 
     if (password) {
-	strncpy(str, password, maxlen);
-	str[maxlen-1] = '\0';
-	password = NULL;
-	return;
+        static int tried_once = 0;
+
+        if (tried_once) {
+            return 0;
+        } else {
+            strncpy(str, password, maxlen);
+            str[maxlen-1] = '\0';
+            tried_once = 1;
+            return 1;
+        }
     }
 
     hin = GetStdHandle(STD_INPUT_HANDLE);
@@ -99,6 +113,8 @@ void ssh_get_password(char *prompt, char *str, int maxlen)
     str[i] = '\0';
 
     WriteFile(hout, "\r\n", 2, &i, NULL);
+
+    return 1;
 }
 
 /*
@@ -120,14 +136,10 @@ static void do_cmd(char *host, char *user, char *cmd)
 	cfg.port = 22;
     }
 
-    if (portnumber)
-	cfg.port = portnumber;
-
     /* Set username */
     if (user != NULL && user[0] != '\0') {
 	strncpy(cfg.username, user, sizeof(cfg.username)-1);
 	cfg.username[sizeof(cfg.username)-1] = '\0';
-	cfg.port = 22;
     } else if (cfg.username[0] == '\0') {
 	bump("Empty user name");
     }
@@ -135,7 +147,10 @@ static void do_cmd(char *host, char *user, char *cmd)
     if (cfg.protocol != PROT_SSH)
 	cfg.port = 22;
 
-    err = ssh_init(cfg.host, cfg.port, cmd, &realhost);
+    if (portnumber)
+	cfg.port = portnumber;
+
+    err = ssh_scp_init(cfg.host, cfg.port, cmd, &realhost);
     if (err != NULL)
 	bump("ssh_init: %s", err);
     if (verbose && realhost != NULL)
@@ -179,7 +194,7 @@ static void print_stats(char *name, unsigned long size, unsigned long done,
 
 /*
  *  Find a colon in str and return a pointer to the colon.
- *  This is used to seperate hostname from filename.
+ *  This is used to separate hostname from filename.
  */
 static char * colon(char *str)
 {
@@ -210,7 +225,7 @@ static int response(void)
     char ch, resp, rbuf[2048];
     int p;
 
-    if (ssh_recv(&resp, 1) <= 0)
+    if (ssh_scp_recv(&resp, 1) <= 0)
 	bump("Lost connection");
 
     p = 0;
@@ -223,7 +238,7 @@ static int response(void)
       case 1:		/* error */
       case 2:		/* fatal error */
 	do {
-	    if (ssh_recv(&ch, 1) <= 0)
+	    if (ssh_scp_recv(&ch, 1) <= 0)
 		bump("Protocol error: Lost connection");
 	    rbuf[p++] = ch;
 	} while (p < sizeof(rbuf) && ch != '\n');
@@ -250,7 +265,7 @@ static void run_err(const char *fmt, ...)
     strcpy(str, "\01scp: ");
     vsprintf(str+strlen(str), fmt, ap);
     strcat(str, "\n");
-    ssh_send(str, strlen(str));
+    ssh_scp_send(str, strlen(str));
     vfprintf(stderr, fmt, ap);
     fprintf(stderr, "\n");
     va_end(ap);
@@ -271,7 +286,7 @@ static void source(char *src)
     time_t stat_starttime, stat_lasttime;
 
     attr = GetFileAttributes(src);
-    if (attr == -1) {
+    if (attr == (DWORD)-1) {
 	run_err("%s: No such file or directory", src);
 	return;
     }
@@ -311,7 +326,7 @@ static void source(char *src)
     f = CreateFile(src, GENERIC_READ, FILE_SHARE_READ, NULL,
 		   OPEN_EXISTING, 0, 0);
     if (f == INVALID_HANDLE_VALUE) {
-	run_err("%s: Cannot open file");
+	run_err("%s: Cannot open file", src);
 	return;
     }
 
@@ -322,7 +337,7 @@ static void source(char *src)
 	TIME_WIN_TO_POSIX(actime, atime);
 	TIME_WIN_TO_POSIX(wrtime, mtime);
 	sprintf(buf, "T%lu 0 %lu 0\n", mtime, atime);
-	ssh_send(buf, strlen(buf));
+	ssh_scp_send(buf, strlen(buf));
 	if (response())
 	    return;
     }
@@ -331,7 +346,7 @@ static void source(char *src)
     sprintf(buf, "C0644 %lu %s\n", size, last);
     if (verbose)
 	fprintf(stderr, "Sending file modes: %s", buf);
-    ssh_send(buf, strlen(buf));
+    ssh_scp_send(buf, strlen(buf));
     if (response())
 	return;
 
@@ -349,7 +364,7 @@ static void source(char *src)
 	    if (statistics) printf("\n");
 	    bump("%s: Read error", src);
 	}
-	ssh_send(transbuf, k);
+	ssh_scp_send(transbuf, k);
 	if (statistics) {
 	    stat_bytes += k;
 	    if (time(NULL) != stat_lasttime ||
@@ -362,7 +377,7 @@ static void source(char *src)
     }
     CloseHandle(f);
 
-    ssh_send("", 1);
+    ssh_scp_send("", 1);
     (void) response();
 }
 
@@ -391,7 +406,7 @@ static void rsource(char *src)
     sprintf(buf, "D0755 0 %s\n", last);
     if (verbose)
 	fprintf(stderr, "Entering directory: %s", buf);
-    ssh_send(buf, strlen(buf));
+    ssh_scp_send(buf, strlen(buf));
     if (response())
 	return;
 
@@ -413,7 +428,7 @@ static void rsource(char *src)
     FindClose(dir);
 
     sprintf(buf, "E\n");
-    ssh_send(buf, strlen(buf));
+    ssh_scp_send(buf, strlen(buf));
     (void) response();
 }
 
@@ -426,7 +441,7 @@ static void sink(char *targ)
     char namebuf[2048];
     char ch;
     int targisdir = 0;
-    int settime = 0;
+    int settime;
     int exists;
     DWORD attr;
     HANDLE f;
@@ -439,24 +454,24 @@ static void sink(char *targ)
     char *stat_name;
 
     attr = GetFileAttributes(targ);
-    if (attr != -1 && (attr & FILE_ATTRIBUTE_DIRECTORY) != 0)
+    if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_DIRECTORY) != 0)
 	targisdir = 1;
 
     if (targetshouldbedirectory && !targisdir)
 	bump("%s: Not a directory", targ);
 
-    ssh_send("", 1);
+    ssh_scp_send("", 1);
     while (1) {
 	settime = 0;
 	gottime:
-	if (ssh_recv(&ch, 1) <= 0)
+	if (ssh_scp_recv(&ch, 1) <= 0)
 	    return;
 	if (ch == '\n')
 	    bump("Protocol error: Unexpected newline");
 	i = 0;
 	buf[i++] = ch;
 	do {
-	    if (ssh_recv(&ch, 1) <= 0)
+	    if (ssh_scp_recv(&ch, 1) <= 0)
 		bump("Lost connection");
 	    buf[i++] = ch;
 	} while (i < sizeof(buf) && ch != '\n');
@@ -469,13 +484,13 @@ static void sink(char *targ)
 	  case '\02':	/* fatal error */
 	    bump("%s", buf+1);
 	  case 'E':
-	    ssh_send("", 1);
+	    ssh_scp_send("", 1);
 	    return;
 	  case 'T':
 	    if (sscanf(buf, "T%ld %*d %ld %*d",
 		       &mtime, &atime) == 2) {
 		settime = 1;
-		ssh_send("", 1);
+		ssh_scp_send("", 1);
 		goto gottime;
 	    }
 	    bump("Protocol error: Illegal time format");
@@ -499,7 +514,7 @@ static void sink(char *targ)
 	    strcpy(namebuf, targ);
 	}
 	attr = GetFileAttributes(namebuf);
-	exists = (attr != -1);
+	exists = (attr != (DWORD)-1);
 
 	if (buf[0] == 'D') {
 	    if (exists && (attr & FILE_ATTRIBUTE_DIRECTORY) == 0) {
@@ -525,7 +540,7 @@ static void sink(char *targ)
 	    continue;
 	}
 
-	ssh_send("", 1);
+	ssh_scp_send("", 1);
 
 	if (statistics) {
 	    stat_bytes = 0;
@@ -541,9 +556,9 @@ static void sink(char *targ)
 
 	for (i = 0; i < size; i += 4096) {
 	    char transbuf[4096];
-	    int j, k = 4096;
+	    DWORD j, k = 4096;
 	    if (i + k > size) k = size - i;
-	    if (ssh_recv(transbuf, k) == 0)
+	    if (ssh_scp_recv(transbuf, k) == 0)
 		bump("Lost connection");
 	    if (wrerror) continue;
 	    if (! WriteFile(f, transbuf, k, &j, NULL) || j != k) {
@@ -578,7 +593,7 @@ static void sink(char *targ)
 	    run_err("%s: Write error", namebuf);
 	    continue;
 	}
-	ssh_send("", 1);
+	ssh_scp_send("", 1);
     }
 }
 
@@ -593,7 +608,7 @@ static void toremote(int argc, char *argv[])
 
     targ = argv[argc-1];
 
-    /* Seperate host from filename */
+    /* Separate host from filename */
     host = targ;
     targ = colon(targ);
     if (targ == NULL)
@@ -603,7 +618,7 @@ static void toremote(int argc, char *argv[])
 	targ = ".";
     /* Substitute "." for emtpy target */
 
-    /* Seperate host and username */
+    /* Separate host and username */
     user = host;
     host = strrchr(host, '@');
     if (host == NULL) {
@@ -695,7 +710,7 @@ static void tolocal(int argc, char *argv[])
     src = argv[0];
     targ = argv[1];
 
-    /* Seperate host from filename */
+    /* Separate host from filename */
     host = src;
     src = colon(src);
     if (src == NULL)
@@ -705,7 +720,7 @@ static void tolocal(int argc, char *argv[])
 	src = ".";
     /* Substitute "." for empty filename */
 
-    /* Seperate username and hostname */
+    /* Separate username and hostname */
     user = host;
     host = strrchr(host, '@');
     if (host == NULL) {
@@ -731,9 +746,62 @@ static void tolocal(int argc, char *argv[])
 }
 
 /*
+ *  We will issue a list command to get a remote directory.
+ */
+static void get_dir_list(int argc, char *argv[])
+{
+    char *src, *host, *user;
+    char *cmd, *p, *q;
+    char c;
+
+    src = argv[0];
+
+    /* Separate host from filename */
+    host = src;
+    src = colon(src);
+    if (src == NULL)
+	bump("Local to local copy not supported");
+    *src++ = '\0';
+    if (*src == '\0')
+	src = ".";
+    /* Substitute "." for empty filename */
+
+    /* Separate username and hostname */
+    user = host;
+    host = strrchr(host, '@');
+    if (host == NULL) {
+	host = user;
+	user = NULL;
+    } else {
+	*host++ = '\0';
+	if (*user == '\0')
+	    user = NULL;
+    }
+
+    cmd = smalloc(4*strlen(src) + 100);
+    strcpy(cmd, "ls -la '");
+    p = cmd + strlen(cmd);
+    for (q = src; *q; q++) {
+	if (*q == '\'') {
+	    *p++ = '\''; *p++ = '\\'; *p++ = '\''; *p++ = '\'';
+	} else {
+	    *p++ = *q;
+	}
+    }
+    *p++ = '\'';
+    *p = '\0';
+    
+    do_cmd(host, user, cmd);
+    sfree(cmd);
+
+    while (ssh_scp_recv(&c, 1) > 0)
+	fputc(c, stdout);	       /* thank heavens for buffered I/O */
+}
+
+/*
  *  Initialize the Win$ock driver.
  */
-static void init_winsock()
+static void init_winsock(void)
 {
     WORD winsock_ver;
     WSADATA wsadata;
@@ -749,12 +817,13 @@ static void init_winsock()
 /*
  *  Short description of parameters.
  */
-static void usage()
+static void usage(void)
 {
     printf("PuTTY Secure Copy client\n");
     printf("%s\n", ver);
-    printf("Usage: scp [options] [user@]host:source target\n");
-    printf("       scp [options] source [source...] [user@]host:target\n");
+    printf("Usage: pscp [options] [user@]host:source target\n");
+    printf("       pscp [options] source [source...] [user@]host:target\n");
+    printf("       pscp [options] -ls user@host:filespec\n");
     printf("Options:\n");
     printf("  -p        preserve file attributes\n");
     printf("  -q        quiet, don't show statistics\n");
@@ -771,14 +840,19 @@ static void usage()
 int main(int argc, char *argv[])
 {
     int i;
+    int list = 0;
 
+    default_protocol = PROT_TELNET;
+
+    flags = 0;
+    ssh_get_password = &get_password;
     init_winsock();
 
     for (i = 1; i < argc; i++) {
 	if (argv[i][0] != '-')
 	    break;
 	if (strcmp(argv[i], "-v") == 0)
-	    verbose = 1;
+	    verbose = 1, flags |= FLAG_VERBOSE;
 	else if (strcmp(argv[i], "-r") == 0)
 	    recursive = 1;
 	else if (strcmp(argv[i], "-p") == 0)
@@ -792,6 +866,8 @@ int main(int argc, char *argv[])
 	    portnumber = atoi(argv[++i]);
 	else if (strcmp(argv[i], "-pw") == 0 && i+1 < argc)
 	    password = argv[++i];
+	else if (strcmp(argv[i], "-ls") == 0)
+	    list = 1;
 	else if (strcmp(argv[i], "--") == 0)
 	{ i++; break; }
 	else
@@ -800,20 +876,28 @@ int main(int argc, char *argv[])
     argc -= i;
     argv += i;
 
-    if (argc < 2)
-	usage();
-    if (argc > 2)
-	targetshouldbedirectory = 1;
+    if (list) {
+	if (argc != 1)
+	    usage();
+	get_dir_list(argc, argv);
 
-    if (colon(argv[argc-1]) != NULL)
-	toremote(argc, argv);
-    else
-	tolocal(argc, argv);
+    } else {
+
+	if (argc < 2)
+	    usage();
+	if (argc > 2)
+	    targetshouldbedirectory = 1;
+
+	if (colon(argv[argc-1]) != NULL)
+	    toremote(argc, argv);
+	else
+	    tolocal(argc, argv);
+    }
 
     if (connection_open) {
 	char ch;
-	ssh_send_eof();
-	ssh_recv(&ch, 1);
+	ssh_scp_send_eof();
+	ssh_scp_recv(&ch, 1);
     }
     WSACleanup();
     random_save_seed();
@@ -822,3 +906,4 @@ int main(int argc, char *argv[])
 }
 
 /* end */
+