X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/887035a593c8c0a1af853657c80046e17dc5581a..79bf227ba7ba02e32ac710621b672e2789f9ef50:/scp.c diff --git a/scp.c b/scp.c index ec3575b7..f7fa255f 100644 --- a/scp.c +++ b/scp.c @@ -12,14 +12,6 @@ * to licensing issues.) */ -#include -#ifndef AUTO_WINSOCK -#ifdef WINSOCK_TWO -#include -#else -#include -#endif -#endif #include #include #include @@ -29,54 +21,11 @@ #define PUTTY_DO_GLOBALS #include "putty.h" +#include "psftp.h" #include "ssh.h" #include "sftp.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)) - -/* GUI Adaptation - Sept 2000 */ - -/* This is just a base value from which the main message numbers are - * derived. */ -#define WM_APP_BASE 0x8000 - -/* These two pass a single character value in wParam. They represent - * the visible output from PSCP. */ -#define WM_STD_OUT_CHAR ( WM_APP_BASE+400 ) -#define WM_STD_ERR_CHAR ( WM_APP_BASE+401 ) - -/* These pass a transfer status update. WM_STATS_CHAR passes a single - * character in wParam, and is called repeatedly to pass the name of - * the file, terminated with "\n". WM_STATS_SIZE passes the size of - * the file being transferred in wParam. WM_STATS_ELAPSED is called - * to pass the elapsed time (in seconds) in wParam, and - * WM_STATS_PERCENT passes the percentage of the transfer which is - * complete, also in wParam. */ -#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 ) - -/* These are used at the end of a run to pass an error code in - * wParam: zero means success, nonzero means failure. WM_RET_ERR_CNT - * is used after a copy, and WM_LS_RET_ERR_CNT is used after a file - * list operation. */ -#define WM_RET_ERR_CNT ( WM_APP_BASE+406 ) -#define WM_LS_RET_ERR_CNT ( WM_APP_BASE+407 ) - -/* More transfer status update messages. WM_STATS_DONE passes the - * number of bytes sent so far in wParam. WM_STATS_ETA passes the - * estimated time to completion (in seconds). WM_STATS_RATEBS passes - * the average transfer rate (in bytes per second). */ -#define WM_STATS_DONE ( WM_APP_BASE+408 ) -#define WM_STATS_ETA ( WM_APP_BASE+409 ) -#define WM_STATS_RATEBS ( WM_APP_BASE+410 ) - static int list = 0; static int verbose = 0; static int recursive = 0; @@ -86,30 +35,20 @@ static int statistics = 1; static int prev_stats_len = 0; static int scp_unsafe_mode = 0; static int errs = 0; -/* GUI Adaptation - Sept 2000 */ -#define NAME_STR_MAX 2048 -static char statname[NAME_STR_MAX + 1]; -static unsigned long statsize = 0; -static unsigned long statdone = 0; -static unsigned long stateta = 0; -static unsigned long statratebs = 0; -static int statperct = 0; -static unsigned long statelapsed = 0; static int gui_mode = 0; -static char *gui_hwnd = NULL; +static int try_scp = 1; +static int try_sftp = 1; +static int main_cmd_is_sftp = 0; +static int fallback_cmd_is_sftp = 0; static int using_sftp = 0; +static Backend *back; +static void *backhandle; +static Config cfg; + static void source(char *src); static void rsource(char *src); 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 gui_update_stats(char *name, unsigned long size, - int percentage, unsigned long elapsed, - unsigned long done, unsigned long eta, - unsigned long ratebs); /* * The maximum amount of queued data we accept before we stop and @@ -117,7 +56,7 @@ static void gui_update_stats(char *name, unsigned long size, */ #define MAX_SCP_BUFSIZE 16384 -void ldisc_send(char *buf, int len, int interactive) +void ldisc_send(void *handle, char *buf, int len, int interactive) { /* * This is only here because of the calls to ldisc_send(NULL, @@ -128,23 +67,12 @@ void ldisc_send(char *buf, int len, int interactive) assert(len == 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); - } + else + gui_send_char(stream == stderr, c); } static void tell_str(FILE * stream, char *str) @@ -157,55 +85,15 @@ static void tell_str(FILE * stream, char *str) static void tell_user(FILE * stream, char *fmt, ...) { - char str[0x100]; /* Make the size big enough */ + char *str, *str2; va_list ap; va_start(ap, fmt); - vsprintf(str, fmt, ap); + str = dupvprintf(fmt, ap); va_end(ap); - strcat(str, "\n"); - tell_str(stream, str); -} - -static void gui_update_stats(char *name, unsigned long size, - int percentage, unsigned long elapsed, - unsigned long done, unsigned long eta, - unsigned long ratebs) -{ - 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 (statdone != done) { - send_msg((HWND) atoi(gui_hwnd), WM_STATS_DONE, (WPARAM) done); - statdone = done; - } - if (stateta != eta) { - send_msg((HWND) atoi(gui_hwnd), WM_STATS_ETA, (WPARAM) eta); - stateta = eta; - } - if (statratebs != ratebs) { - send_msg((HWND) atoi(gui_hwnd), WM_STATS_RATEBS, (WPARAM) ratebs); - statratebs = ratebs; - } - 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; - } + str2 = dupcat(str, "\n", NULL); + sfree(str); + tell_str(stream, str2); + sfree(str2); } /* @@ -213,87 +101,68 @@ static void gui_update_stats(char *name, unsigned long size, */ void fatalbox(char *fmt, ...) { - char str[0x100]; /* Make the size big enough */ + char *str, *str2; va_list ap; va_start(ap, fmt); - strcpy(str, "Fatal: "); - vsprintf(str + strlen(str), fmt, ap); + str = dupvprintf(fmt, ap); + str2 = dupcat("Fatal: ", str, "\n", NULL); + sfree(str); va_end(ap); - strcat(str, "\n"); - tell_str(stderr, str); + tell_str(stderr, str2); + sfree(str2); errs++; - 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); - } + if (gui_mode) + gui_send_errcount(list, errs); cleanup_exit(1); } void modalfatalbox(char *fmt, ...) { - char str[0x100]; /* Make the size big enough */ + char *str, *str2; va_list ap; va_start(ap, fmt); - strcpy(str, "Fatal: "); - vsprintf(str + strlen(str), fmt, ap); + str = dupvprintf(fmt, ap); + str2 = dupcat("Fatal: ", str, "\n", NULL); + sfree(str); va_end(ap); - strcat(str, "\n"); - tell_str(stderr, str); + tell_str(stderr, str2); + sfree(str2); errs++; - 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); - } + if (gui_mode) + gui_send_errcount(list, errs); cleanup_exit(1); } -void connection_fatal(char *fmt, ...) +void connection_fatal(void *frontend, char *fmt, ...) { - char str[0x100]; /* Make the size big enough */ + char *str, *str2; va_list ap; va_start(ap, fmt); - strcpy(str, "Fatal: "); - vsprintf(str + strlen(str), fmt, ap); + str = dupvprintf(fmt, ap); + str2 = dupcat("Fatal: ", str, "\n", NULL); + sfree(str); va_end(ap); - strcat(str, "\n"); - tell_str(stderr, str); + tell_str(stderr, str2); + sfree(str2); errs++; - 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); - } + if (gui_mode) + gui_send_errcount(list, errs); cleanup_exit(1); } /* - * Be told what socket we're supposed to be using. + * In pscp, all agent requests should be synchronous, so this is a + * never-called stub. */ -static SOCKET scp_ssh_socket; -char *do_select(SOCKET skt, int startup) +void agent_schedule_callback(void (*callback)(void *, void *, int), + void *callback_ctx, void *data, int len) { - if (startup) - scp_ssh_socket = skt; - else - scp_ssh_socket = INVALID_SOCKET; - return NULL; + assert(!"We shouldn't be here"); } -extern int select_result(WPARAM, LPARAM); /* * Receive a block of data from the SSH link. Block until all data @@ -308,19 +177,18 @@ 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 */ -int from_backend(void *frontend, int is_stderr, char *data, int datalen) +int from_backend(void *frontend, int is_stderr, const char *data, int datalen) { unsigned char *p = (unsigned char *) data; unsigned len = (unsigned) datalen; - assert(len > 0); - /* * stderr data is just spouted to local stderr and otherwise * ignored. */ if (is_stderr) { - fwrite(data, 1, len, stderr); + if (len > 0) + fwrite(data, 1, len, stderr); return 0; } @@ -330,7 +198,7 @@ int from_backend(void *frontend, int is_stderr, char *data, int datalen) if (!outptr) return 0; - if (outlen > 0) { + if ((outlen > 0) && (len > 0)) { unsigned used = outlen; if (used > len) used = len; @@ -344,8 +212,7 @@ int from_backend(void *frontend, int is_stderr, char *data, int datalen) if (len > 0) { if (pendsize < pendlen + len) { pendsize = pendlen + len + 4096; - pending = (pending ? srealloc(pending, pendsize) : - smalloc(pendsize)); + pending = sresize(pending, pendsize, unsigned char); if (!pending) fatalbox("Out of memory"); } @@ -355,17 +222,6 @@ int from_backend(void *frontend, int is_stderr, char *data, int datalen) return 0; } -static int scp_process_network_event(void) -{ - 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 1; -} static int ssh_scp_recv(unsigned char *buf, int len) { outptr = buf; @@ -394,7 +250,7 @@ static int ssh_scp_recv(unsigned char *buf, int len) } while (outlen > 0) { - if (!scp_process_network_event()) + if (ssh_sftp_loop_iteration() < 0) return 0; /* doom */ } @@ -406,17 +262,23 @@ static int ssh_scp_recv(unsigned char *buf, int len) */ 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) + while (!back->sendok(backhandle)) { + if (ssh_sftp_loop_iteration() < 0) return; /* doom */ - select_result((WPARAM) scp_ssh_socket, (LPARAM) FD_READ); } - using_sftp = !ssh_fallback_cmd; + + /* Work out which backend we ended up using. */ + if (!ssh_fallback_cmd(backhandle)) + using_sftp = main_cmd_is_sftp; + else + using_sftp = fallback_cmd_is_sftp; + + if (verbose) { + if (using_sftp) + tell_user(stderr, "Using SFTP"); + else + tell_user(stderr, "Using SCP1"); + } } /* @@ -424,30 +286,25 @@ static void ssh_scp_init(void) */ static void bump(char *fmt, ...) { - char str[0x100]; /* Make the size big enough */ + char *str, *str2; va_list ap; va_start(ap, fmt); - strcpy(str, "Fatal: "); - vsprintf(str + strlen(str), fmt, ap); + str = dupvprintf(fmt, ap); va_end(ap); - strcat(str, "\n"); - tell_str(stderr, str); + str2 = dupcat(str, "\n", NULL); + sfree(str); + tell_str(stderr, str2); + sfree(str2); errs++; - if (back != NULL && back->socket() != NULL) { + if (back != NULL && back->socket(backhandle) != NULL) { char ch; - back->special(TS_EOF); - ssh_scp_recv(&ch, 1); + back->special(backhandle, TS_EOF); + ssh_scp_recv((unsigned char *) &ch, 1); } - 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); - } + if (gui_mode) + gui_send_errcount(list, errs); cleanup_exit(1); } @@ -457,8 +314,9 @@ static void bump(char *fmt, ...) */ static void do_cmd(char *host, char *user, char *cmd) { - char *err, *realhost; - DWORD namelen; + const char *err; + char *realhost; + void *logctx; if (host == NULL || host[0] == '\0') bump("Empty host name"); @@ -484,7 +342,7 @@ static void do_cmd(char *host, char *user, char *cmd) /* * Enact command-line overrides. */ - cmdline_run_saved(); + cmdline_run_saved(&cfg); /* * Trim leading whitespace off the hostname if it's there. @@ -532,16 +390,16 @@ 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') { - namelen = 0; - if (GetUserName(user, &namelen) == FALSE) + user = get_username(); + if (!user) 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); + else { + 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'; + sfree(user); + } } /* @@ -554,20 +412,51 @@ static void do_cmd(char *host, char *user, char *cmd) cfg.portfwd[0] = cfg.portfwd[1] = '\0'; /* + * Set up main and possibly fallback command depending on + * options specified by user. * Attempt to start the SFTP subsystem as a first choice, * falling back to the provided scp command if that fails. */ - strcpy(cfg.remote_cmd, "sftp"); - cfg.ssh_subsys = TRUE; - cfg.remote_cmd_ptr2 = cmd; - cfg.ssh_subsys2 = FALSE; + cfg.remote_cmd_ptr2 = NULL; + if (try_sftp) { + /* First choice is SFTP subsystem. */ + main_cmd_is_sftp = 1; + strcpy(cfg.remote_cmd, "sftp"); + cfg.ssh_subsys = TRUE; + if (try_scp) { + /* Fallback is to use the provided scp command. */ + fallback_cmd_is_sftp = 0; + cfg.remote_cmd_ptr2 = cmd; + cfg.ssh_subsys2 = FALSE; + } else { + /* Since we're not going to try SCP, we may as well try + * harder to find an SFTP server, since in the current + * implementation we have a spare slot. */ + fallback_cmd_is_sftp = 1; + /* see psftp.c for full explanation of this kludge */ + cfg.remote_cmd_ptr2 = + "test -x /usr/lib/sftp-server && exec /usr/lib/sftp-server\n" + "test -x /usr/local/lib/sftp-server && exec /usr/local/lib/sftp-server\n" + "exec sftp-server"; + cfg.ssh_subsys2 = FALSE; + } + } else { + /* Don't try SFTP at all; just try the scp command. */ + main_cmd_is_sftp = 0; + cfg.remote_cmd_ptr = cmd; + cfg.ssh_subsys = FALSE; + } cfg.nopty = TRUE; back = &ssh_backend; - err = back->init(NULL, cfg.host, cfg.port, &realhost, 0); + err = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port, &realhost, + 0, cfg.tcp_keepalives); if (err != NULL) bump("ssh_init: %s", err); + logctx = log_init(NULL, &cfg); + back->provide_logctx(backhandle, logctx); + console_provide_logctx(logctx); ssh_scp_init(); if (verbose && realhost != NULL) tell_user(stderr, "Connected to %s\n", realhost); @@ -582,7 +471,7 @@ static void print_stats(char *name, unsigned long size, unsigned long done, { float ratebs; unsigned long eta; - char etastr[10]; + char *etastr; int pct; int len; int elap; @@ -598,16 +487,15 @@ static void print_stats(char *name, unsigned long size, unsigned long done, eta = size - done; else eta = (unsigned long) ((size - done) / ratebs); - sprintf(etastr, "%02ld:%02ld:%02ld", - eta / 3600, (eta % 3600) / 60, eta % 60); + etastr = dupprintf("%02ld:%02ld:%02ld", + eta / 3600, (eta % 3600) / 60, eta % 60); pct = (int) (100 * (done * 1.0 / size)); - if (gui_mode) - /* GUI Adaptation - Sept 2000 */ - gui_update_stats(name, size, pct, elap, done, eta, + if (gui_mode) { + gui_update_stats(name, size, pct, elap, done, eta, (unsigned long) ratebs); - else { + } else { len = printf("\r%-25.25s | %10ld kB | %5.1f kB/s | ETA: %8s | %3d%%", name, done / 1024, ratebs / 1024.0, etastr, pct); if (len < prev_stats_len) @@ -616,7 +504,11 @@ static void print_stats(char *name, unsigned long size, unsigned long done, if (done == size) printf("\n"); + + fflush(stdout); } + + free(etastr); } /* @@ -679,7 +571,7 @@ static int response(void) char ch, resp, rbuf[2048]; int p; - if (ssh_scp_recv(&resp, 1) <= 0) + if (ssh_scp_recv((unsigned char *) &resp, 1) <= 0) bump("Lost connection"); p = 0; @@ -692,7 +584,7 @@ static int response(void) case 1: /* error */ case 2: /* fatal error */ do { - if (ssh_scp_recv(&ch, 1) <= 0) + if (ssh_scp_recv((unsigned char *) &ch, 1) <= 0) bump("Protocol error: Lost connection"); rbuf[p++] = ch; } while (p < sizeof(rbuf) && ch != '\n'); @@ -708,11 +600,11 @@ static int response(void) int sftp_recvdata(char *buf, int len) { - return ssh_scp_recv(buf, len); + return ssh_scp_recv((unsigned char *) buf, len); } int sftp_senddata(char *buf, int len) { - back->send((unsigned char *) buf, len); + back->send(backhandle, buf, len); return 1; } @@ -730,6 +622,8 @@ void scp_sftp_listdir(char *dirname) struct fxp_handle *dirh; struct fxp_names *names; struct fxp_name *ournames; + struct sftp_packet *pktin; + struct sftp_request *req, *rreq; int nnames, namesize; int i; @@ -741,7 +635,11 @@ void scp_sftp_listdir(char *dirname) printf("Listing directory %s\n", dirname); - dirh = fxp_opendir(dirname); + sftp_register(req = fxp_opendir_send(dirname)); + rreq = sftp_find_request(pktin = sftp_recv()); + assert(rreq == req); + dirh = fxp_opendir_recv(pktin, rreq); + if (dirh == NULL) { printf("Unable to open %s: %s\n", dirname, fxp_error()); } else { @@ -750,7 +648,11 @@ void scp_sftp_listdir(char *dirname) while (1) { - names = fxp_readdir(dirh); + sftp_register(req = fxp_readdir_send(dirh)); + rreq = sftp_find_request(pktin = sftp_recv()); + assert(rreq == req); + names = fxp_readdir_recv(pktin, rreq); + if (names == NULL) { if (fxp_error_type() == SSH_FX_EOF) break; @@ -764,8 +666,7 @@ void scp_sftp_listdir(char *dirname) if (nnames + names->nnames >= namesize) { namesize += names->nnames + 128; - ournames = - srealloc(ournames, namesize * sizeof(*ournames)); + ournames = sresize(ournames, namesize, struct fxp_name); } for (i = 0; i < names->nnames; i++) @@ -774,7 +675,10 @@ void scp_sftp_listdir(char *dirname) names->nnames = 0; /* prevent free_names */ fxp_free_names(names); } - fxp_close(dirh); + sftp_register(req = fxp_close_send(dirh)); + rreq = sftp_find_request(pktin = sftp_recv()); + assert(rreq == req); + fxp_close_recv(pktin, rreq); /* * Now we have our filenames. Sort them by actual file @@ -810,6 +714,7 @@ static int scp_sftp_preserve, scp_sftp_recursive; static unsigned long scp_sftp_mtime, scp_sftp_atime; static int scp_has_times; static struct fxp_handle *scp_sftp_filehandle; +static struct fxp_xfer *scp_sftp_xfer; static uint64 scp_sftp_fileoffset; void scp_source_setup(char *target, int shouldbedir) @@ -819,16 +724,23 @@ void scp_source_setup(char *target, int shouldbedir) * Find out whether the target filespec is in fact a * directory. */ + struct sftp_packet *pktin; + struct sftp_request *req, *rreq; struct fxp_attrs attrs; + int ret; if (!fxp_init()) { tell_user(stderr, "unable to initialise SFTP: %s", fxp_error()); errs++; - return 1; + return; } - if (!fxp_stat(target, &attrs) || - !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS)) + sftp_register(req = fxp_stat_send(target)); + rreq = sftp_find_request(pktin = sftp_recv()); + assert(rreq == req); + ret = fxp_stat_recv(pktin, rreq, &attrs); + + if (!ret || !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS)) scp_sftp_targetisdir = 0; else scp_sftp_targetisdir = (attrs.permissions & 0040000) != 0; @@ -850,8 +762,8 @@ int scp_send_errmsg(char *str) if (using_sftp) { /* do nothing; we never need to send our errors to the server */ } else { - back->send("\001", 1); /* scp protocol error prefix */ - back->send(str, strlen(str)); + back->send(backhandle, "\001", 1);/* scp protocol error prefix */ + back->send(backhandle, str, strlen(str)); } return 0; /* can't fail */ } @@ -866,7 +778,7 @@ int scp_send_filetimes(unsigned long mtime, unsigned long atime) } else { char buf[80]; sprintf(buf, "T%lu 0 %lu 0\n", mtime, atime); - back->send(buf, strlen(buf)); + back->send(backhandle, buf, strlen(buf)); return response(); } } @@ -875,13 +787,21 @@ int scp_send_filename(char *name, unsigned long size, int modes) { if (using_sftp) { char *fullname; + struct sftp_packet *pktin; + struct sftp_request *req, *rreq; + if (scp_sftp_targetisdir) { fullname = dupcat(scp_sftp_remotepath, "/", name, NULL); } else { fullname = dupstr(scp_sftp_remotepath); } - scp_sftp_filehandle = - fxp_open(fullname, SSH_FXF_WRITE | SSH_FXF_CREAT | SSH_FXF_TRUNC); + + sftp_register(req = fxp_open_send(fullname, SSH_FXF_WRITE | + SSH_FXF_CREAT | SSH_FXF_TRUNC)); + rreq = sftp_find_request(pktin = sftp_recv()); + assert(rreq == req); + scp_sftp_filehandle = fxp_open_recv(pktin, rreq); + if (!scp_sftp_filehandle) { tell_user(stderr, "pscp: unable to open %s: %s", fullname, fxp_error()); @@ -889,14 +809,16 @@ int scp_send_filename(char *name, unsigned long size, int modes) return 1; } scp_sftp_fileoffset = uint64_make(0, 0); + scp_sftp_xfer = xfer_upload_init(scp_sftp_filehandle, + scp_sftp_fileoffset); sfree(fullname); return 0; } else { char buf[40]; sprintf(buf, "C%04o %lu ", modes, size); - back->send(buf, strlen(buf)); - back->send(name, strlen(name)); - back->send("\n", 1); + back->send(backhandle, buf, strlen(buf)); + back->send(backhandle, name, strlen(name)); + back->send(backhandle, "\n", 1); return response(); } } @@ -904,18 +826,29 @@ int scp_send_filename(char *name, unsigned long size, int modes) int scp_send_filedata(char *data, int len) { if (using_sftp) { + int ret; + struct sftp_packet *pktin; + if (!scp_sftp_filehandle) { return 1; } - if (!fxp_write(scp_sftp_filehandle, data, scp_sftp_fileoffset, len)) { - tell_user(stderr, "error while writing: %s\n", fxp_error()); - errs++; - return 1; + + while (!xfer_upload_ready(scp_sftp_xfer)) { + pktin = sftp_recv(); + ret = xfer_upload_gotpkt(scp_sftp_xfer, pktin); + if (!ret) { + tell_user(stderr, "error while writing: %s\n", fxp_error()); + errs++; + return 1; + } } + + xfer_upload_data(scp_sftp_xfer, data, len); + scp_sftp_fileoffset = uint64_add32(scp_sftp_fileoffset, len); return 0; } else { - int bufsize = back->send(data, len); + int bufsize = back->send(backhandle, data, len); /* * If the network transfer is backing up - that is, the @@ -924,9 +857,9 @@ int scp_send_filedata(char *data, int len) * we have space in the buffer again. */ while (bufsize > MAX_SCP_BUFSIZE) { - if (!scp_process_network_event()) + if (ssh_sftp_loop_iteration() < 0) return 1; - bufsize = back->sendbuffer(); + bufsize = back->sendbuffer(backhandle); } return 0; @@ -937,6 +870,16 @@ int scp_send_finish(void) { if (using_sftp) { struct fxp_attrs attrs; + struct sftp_packet *pktin; + struct sftp_request *req, *rreq; + int ret; + + while (!xfer_done(scp_sftp_xfer)) { + pktin = sftp_recv(); + xfer_upload_gotpkt(scp_sftp_xfer, pktin); + } + xfer_cleanup(scp_sftp_xfer); + if (!scp_sftp_filehandle) { return 1; } @@ -944,16 +887,23 @@ int scp_send_finish(void) attrs.flags = SSH_FILEXFER_ATTR_ACMODTIME; attrs.atime = scp_sftp_atime; attrs.mtime = scp_sftp_mtime; - if (!fxp_fsetstat(scp_sftp_filehandle, attrs)) { + sftp_register(req = fxp_fsetstat_send(scp_sftp_filehandle, attrs)); + rreq = sftp_find_request(pktin = sftp_recv()); + assert(rreq == req); + ret = fxp_fsetstat_recv(pktin, rreq); + if (!ret) { tell_user(stderr, "unable to set file times: %s\n", fxp_error()); errs++; } } - fxp_close(scp_sftp_filehandle); + sftp_register(req = fxp_close_send(scp_sftp_filehandle)); + rreq = sftp_find_request(pktin = sftp_recv()); + assert(rreq == req); + fxp_close_recv(pktin, rreq); scp_has_times = 0; return 0; } else { - back->send("", 1); + back->send(backhandle, "", 1); return response(); } } @@ -978,6 +928,10 @@ int scp_send_dirname(char *name, int modes) char *fullname; char const *err; struct fxp_attrs attrs; + struct sftp_packet *pktin; + struct sftp_request *req, *rreq; + int ret; + if (scp_sftp_targetisdir) { fullname = dupcat(scp_sftp_remotepath, "/", name, NULL); } else { @@ -991,12 +945,22 @@ int scp_send_dirname(char *name, int modes) * exists and is a directory we will assume we were either * successful or it didn't matter. */ - if (!fxp_mkdir(fullname)) + sftp_register(req = fxp_mkdir_send(fullname)); + rreq = sftp_find_request(pktin = sftp_recv()); + assert(rreq == req); + ret = fxp_mkdir_recv(pktin, rreq); + + if (!ret) err = fxp_error(); else err = "server reported no error"; - if (!fxp_stat(fullname, &attrs) || - !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS) || + + sftp_register(req = fxp_stat_send(fullname)); + rreq = sftp_find_request(pktin = sftp_recv()); + assert(rreq == req); + ret = fxp_stat_recv(pktin, rreq, &attrs); + + if (!ret || !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS) || !(attrs.permissions & 0040000)) { tell_user(stderr, "unable to create directory %s: %s", fullname, err); @@ -1010,9 +974,9 @@ int scp_send_dirname(char *name, int modes) } else { char buf[40]; sprintf(buf, "D%04o 0 ", modes); - back->send(buf, strlen(buf)); - back->send(name, strlen(name)); - back->send("\n", 1); + back->send(backhandle, buf, strlen(buf)); + back->send(backhandle, name, strlen(name)); + back->send(backhandle, "\n", 1); return response(); } } @@ -1023,7 +987,7 @@ int scp_send_enddir(void) sfree(scp_sftp_remotepath); return 0; } else { - back->send("E\n", 2); + back->send(backhandle, "E\n", 2); return response(); } } @@ -1051,7 +1015,7 @@ int scp_sink_setup(char *source, int preserve, int recursive) * wildcardness comes before the final slash) and arrange * things so that a dirstack entry will be set up. */ - newsource = smalloc(1+strlen(source)); + newsource = snewn(1+strlen(source), char); if (!wc_unescape(newsource, source)) { /* Yes, here we go; it's a wildcard. Bah. */ char *dupsource, *lastpart, *dirpart, *wildcard; @@ -1084,7 +1048,7 @@ int scp_sink_setup(char *source, int preserve, int recursive) * wildcard escapes from the directory part, throwing * an error if it contains a real wildcard. */ - dirpart = smalloc(1+strlen(dupsource)); + dirpart = snewn(1+strlen(dupsource), char); if (!wc_unescape(dirpart, dupsource)) { tell_user(stderr, "%s: multiple-level wildcards unsupported", source); @@ -1118,7 +1082,7 @@ int scp_sink_setup(char *source, int preserve, int recursive) int scp_sink_init(void) { if (!using_sftp) { - back->send("", 1); + back->send(backhandle, "", 1); } return 0; } @@ -1143,6 +1107,8 @@ int scp_get_sink_action(struct scp_sink_action *act) char *fname; int must_free_fname; struct fxp_attrs attrs; + struct sftp_packet *pktin; + struct sftp_request *req, *rreq; int ret; if (!scp_sftp_dirstack_head) { @@ -1211,7 +1177,11 @@ int scp_get_sink_action(struct scp_sink_action *act) * Now we have a filename. Stat it, and see if it's a file * or a directory. */ - ret = fxp_stat(fname, &attrs); + sftp_register(req = fxp_stat_send(fname)); + rreq = sftp_find_request(pktin = sftp_recv()); + assert(rreq == req); + ret = fxp_stat_recv(pktin, rreq, &attrs); + if (!ret || !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS)) { tell_user(stderr, "unable to identify %s: %s", fname, ret ? "file type not supplied" : fxp_error()); @@ -1263,7 +1233,11 @@ int scp_get_sink_action(struct scp_sink_action *act) * list), we must push the other (target,namelist) pair * on a stack. */ - dirhandle = fxp_opendir(fname); + sftp_register(req = fxp_opendir_send(fname)); + rreq = sftp_find_request(pktin = sftp_recv()); + assert(rreq == req); + dirhandle = fxp_opendir_recv(pktin, rreq); + if (!dirhandle) { tell_user(stderr, "scp: unable to open directory %s: %s", fname, fxp_error()); @@ -1276,7 +1250,11 @@ int scp_get_sink_action(struct scp_sink_action *act) while (1) { int i; - names = fxp_readdir(dirhandle); + sftp_register(req = fxp_readdir_send(dirhandle)); + rreq = sftp_find_request(pktin = sftp_recv()); + assert(rreq == req); + names = fxp_readdir_recv(pktin, rreq); + if (names == NULL) { if (fxp_error_type() == SSH_FX_EOF) break; @@ -1293,17 +1271,19 @@ int scp_get_sink_action(struct scp_sink_action *act) } if (nnames + names->nnames >= namesize) { namesize += names->nnames + 128; - ournames = - srealloc(ournames, namesize * sizeof(*ournames)); + ournames = sresize(ournames, namesize, struct fxp_name); } for (i = 0; i < names->nnames; i++) ournames[nnames++] = names->names[i]; names->nnames = 0; /* prevent free_names */ fxp_free_names(names); } - fxp_close(dirhandle); + sftp_register(req = fxp_close_send(dirhandle)); + rreq = sftp_find_request(pktin = sftp_recv()); + assert(rreq == req); + fxp_close_recv(pktin, rreq); - newitem = smalloc(sizeof(struct scp_sftp_dirstack)); + newitem = snew(struct scp_sftp_dirstack); newitem->next = scp_sftp_dirstack_head; newitem->names = ournames; newitem->namepos = 0; @@ -1380,18 +1360,18 @@ int scp_get_sink_action(struct scp_sink_action *act) bufsize = 0; while (!done) { - if (ssh_scp_recv(&ch, 1) <= 0) + if (ssh_scp_recv((unsigned char *) &ch, 1) <= 0) return 1; if (ch == '\n') bump("Protocol error: Unexpected newline"); i = 0; action = ch; do { - if (ssh_scp_recv(&ch, 1) <= 0) + if (ssh_scp_recv((unsigned char *) &ch, 1) <= 0) bump("Lost connection"); if (i >= bufsize) { bufsize = i + 128; - act->buf = srealloc(act->buf, bufsize); + act->buf = sresize(act->buf, bufsize, char); } act->buf[i++] = ch; } while (ch != '\n'); @@ -1404,14 +1384,14 @@ int scp_get_sink_action(struct scp_sink_action *act) case '\02': /* fatal error */ bump("%s", act->buf); case 'E': - back->send("", 1); + back->send(backhandle, "", 1); act->action = SCP_SINK_ENDDIR; return 0; case 'T': if (sscanf(act->buf, "%ld %*d %ld %*d", &act->mtime, &act->atime) == 2) { act->settime = 1; - back->send("", 1); + back->send(backhandle, "", 1); continue; /* go round again */ } bump("Protocol error: Illegal time format"); @@ -1443,8 +1423,14 @@ int scp_get_sink_action(struct scp_sink_action *act) int scp_accept_filexfer(void) { if (using_sftp) { - scp_sftp_filehandle = - fxp_open(scp_sftp_currentname, SSH_FXF_READ); + struct sftp_packet *pktin; + struct sftp_request *req, *rreq; + + sftp_register(req = fxp_open_send(scp_sftp_currentname, SSH_FXF_READ)); + rreq = sftp_find_request(pktin = sftp_recv()); + assert(rreq == req); + scp_sftp_filehandle = fxp_open_recv(pktin, rreq); + if (!scp_sftp_filehandle) { tell_user(stderr, "pscp: unable to open %s: %s", scp_sftp_currentname, fxp_error()); @@ -1452,10 +1438,12 @@ int scp_accept_filexfer(void) return 1; } scp_sftp_fileoffset = uint64_make(0, 0); + scp_sftp_xfer = xfer_download_init(scp_sftp_filehandle, + scp_sftp_fileoffset); sfree(scp_sftp_currentname); return 0; } else { - back->send("", 1); + back->send(backhandle, "", 1); return 0; /* can't fail */ } } @@ -1463,31 +1451,71 @@ int scp_accept_filexfer(void) int scp_recv_filedata(char *data, int len) { if (using_sftp) { - int actuallen = fxp_read(scp_sftp_filehandle, data, - scp_sftp_fileoffset, len); - if (actuallen == -1 && fxp_error_type() != SSH_FX_EOF) { + struct sftp_packet *pktin; + int ret, actuallen; + void *vbuf; + + xfer_download_queue(scp_sftp_xfer); + pktin = sftp_recv(); + ret = xfer_download_gotpkt(scp_sftp_xfer, pktin); + + if (ret < 0) { tell_user(stderr, "pscp: error while reading: %s", fxp_error()); errs++; return -1; } - if (actuallen < 0) + + if (xfer_download_data(scp_sftp_xfer, &vbuf, &actuallen)) { + /* + * This assertion relies on the fact that the natural + * block size used in the xfer manager is at most that + * used in this module. I don't like crossing layers in + * this way, but it'll do for now. + */ + assert(actuallen <= len); + memcpy(data, vbuf, actuallen); + sfree(vbuf); + } else actuallen = 0; scp_sftp_fileoffset = uint64_add32(scp_sftp_fileoffset, actuallen); return actuallen; } else { - return ssh_scp_recv(data, len); + return ssh_scp_recv((unsigned char *) data, len); } } int scp_finish_filerecv(void) { if (using_sftp) { - fxp_close(scp_sftp_filehandle); + struct sftp_packet *pktin; + struct sftp_request *req, *rreq; + + /* + * Ensure that xfer_done() will work correctly, so we can + * clean up any outstanding requests from the file + * transfer. + */ + xfer_set_error(scp_sftp_xfer); + while (!xfer_done(scp_sftp_xfer)) { + void *vbuf; + int len; + + pktin = sftp_recv(); + xfer_download_gotpkt(scp_sftp_xfer, pktin); + if (xfer_download_data(scp_sftp_xfer, &vbuf, &len)) + sfree(vbuf); + } + xfer_cleanup(scp_sftp_xfer); + + sftp_register(req = fxp_close_send(scp_sftp_filehandle)); + rreq = sftp_find_request(pktin = sftp_recv()); + assert(rreq == req); + fxp_close_recv(pktin, rreq); return 0; } else { - back->send("", 1); + back->send(backhandle, "", 1); return response(); } } @@ -1498,16 +1526,17 @@ int scp_finish_filerecv(void) */ static void run_err(const char *fmt, ...) { - char str[2048]; + char *str, *str2; va_list ap; va_start(ap, fmt); errs++; - strcpy(str, "scp: "); - vsprintf(str + strlen(str), fmt, ap); - strcat(str, "\n"); - scp_send_errmsg(str); - tell_user(stderr, "%s", str); + str = dupvprintf(fmt, ap); + str2 = dupcat("scp: ", str, "\n", NULL); + sfree(str); + scp_send_errmsg(str2); + tell_user(stderr, "%s", str2); va_end(ap); + sfree(str2); } /* @@ -1516,20 +1545,23 @@ static void run_err(const char *fmt, ...) static void source(char *src) { unsigned long size; + unsigned long mtime, atime; char *last; - HANDLE f; - DWORD attr; + RFile *f; + int attr; unsigned long i; unsigned long stat_bytes; time_t stat_starttime, stat_lasttime; - attr = GetFileAttributes(src); - if (attr == (DWORD) - 1) { - run_err("%s: No such file or directory", src); + attr = file_type(src); + if (attr == FILE_TYPE_NONEXISTENT || + attr == FILE_TYPE_WEIRD) { + run_err("%s: %s file or directory", src, + (attr == FILE_TYPE_WEIRD ? "Not a" : "No such")); return; } - if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) { + if (attr == FILE_TYPE_DIRECTORY) { if (recursive) { /* * Avoid . and .. directories. @@ -1561,24 +1593,16 @@ static void source(char *src) if (last == src && strchr(src, ':') != NULL) last = strchr(src, ':') + 1; - f = CreateFile(src, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, 0, 0); - if (f == INVALID_HANDLE_VALUE) { + f = open_existing_file(src, &size, &mtime, &atime); + if (f == NULL) { run_err("%s: Cannot open file", src); return; } - if (preserve) { - FILETIME actime, wrtime; - unsigned long mtime, atime; - GetFileTime(f, NULL, &actime, &wrtime); - TIME_WIN_TO_POSIX(actime, atime); - TIME_WIN_TO_POSIX(wrtime, mtime); if (scp_send_filetimes(mtime, atime)) return; } - size = GetFileSize(f, NULL); if (verbose) tell_user(stderr, "Sending file %s, size=%lu", last, size); if (scp_send_filename(last, size, 0644)) @@ -1590,11 +1614,11 @@ static void source(char *src) for (i = 0; i < size; i += 4096) { char transbuf[4096]; - DWORD j, k = 4096; + int j, k = 4096; if (i + k > size) k = size - i; - if (!ReadFile(f, transbuf, k, &j, NULL) || j != k) { + if ((j = read_from_file(f, transbuf, k)) != k) { if (statistics) printf("\n"); bump("%s: Read error", src); @@ -1612,7 +1636,7 @@ static void source(char *src) } } - CloseHandle(f); + close_rfile(f); (void) scp_send_finish(); } @@ -1622,11 +1646,9 @@ static void source(char *src) */ static void rsource(char *src) { - char *last, *findfile; + char *last; char *save_target; - HANDLE dir; - WIN32_FIND_DATA fdat; - int ok; + DirHandle *dir; if ((last = strrchr(src, '/')) == NULL) last = src; @@ -1646,22 +1668,17 @@ static void rsource(char *src) if (scp_send_dirname(last, 0755)) return; - findfile = dupcat(src, "/*", NULL); - dir = FindFirstFile(findfile, &fdat); - ok = (dir != INVALID_HANDLE_VALUE); - while (ok) { - if (strcmp(fdat.cFileName, ".") == 0 || - strcmp(fdat.cFileName, "..") == 0) { - /* ignore . and .. */ - } else { - char *foundfile = dupcat(src, "/", fdat.cFileName, NULL); + dir = open_directory(src); + if (dir != NULL) { + char *filename; + while ((filename = read_filename(dir)) != NULL) { + char *foundfile = dupcat(src, "/", filename, NULL); source(foundfile); sfree(foundfile); + sfree(filename); } - ok = FindNextFile(dir, &fdat); } - FindClose(dir); - sfree(findfile); + close_directory(dir); (void) scp_send_enddir(); @@ -1676,16 +1693,16 @@ static void sink(char *targ, char *src) char *destfname; int targisdir = 0; int exists; - DWORD attr; - HANDLE f; + int attr; + WFile *f; unsigned long received; int wrerror = 0; unsigned long stat_bytes; time_t stat_starttime, stat_lasttime; char *stat_name; - attr = GetFileAttributes(targ); - if (attr != (DWORD) - 1 && (attr & FILE_ATTRIBUTE_DIRECTORY) != 0) + attr = file_type(targ); + if (attr == FILE_TYPE_DIRECTORY) targisdir = 1; if (targetshouldbedirectory && !targisdir) @@ -1772,7 +1789,7 @@ static void sink(char *targ, char *src) } if (targ[0] != '\0') - destfname = dupcat(targ, "\\", striptarget, NULL); + destfname = dir_file_cat(targ, striptarget); else destfname = dupstr(striptarget); } else { @@ -1783,16 +1800,16 @@ static void sink(char *targ, char *src) */ destfname = dupstr(targ); } - attr = GetFileAttributes(destfname); - exists = (attr != (DWORD) - 1); + attr = file_type(destfname); + exists = (attr != FILE_TYPE_NONEXISTENT); if (act.action == SCP_SINK_DIR) { - if (exists && (attr & FILE_ATTRIBUTE_DIRECTORY) == 0) { + if (exists && attr != FILE_TYPE_DIRECTORY) { run_err("%s: Not a directory", destfname); continue; } if (!exists) { - if (!CreateDirectory(destfname, NULL)) { + if (!create_directory(destfname)) { run_err("%s: Cannot create directory", destfname); continue; } @@ -1802,9 +1819,8 @@ static void sink(char *targ, char *src) continue; } - f = CreateFile(destfname, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - if (f == INVALID_HANDLE_VALUE) { + f = open_new_file(destfname); + if (f == NULL) { run_err("%s: Cannot create file", destfname); continue; } @@ -1820,17 +1836,17 @@ static void sink(char *targ, char *src) received = 0; while (received < act.size) { char transbuf[4096]; - DWORD blksize, read, written; + unsigned long blksize; + int read; blksize = 4096; - if (blksize > act.size - received) + if (blksize > (act.size - received)) blksize = act.size - received; - read = scp_recv_filedata(transbuf, blksize); + read = scp_recv_filedata(transbuf, (int)blksize); if (read <= 0) bump("Lost connection"); if (wrerror) continue; - if (!WriteFile(f, transbuf, read, &written, NULL) || - written != read) { + if (write_to_file(f, transbuf, read) != (int)read) { wrerror = 1; /* FIXME: in sftp we can actually abort the transfer */ if (statistics) @@ -1851,13 +1867,10 @@ static void sink(char *targ, char *src) received += read; } if (act.settime) { - FILETIME actime, wrtime; - TIME_POSIX_TO_WIN(act.atime, actime); - TIME_POSIX_TO_WIN(act.mtime, wrtime); - SetFileTime(f, NULL, &actime, &wrtime); + set_file_times(f, act.mtime, act.atime); } - CloseHandle(f); + close_wfile(f); if (wrerror) { run_err("%s: Write error", destfname); continue; @@ -1875,7 +1888,7 @@ static void toremote(int argc, char *argv[]) { char *src, *targ, *host, *user; char *cmd; - int i; + int i, wc_type; targ = argv[argc - 1]; @@ -1902,35 +1915,27 @@ static void toremote(int argc, char *argv[]) } if (argc == 2) { - /* Find out if the source filespec covers multiple files - if so, we should set the targetshouldbedirectory flag */ - HANDLE fh; - WIN32_FIND_DATA fdat; if (colon(argv[0]) != NULL) bump("%s: Remote to remote not supported", argv[0]); - fh = FindFirstFile(argv[0], &fdat); - if (fh == INVALID_HANDLE_VALUE) + + wc_type = test_wildcard(argv[0], 1); + if (wc_type == WCTYPE_NONEXISTENT) bump("%s: No such file or directory\n", argv[0]); - if (FindNextFile(fh, &fdat)) + else if (wc_type == WCTYPE_WILDCARD) targetshouldbedirectory = 1; - FindClose(fh); } - cmd = smalloc(strlen(targ) + 100); - sprintf(cmd, "scp%s%s%s%s -t %s", - verbose ? " -v" : "", - recursive ? " -r" : "", - preserve ? " -p" : "", - targetshouldbedirectory ? " -d" : "", targ); + cmd = dupprintf("scp%s%s%s%s -t %s", + verbose ? " -v" : "", + recursive ? " -r" : "", + preserve ? " -p" : "", + targetshouldbedirectory ? " -d" : "", targ); do_cmd(host, user, cmd); sfree(cmd); scp_source_setup(targ, targetshouldbedirectory); for (i = 0; i < argc - 1; i++) { - char *srcpath, *last; - HANDLE dir; - WIN32_FIND_DATA fdat; src = argv[i]; if (colon(src) != NULL) { tell_user(stderr, "%s: Remote to remote not supported\n", src); @@ -1938,49 +1943,30 @@ static void toremote(int argc, char *argv[]) continue; } - /* - * Trim off the last pathname component of `src', to - * provide the base pathname which will be prepended to - * filenames returned from Find{First,Next}File. - */ - srcpath = dupstr(src); - last = stripslashes(srcpath, 1); - *last = '\0'; - - dir = FindFirstFile(src, &fdat); - if (dir == INVALID_HANDLE_VALUE) { + wc_type = test_wildcard(src, 1); + if (wc_type == WCTYPE_NONEXISTENT) { run_err("%s: No such file or directory", src); continue; - } - do { + } else if (wc_type == WCTYPE_FILENAME) { + source(src); + continue; + } else { + WildcardMatcher *wc; char *filename; - /* - * Ensure that . and .. are never matched by wildcards, - * but only by deliberate action. - */ - if (!strcmp(fdat.cFileName, ".") || - !strcmp(fdat.cFileName, "..")) { - /* - * Find*File has returned a special dir. We require - * that _either_ `src' ends in a backslash followed - * by that string, _or_ `src' is precisely that - * string. - */ - int len = strlen(src), dlen = strlen(fdat.cFileName); - if (len == dlen && !strcmp(src, fdat.cFileName)) { - /* ok */ ; - } else if (len > dlen + 1 && src[len - dlen - 1] == '\\' && - !strcmp(src + len - dlen, fdat.cFileName)) { - /* ok */ ; - } else - continue; /* ignore this one */ + + wc = begin_wildcard_matching(src); + if (wc == NULL) { + run_err("%s: No such file or directory", src); + continue; } - filename = dupcat(srcpath, fdat.cFileName, NULL); - source(filename); - sfree(filename); - } while (FindNextFile(dir, &fdat)); - FindClose(dir); - sfree(srcpath); + + while ((filename = wildcard_get_filename(wc)) != NULL) { + source(filename); + sfree(filename); + } + + finish_wildcard_matching(wc); + } } } @@ -2020,12 +2006,11 @@ static void tolocal(int argc, char *argv[]) user = NULL; } - cmd = smalloc(strlen(src) + 100); - sprintf(cmd, "scp%s%s%s%s -f %s", - verbose ? " -v" : "", - recursive ? " -r" : "", - preserve ? " -p" : "", - targetshouldbedirectory ? " -d" : "", src); + cmd = dupprintf("scp%s%s%s%s -f %s", + verbose ? " -v" : "", + recursive ? " -r" : "", + preserve ? " -p" : "", + targetshouldbedirectory ? " -d" : "", src); do_cmd(host, user, cmd); sfree(cmd); @@ -2068,7 +2053,7 @@ static void get_dir_list(int argc, char *argv[]) user = NULL; } - cmd = smalloc(4 * strlen(src) + 100); + cmd = snewn(4 * strlen(src) + 100, char); strcpy(cmd, "ls -la '"); p = cmd + strlen(cmd); for (q = src; *q; q++) { @@ -2090,27 +2075,12 @@ static void get_dir_list(int argc, char *argv[]) if (using_sftp) { scp_sftp_listdir(src); } else { - while (ssh_scp_recv(&c, 1) > 0) + while (ssh_scp_recv((unsigned char *) &c, 1) > 0) tell_char(stdout, c); } } /* - * Initialize the Win$ock driver. - */ -static void init_winsock(void) -{ - WORD winsock_ver; - WSADATA wsadata; - - winsock_ver = MAKEWORD(1, 1); - if (WSAStartup(winsock_ver, &wsadata)) - bump("Unable to initialise WinSock"); - if (LOBYTE(wsadata.wVersion) != 1 || HIBYTE(wsadata.wVersion) != 1) - bump("WinSock version is incompatible with 1.1"); -} - -/* * Short description of parameters. */ static void usage(void) @@ -2120,7 +2090,7 @@ static void usage(void) 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(" pscp [options] -ls [user@]host:filespec\n"); printf("Options:\n"); printf(" -p preserve file attributes\n"); printf(" -q quiet, don't show statistics\n"); @@ -2135,6 +2105,9 @@ static void usage(void) printf(" -i key private key file for authentication\n"); printf(" -batch disable all interactive prompts\n"); printf(" -unsafe allow server-side wildcards (DANGEROUS)\n"); + printf(" -V print version information\n"); + printf(" -sftp force use of SFTP protocol\n"); + printf(" -scp force use of SCP protocol\n"); #if 0 /* * -gui is an internal option, used by GUI front ends to get @@ -2149,6 +2122,12 @@ static void usage(void) cleanup_exit(1); } +void version(void) +{ + printf("pscp: %s\n", ver); + cleanup_exit(1); +} + void cmdline_error(char *p, ...) { va_list ap; @@ -2156,30 +2135,34 @@ void cmdline_error(char *p, ...) va_start(ap, p); vfprintf(stderr, p, ap); va_end(ap); - fputc('\n', stderr); + fprintf(stderr, "\n try typing just \"pscp\" for help\n"); exit(1); } /* - * Main program (no, really?) + * Main program. (Called `psftp_main' because it gets called from + * *sftp.c; bit silly, I know, but it had to be called _something_.) */ -int main(int argc, char *argv[]) +int psftp_main(int argc, char *argv[]) { int i; default_protocol = PROT_TELNET; - flags = FLAG_STDERR; + flags = FLAG_STDERR +#ifdef FLAG_SYNCAGENT + | FLAG_SYNCAGENT +#endif + ; cmdline_tooltype = TOOLTYPE_FILETRANSFER; ssh_get_line = &console_get_line; - init_winsock(); sk_init(); for (i = 1; i < argc; i++) { int ret; if (argv[i][0] != '-') break; - ret = cmdline_process_param(argv[i], i+1socket() != NULL) { + if (back != NULL && back->socket(backhandle) != NULL) { char ch; - back->special(TS_EOF); - ssh_scp_recv(&ch, 1); + back->special(backhandle, TS_EOF); + ssh_scp_recv((unsigned char *) &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); - } + if (gui_mode) + gui_send_errcount(list, errs); + + cmdline_cleanup(); + console_provide_logctx(NULL); + back->free(backhandle); + backhandle = NULL; + back = NULL; + sk_cleanup(); return (errs == 0 ? 0 : 1); }