X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/486543a109b8b1ae0a893d3e96711de97c81a96c..8df7a775f6f8b0f81f84eafe28cd0bb8d4c6d1f4:/scp.c diff --git a/scp.c b/scp.c index f359c6e8..81f925bb 100644 --- a/scp.c +++ b/scp.c @@ -1,28 +1,51 @@ /* * 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. + * + * Adaptations to enable connecting a GUI by L. Gunnarsson - Sept 2000 */ #include +#ifndef AUTO_WINSOCK +#ifdef WINSOCK_TWO +#include +#else #include +#endif +#endif #include #include #include #include +/* GUI Adaptation - Sept 2000 */ +#include +#include #define PUTTY_DO_GLOBALS #include "putty.h" -#include "scp.h" +#include "winstuff.h" +#include "storage.h" #define TIME_POSIX_TO_WIN(t, ft) (*(LONGLONG*)&(ft) = \ ((LONGLONG) (t) + (LONGLONG) 11644473600) * (LONGLONG) 10000000) #define TIME_WIN_TO_POSIX(ft, t) ((t) = (unsigned long) \ ((*(LONGLONG*)&(ft)) / (LONGLONG) 10000000 - (LONGLONG) 11644473600)) -int verbose = 0; +/* GUI Adaptation - Sept 2000 */ +#define WM_APP_BASE 0x8000 +#define WM_STD_OUT_CHAR ( WM_APP_BASE+400 ) +#define WM_STD_ERR_CHAR ( WM_APP_BASE+401 ) +#define WM_STATS_CHAR ( WM_APP_BASE+402 ) +#define WM_STATS_SIZE ( WM_APP_BASE+403 ) +#define WM_STATS_PERCENT ( WM_APP_BASE+404 ) +#define WM_STATS_ELAPSED ( WM_APP_BASE+405 ) +#define WM_RET_ERR_CNT ( WM_APP_BASE+406 ) +#define WM_LS_RET_ERR_CNT ( WM_APP_BASE+407 ) + +static int verbose = 0; static int recursive = 0; static int preserve = 0; static int targetshouldbedirectory = 0; @@ -31,74 +54,380 @@ static int portnumber = 0; static char *password = NULL; static int errs = 0; static int connection_open = 0; +/* GUI Adaptation - Sept 2000 */ +#define NAME_STR_MAX 2048 +static char statname[NAME_STR_MAX+1]; +static unsigned long statsize = 0; +static int statperct = 0; +static time_t statelapsed = 0; +static int gui_mode = 0; +static char *gui_hwnd = NULL; static void source(char *src); static void rsource(char *src); -static void sink(char *targ); +static void sink(char *targ, char *src); +/* GUI Adaptation - Sept 2000 */ +static void tell_char(FILE *stream, char c); +static void tell_str(FILE *stream, char *str); +static void tell_user(FILE *stream, char *fmt, ...); +static void send_char_msg(unsigned int msg_id, char c); +static void send_str_msg(unsigned int msg_id, char *str); +static void gui_update_stats(char *name, unsigned long size, int percentage, time_t elapsed); + +void begin_session(void) { } +void logevent(char *string) { } + +void verify_ssh_host_key(char *host, int port, char *keytype, + char *keystr, char *fingerprint) { + int ret; + + static const char absentmsg[] = + "The server's host key is not cached in the registry. You\n" + "have no guarantee that the server is the computer you\n" + "think it is.\n" + "The server's key fingerprint is:\n" + "%s\n" + "If you trust this host, enter \"y\" to add the key to\n" + "PuTTY's cache and carry on connecting.\n" + "If you do not trust this host, enter \"n\" to abandon the\n" + "connection.\n" + "Continue connecting? (y/n) "; + + static const char wrongmsg[] = + "WARNING - POTENTIAL SECURITY BREACH!\n" + "The server's host key does not match the one PuTTY has\n" + "cached in the registry. This means that either the\n" + "server administrator has changed the host key, or you\n" + "have actually connected to another computer pretending\n" + "to be the server.\n" + "The new key fingerprint is:\n" + "%s\n" + "If you were expecting this change and trust the new key,\n" + "enter Yes to update PuTTY's cache and continue connecting.\n" + "If you want to carry on connecting but without updating\n" + "the cache, enter No.\n" + "If you want to abandon the connection completely, press\n" + "Return to cancel. Pressing Return is the ONLY guaranteed\n" + "safe choice.\n" + "Update cached key? (y/n, Return cancels connection) "; + + static const char abandoned[] = "Connection abandoned.\n"; + + char line[32]; + + /* + * Verify the key against the registry. + */ + ret = verify_host_key(host, port, keytype, keystr); + + if (ret == 0) /* success - key matched OK */ + return; + if (ret == 2) { /* key was different */ + fprintf(stderr, wrongmsg, fingerprint); + if (fgets(line, sizeof(line), stdin) && + line[0] != '\0' && line[0] != '\n') { + if (line[0] == 'y' || line[0] == 'Y') + store_host_key(host, port, keytype, keystr); + } else { + fprintf(stderr, abandoned); + exit(0); + } + } + if (ret == 1) { /* key was absent */ + fprintf(stderr, absentmsg, fingerprint); + if (fgets(line, sizeof(line), stdin) && + (line[0] == 'y' || line[0] == 'Y')) + store_host_key(host, port, keytype, keystr); + else { + fprintf(stderr, abandoned); + exit(0); + } + } +} + +/* GUI Adaptation - Sept 2000 */ +static void send_msg(HWND h, UINT message, WPARAM wParam) +{ + while (!PostMessage( h, message, wParam, 0)) + SleepEx(1000,TRUE); +} + +static void tell_char(FILE *stream, char c) +{ + if (!gui_mode) + fputc(c, stream); + else + { + unsigned int msg_id = WM_STD_OUT_CHAR; + if (stream == stderr) msg_id = WM_STD_ERR_CHAR; + send_msg( (HWND)atoi(gui_hwnd), msg_id, (WPARAM)c ); + } +} + +static void tell_str(FILE *stream, char *str) +{ + unsigned int i; + + for( i = 0; i < strlen(str); ++i ) + tell_char(stream, str[i]); +} + +static void tell_user(FILE *stream, char *fmt, ...) +{ + char str[0x100]; /* Make the size big enough */ + va_list ap; + va_start(ap, fmt); + vsprintf(str, fmt, ap); + va_end(ap); + strcat(str, "\n"); + tell_str(stream, str); +} + +static void gui_update_stats(char *name, unsigned long size, int percentage, time_t elapsed) +{ + unsigned int i; + + if (strcmp(name,statname) != 0) + { + for( i = 0; i < strlen(name); ++i ) + send_msg( (HWND)atoi(gui_hwnd), WM_STATS_CHAR, (WPARAM)name[i]); + send_msg( (HWND)atoi(gui_hwnd), WM_STATS_CHAR, (WPARAM)'\n' ); + strcpy(statname,name); + } + if (statsize != size) + { + send_msg( (HWND)atoi(gui_hwnd), WM_STATS_SIZE, (WPARAM)size ); + statsize = size; + } + if (statelapsed != elapsed) + { + send_msg( (HWND)atoi(gui_hwnd), WM_STATS_ELAPSED, (WPARAM)elapsed ); + statelapsed = elapsed; + } + if (statperct != percentage) + { + send_msg( (HWND)atoi(gui_hwnd), WM_STATS_PERCENT, (WPARAM)percentage ); + statperct = percentage; + } +} /* * Print an error message and perform a fatal exit. */ void fatalbox(char *fmt, ...) { + char str[0x100]; /* Make the size big enough */ va_list ap; va_start(ap, fmt); - fprintf(stderr, "Fatal: "); - vfprintf(stderr, fmt, ap); - fprintf(stderr, "\n"); + strcpy(str, "Fatal:"); + vsprintf(str+strlen(str), fmt, ap); va_end(ap); + strcat(str, "\n"); + tell_str(stderr, str); + exit(1); } +void connection_fatal(char *fmt, ...) +{ + char str[0x100]; /* Make the size big enough */ + va_list ap; + va_start(ap, fmt); + strcpy(str, "Fatal:"); + vsprintf(str+strlen(str), fmt, ap); + va_end(ap); + strcat(str, "\n"); + tell_str(stderr, str); + + exit(1); +} + +/* + * Be told what socket we're supposed to be using. + */ +static SOCKET scp_ssh_socket; +char *do_select(SOCKET skt, int startup) { + if (startup) + scp_ssh_socket = skt; + else + scp_ssh_socket = INVALID_SOCKET; + return NULL; +} +extern int select_result(WPARAM, LPARAM); + +/* + * Receive a block of data from the SSH link. Block until all data + * is available. + * + * To do this, we repeatedly call the SSH protocol module, with our + * own trap in from_backend() to catch the data that comes back. We + * do this until we have enough data. + */ + +static unsigned char *outptr; /* where to put the data */ +static unsigned outlen; /* how much data required */ +static unsigned char *pending = NULL; /* any spare data */ +static unsigned pendlen=0, pendsize=0; /* length and phys. size of buffer */ +void from_backend(int is_stderr, char *data, int datalen) { + unsigned char *p = (unsigned char *)data; + unsigned len = (unsigned)datalen; + + /* + * stderr data is just spouted to local stderr and otherwise + * ignored. + */ + if (is_stderr) { + fwrite(data, 1, len, stderr); + return; + } + + inbuf_head = 0; + + /* + * If this is before the real session begins, just return. + */ + if (!outptr) + return; + + if (outlen > 0) { + unsigned used = outlen; + if (used > len) used = len; + memcpy(outptr, p, used); + outptr += used; outlen -= used; + p += used; len -= used; + } + + if (len > 0) { + if (pendsize < pendlen + len) { + pendsize = pendlen + len + 4096; + pending = (pending ? realloc(pending, pendsize) : + malloc(pendsize)); + if (!pending) + fatalbox("Out of memory"); + } + memcpy(pending+pendlen, p, len); + pendlen += len; + } +} +static int ssh_scp_recv(unsigned char *buf, int len) { + outptr = buf; + outlen = len; + + /* + * See if the pending-input block contains some of what we + * need. + */ + if (pendlen > 0) { + unsigned pendused = pendlen; + if (pendused > outlen) + pendused = outlen; + memcpy(outptr, pending, pendused); + memmove(pending, pending+pendused, pendlen-pendused); + outptr += pendused; + outlen -= pendused; + pendlen -= pendused; + if (pendlen == 0) { + pendsize = 0; + free(pending); + pending = NULL; + } + if (outlen == 0) + return len; + } + + while (outlen > 0) { + fd_set readfds; + + FD_ZERO(&readfds); + FD_SET(scp_ssh_socket, &readfds); + if (select(1, &readfds, NULL, NULL, NULL) < 0) + return 0; /* doom */ + select_result((WPARAM)scp_ssh_socket, (LPARAM)FD_READ); + } + + return len; +} + +/* + * Loop through the ssh connection and authentication process. + */ +static void ssh_scp_init(void) { + if (scp_ssh_socket == INVALID_SOCKET) + return; + while (!back->sendok()) { + fd_set readfds; + FD_ZERO(&readfds); + FD_SET(scp_ssh_socket, &readfds); + if (select(1, &readfds, NULL, NULL, NULL) < 0) + return; /* doom */ + select_result((WPARAM)scp_ssh_socket, (LPARAM)FD_READ); + } +} /* * Print an error message and exit after closing the SSH link. */ static void bump(char *fmt, ...) { + char str[0x100]; /* Make the size big enough */ va_list ap; va_start(ap, fmt); - fprintf(stderr, "Fatal: "); - vfprintf(stderr, fmt, ap); - fprintf(stderr, "\n"); + strcpy(str, "Fatal:"); + vsprintf(str+strlen(str), fmt, ap); va_end(ap); + strcat(str, "\n"); + tell_str(stderr, str); + if (connection_open) { char ch; - ssh_send_eof(); - ssh_recv(&ch, 1); + back->special(TS_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); - hout = GetStdHandle(STD_OUTPUT_HANDLE); - if (hin == INVALID_HANDLE_VALUE || hout == INVALID_HANDLE_VALUE) - bump("Cannot get standard input/output handles"); + /* GUI Adaptation - Sept 2000 */ + if (gui_mode) { + if (maxlen>0) str[0] = '\0'; + } else { + hin = GetStdHandle(STD_INPUT_HANDLE); + hout = GetStdHandle(STD_OUTPUT_HANDLE); + if (hin == INVALID_HANDLE_VALUE || hout == INVALID_HANDLE_VALUE) + bump("Cannot get standard input/output handles"); + + GetConsoleMode(hin, &savemode); + SetConsoleMode(hin, (savemode & (~ENABLE_ECHO_INPUT)) | + ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT); - GetConsoleMode(hin, &savemode); - SetConsoleMode(hin, (savemode & (~ENABLE_ECHO_INPUT)) | - ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT); + WriteFile(hout, prompt, strlen(prompt), &i, NULL); + ReadFile(hin, str, maxlen-1, &i, NULL); - WriteFile(hout, prompt, strlen(prompt), &i, NULL); - ReadFile(hin, str, maxlen-1, &i, NULL); + SetConsoleMode(hin, savemode); - SetConsoleMode(hin, savemode); + if ((int)i > maxlen) i = maxlen-1; else i = i - 2; + str[i] = '\0'; - if ((int)i > maxlen) i = maxlen-1; else i = i - 2; - str[i] = '\0'; + WriteFile(hout, "\r\n", 2, &i, NULL); + } - WriteFile(hout, "\r\n", 2, &i, NULL); + return 1; } /* @@ -112,7 +441,7 @@ static void do_cmd(char *host, char *user, char *cmd) bump("Empty host name"); /* Try to load settings for this host */ - do_defaults(host); + do_defaults(host, &cfg); if (cfg.host[0] == '\0') { /* No settings for this host; use defaults */ strncpy(cfg.host, host, sizeof(cfg.host)-1); @@ -134,11 +463,18 @@ static void do_cmd(char *host, char *user, char *cmd) if (portnumber) cfg.port = portnumber; - err = ssh_init(cfg.host, cfg.port, cmd, &realhost); + strncpy(cfg.remote_cmd, cmd, sizeof(cfg.remote_cmd)); + cfg.remote_cmd[sizeof(cfg.remote_cmd)-1] = '\0'; + cfg.nopty = TRUE; + + back = &ssh_backend; + + err = back->init(cfg.host, cfg.port, &realhost); if (err != NULL) bump("ssh_init: %s", err); + ssh_scp_init(); if (verbose && realhost != NULL) - fprintf(stderr, "Connected to %s\n", realhost); + tell_user(stderr, "Connected to %s\n", realhost); connection_open = 1; } @@ -154,31 +490,36 @@ static void print_stats(char *name, unsigned long size, unsigned long done, char etastr[10]; int pct; - if (now > start) - ratebs = (float) done / (now - start); - else - ratebs = (float) done; + /* GUI Adaptation - Sept 2000 */ + if (gui_mode) + gui_update_stats(name, size, ((done *100) / size), now-start); + else { + if (now > start) + ratebs = (float) done / (now - start); + else + ratebs = (float) done; - if (ratebs < 1.0) - eta = size - done; - else - eta = (unsigned long) ((size - done) / ratebs); - sprintf(etastr, "%02ld:%02ld:%02ld", - eta / 3600, (eta % 3600) / 60, eta % 60); + if (ratebs < 1.0) + eta = size - done; + else + eta = (unsigned long) ((size - done) / ratebs); + sprintf(etastr, "%02ld:%02ld:%02ld", + eta / 3600, (eta % 3600) / 60, eta % 60); - pct = (int) (100.0 * (float) done / size); + pct = (int) (100.0 * (float) done / size); - printf("\r%-25.25s | %10ld kB | %5.1f kB/s | ETA: %8s | %3d%%", - name, done / 1024, ratebs / 1024.0, - etastr, pct); + printf("\r%-25.25s | %10ld kB | %5.1f kB/s | ETA: %8s | %3d%%", + name, done / 1024, ratebs / 1024.0, + etastr, pct); - if (done == size) - printf("\n"); + if (done == size) + printf("\n"); + } } /* * 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) { @@ -209,7 +550,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; @@ -222,13 +563,13 @@ 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'); rbuf[p-1] = '\0'; if (resp == 1) - fprintf(stderr, "%s\n", rbuf); + tell_user(stderr, "%s\n", rbuf); else bump("%s", rbuf); errs++; @@ -246,12 +587,11 @@ static void run_err(const char *fmt, ...) va_list ap; va_start(ap, fmt); errs++; - strcpy(str, "\01scp: "); + strcpy(str, "scp: "); vsprintf(str+strlen(str), fmt, ap); strcat(str, "\n"); - ssh_send(str, strlen(str)); - vfprintf(stderr, fmt, ap); - fprintf(stderr, "\n"); + back->send(str, strlen(str)); + tell_user(stderr, "%s",str); va_end(ap); } @@ -270,7 +610,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; } @@ -321,7 +661,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)); + back->send(buf, strlen(buf)); if (response()) return; } @@ -329,8 +669,8 @@ static void source(char *src) size = GetFileSize(f, NULL); sprintf(buf, "C0644 %lu %s\n", size, last); if (verbose) - fprintf(stderr, "Sending file modes: %s", buf); - ssh_send(buf, strlen(buf)); + tell_user(stderr, "Sending file modes: %s", buf); + back->send(buf, strlen(buf)); if (response()) return; @@ -348,7 +688,7 @@ static void source(char *src) if (statistics) printf("\n"); bump("%s: Read error", src); } - ssh_send(transbuf, k); + back->send(transbuf, k); if (statistics) { stat_bytes += k; if (time(NULL) != stat_lasttime || @@ -361,7 +701,7 @@ static void source(char *src) } CloseHandle(f); - ssh_send("", 1); + back->send("", 1); (void) response(); } @@ -389,8 +729,8 @@ 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)); + tell_user(stderr, "Entering directory: %s", buf); + back->send(buf, strlen(buf)); if (response()) return; @@ -412,20 +752,20 @@ static void rsource(char *src) FindClose(dir); sprintf(buf, "E\n"); - ssh_send(buf, strlen(buf)); + back->send(buf, strlen(buf)); (void) response(); } /* * Execute the sink part of the SCP protocol. */ -static void sink(char *targ) +static void sink(char *targ, char *src) { char buf[2048]; char namebuf[2048]; char ch; int targisdir = 0; - int settime = 0; + int settime; int exists; DWORD attr; HANDLE f; @@ -438,43 +778,43 @@ 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); + back->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'); buf[i-1] = '\0'; switch (buf[0]) { case '\01': /* error */ - fprintf(stderr, "%s\n", buf+1); + tell_user(stderr, "%s\n", buf+1); errs++; continue; case '\02': /* fatal error */ bump("%s", buf+1); case 'E': - ssh_send("", 1); + back->send("", 1); return; case 'T': if (sscanf(buf, "T%ld %*d %ld %*d", &mtime, &atime) == 2) { settime = 1; - ssh_send("", 1); + back->send("", 1); goto gottime; } bump("Protocol error: Illegal time format"); @@ -487,18 +827,29 @@ static void sink(char *targ) if (sscanf(buf+1, "%u %lu %[^\n]", &mode, &size, namebuf) != 3) bump("Protocol error: Illegal file descriptor format"); + /* Security fix: ensure the file ends up where we asked for it. */ + if (src) { + char *p = src + strlen(src); + while (p > src && p[-1] != '/' && p[-1] != '\\') + p--; + strcpy(namebuf, p); + } if (targisdir) { char t[2048]; + char *p; strcpy(t, targ); if (targ[0] != '\0') strcat(t, "/"); - strcat(t, namebuf); + p = namebuf + strlen(namebuf); + while (p > namebuf && p[-1] != '/' && p[-1] != '\\') + p--; + strcat(t, p); strcpy(namebuf, t); } else { strcpy(namebuf, targ); } attr = GetFileAttributes(namebuf); - exists = (attr != -1); + exists = (attr != (DWORD)-1); if (buf[0] == 'D') { if (exists && (attr & FILE_ATTRIBUTE_DIRECTORY) == 0) { @@ -512,7 +863,7 @@ static void sink(char *targ) continue; } } - sink(namebuf); + sink(namebuf, NULL); /* can we set the timestamp for directories ? */ continue; } @@ -524,7 +875,7 @@ static void sink(char *targ) continue; } - ssh_send("", 1); + back->send("", 1); if (statistics) { stat_bytes = 0; @@ -540,9 +891,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) { @@ -577,7 +928,7 @@ static void sink(char *targ) run_err("%s: Write error", namebuf); continue; } - ssh_send("", 1); + back->send("", 1); } } @@ -592,7 +943,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) @@ -602,7 +953,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) { @@ -646,8 +997,7 @@ static void toremote(int argc, char *argv[]) WIN32_FIND_DATA fdat; src = argv[i]; if (colon(src) != NULL) { - fprintf(stderr, - "%s: Remote to remote not supported\n", src); + tell_user(stderr, "%s: Remote to remote not supported\n", src); errs++; continue; } @@ -661,7 +1011,7 @@ static void toremote(int argc, char *argv[]) char namebuf[2048]; if (strlen(src) + strlen(fdat.cFileName) >= sizeof(namebuf)) { - fprintf(stderr, "%s: Name too long", src); + tell_user(stderr, "%s: Name too long", src); continue; } strcpy(namebuf, src); @@ -694,7 +1044,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) @@ -704,7 +1054,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) { @@ -726,13 +1076,66 @@ static void tolocal(int argc, char *argv[]) do_cmd(host, user, cmd); sfree(cmd); - sink(targ); + sink(targ, src); +} + +/* + * 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) + tell_char(stdout, c); } /* * Initialize the Win$ock driver. */ -static void init_winsock() +static void init_winsock(void) { WORD winsock_ver; WSADATA wsadata; @@ -748,12 +1151,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"); @@ -761,6 +1165,8 @@ static void usage() 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 */ + printf(" -gui hWnd GUI mode with the windows handle for receiving messages\n"); exit(1); } @@ -770,14 +1176,20 @@ static void usage() int main(int argc, char *argv[]) { int i; + int list = 0; + + default_protocol = PROT_TELNET; + flags = FLAG_STDERR; + ssh_get_password = &get_password; init_winsock(); + sk_init(); 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) @@ -791,6 +1203,11 @@ 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], "-gui") == 0 && i+1 < argc) { + gui_hwnd = argv[++i]; + gui_mode = 1; + } else if (strcmp(argv[i], "-ls") == 0) + list = 1; else if (strcmp(argv[i], "--") == 0) { i++; break; } else @@ -799,24 +1216,39 @@ 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); + back->special(TS_EOF); + ssh_scp_recv(&ch, 1); } WSACleanup(); random_save_seed(); + /* GUI Adaptation - August 2000 */ + if (gui_mode) { + unsigned int msg_id = WM_RET_ERR_CNT; + if (list) msg_id = WM_LS_RET_ERR_CNT; + while (!PostMessage( (HWND)atoi(gui_hwnd), msg_id, (WPARAM)errs, 0/*lParam*/ ) ) + SleepEx(1000,TRUE); + } return (errs == 0 ? 0 : 1); }