X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/1bc24185fa9eb390d005d9655be64b33c4a2287b..c606c42da46efa232c1f29791877f07d98da262e:/psftp.c diff --git a/psftp.c b/psftp.c index 71d57471..9e697d50 100644 --- a/psftp.c +++ b/psftp.c @@ -2,8 +2,6 @@ * psftp.c: front end for PSFTP. */ -#include - #include #include #include @@ -12,6 +10,7 @@ #define PUTTY_DO_GLOBALS #include "putty.h" +#include "psftp.h" #include "storage.h" #include "ssh.h" #include "sftp.h" @@ -65,7 +64,7 @@ char *canonify(char *name) sftp_register(req = fxp_realpath_send(fullname)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - canonname = fxp_realpath_recv(pktin); + canonname = fxp_realpath_recv(pktin, rreq); if (canonname) { sfree(fullname); @@ -126,7 +125,7 @@ char *canonify(char *name) } rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - canonname = fxp_realpath_recv(pktin); + canonname = fxp_realpath_recv(pktin, rreq); if (!canonname) return fullname; /* even that failed; give up */ @@ -235,7 +234,7 @@ int sftp_cmd_ls(struct sftp_command *cmd) sftp_register(req = fxp_opendir_send(cdir)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - dirh = fxp_opendir_recv(pktin); + dirh = fxp_opendir_recv(pktin, rreq); if (dirh == NULL) { printf("Unable to open %s: %s\n", dir, fxp_error()); @@ -248,7 +247,7 @@ int sftp_cmd_ls(struct sftp_command *cmd) sftp_register(req = fxp_readdir_send(dirh)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - names = fxp_readdir_recv(pktin); + names = fxp_readdir_recv(pktin, rreq); if (names == NULL) { if (fxp_error_type() == SSH_FX_EOF) @@ -274,7 +273,7 @@ int sftp_cmd_ls(struct sftp_command *cmd) sftp_register(req = fxp_close_send(dirh)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - fxp_close_recv(pktin); + fxp_close_recv(pktin, rreq); /* * Now we have our filenames. Sort them by actual file @@ -326,7 +325,7 @@ int sftp_cmd_cd(struct sftp_command *cmd) sftp_register(req = fxp_opendir_send(dir)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - dirh = fxp_opendir_recv(pktin); + dirh = fxp_opendir_recv(pktin, rreq); if (!dirh) { printf("Directory %s: %s\n", dir, fxp_error()); @@ -337,7 +336,7 @@ int sftp_cmd_cd(struct sftp_command *cmd) sftp_register(req = fxp_close_send(dirh)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - fxp_close_recv(pktin); + fxp_close_recv(pktin, rreq); sfree(pwd); pwd = dir; @@ -371,6 +370,7 @@ int sftp_general_get(struct sftp_command *cmd, int restart) struct fxp_handle *fh; struct sftp_packet *pktin; struct sftp_request *req, *rreq; + struct fxp_xfer *xfer; char *fname, *outfname; uint64 offset; FILE *fp; @@ -397,7 +397,7 @@ int sftp_general_get(struct sftp_command *cmd, int restart) sftp_register(req = fxp_open_send(fname, SSH_FXF_READ)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - fh = fxp_open_recv(pktin); + fh = fxp_open_recv(pktin, rreq); if (!fh) { printf("%s: %s\n", fname, fxp_error()); @@ -417,7 +417,7 @@ int sftp_general_get(struct sftp_command *cmd, int restart) sftp_register(req = fxp_close_send(fh)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - fxp_close_recv(pktin); + fxp_close_recv(pktin, rreq); sfree(fname); return 0; @@ -440,47 +440,49 @@ int sftp_general_get(struct sftp_command *cmd, int restart) * thus put up a progress bar. */ ret = 1; - while (1) { - char buffer[4096]; - int len; + xfer = xfer_download_init(fh, offset); + while (!xfer_download_done(xfer)) { + void *vbuf; + int ret, len; int wpos, wlen; - sftp_register(req = fxp_read_send(fh, offset, sizeof(buffer))); - rreq = sftp_find_request(pktin = sftp_recv()); - assert(rreq == req); - len = fxp_read_recv(pktin, buffer, sizeof(buffer)); + xfer_download_queue(xfer); + pktin = sftp_recv(); + ret = xfer_download_gotpkt(xfer, pktin); - if ((len == -1 && fxp_error_type() == SSH_FX_EOF) || len == 0) - break; - if (len == -1) { - printf("error while reading: %s\n", fxp_error()); - ret = 0; - break; + if (ret < 0) { + printf("error while reading: %s\n", fxp_error()); + ret = 0; } - wpos = 0; - while (wpos < len) { - wlen = fwrite(buffer, 1, len - wpos, fp); - if (wlen <= 0) { - printf("error while writing local file\n"); + while (xfer_download_data(xfer, &vbuf, &len)) { + unsigned char *buf = (unsigned char *)vbuf; + + wpos = 0; + while (wpos < len) { + wlen = fwrite(buf + wpos, 1, len - wpos, fp); + if (wlen <= 0) { + printf("error while writing local file\n"); + ret = 0; + xfer_set_error(xfer); + } + wpos += wlen; + } + if (wpos < len) { /* we had an error */ ret = 0; - break; + xfer_set_error(xfer); } - wpos += wlen; - } - if (wpos < len) { /* we had an error */ - ret = 0; - break; } - offset = uint64_add32(offset, len); } + xfer_cleanup(xfer); + fclose(fp); sftp_register(req = fxp_close_send(fh)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - fxp_close_recv(pktin); + fxp_close_recv(pktin, rreq); sfree(fname); @@ -544,7 +546,7 @@ int sftp_general_put(struct sftp_command *cmd, int restart) } rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - fh = fxp_open_recv(pktin); + fh = fxp_open_recv(pktin, rreq); if (!fh) { printf("%s: %s\n", outfname, fxp_error()); @@ -560,7 +562,7 @@ int sftp_general_put(struct sftp_command *cmd, int restart) sftp_register(req = fxp_fstat_send(fh)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - ret = fxp_fstat_recv(pktin, &attrs); + ret = fxp_fstat_recv(pktin, rreq, &attrs); if (!ret) { printf("read size of %s: %s\n", outfname, fxp_error()); @@ -609,7 +611,7 @@ int sftp_general_put(struct sftp_command *cmd, int restart) sftp_register(req = fxp_write_send(fh, buffer, offset, len)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - ret = fxp_write_recv(pktin); + ret = fxp_write_recv(pktin, rreq); if (!ret) { printf("error while writing: %s\n", fxp_error()); @@ -622,7 +624,7 @@ int sftp_general_put(struct sftp_command *cmd, int restart) sftp_register(req = fxp_close_send(fh)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - fxp_close_recv(pktin); + fxp_close_recv(pktin, rreq); fclose(fp); sfree(outfname); @@ -664,7 +666,7 @@ int sftp_cmd_mkdir(struct sftp_command *cmd) sftp_register(req = fxp_mkdir_send(dir)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - result = fxp_mkdir_recv(pktin); + result = fxp_mkdir_recv(pktin, rreq); if (!result) { printf("mkdir %s: %s\n", dir, fxp_error()); @@ -702,7 +704,7 @@ int sftp_cmd_rmdir(struct sftp_command *cmd) sftp_register(req = fxp_rmdir_send(dir)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - result = fxp_rmdir_recv(pktin); + result = fxp_rmdir_recv(pktin, rreq); if (!result) { printf("rmdir %s: %s\n", dir, fxp_error()); @@ -740,7 +742,7 @@ int sftp_cmd_rm(struct sftp_command *cmd) sftp_register(req = fxp_remove_send(fname)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - result = fxp_remove_recv(pktin); + result = fxp_remove_recv(pktin, rreq); if (!result) { printf("rm %s: %s\n", fname, fxp_error()); @@ -783,7 +785,7 @@ int sftp_cmd_mv(struct sftp_command *cmd) sftp_register(req = fxp_rename_send(srcfname, dstfname)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - result = fxp_rename_recv(pktin); + result = fxp_rename_recv(pktin, rreq); if (!result) { char const *error = fxp_error(); @@ -798,7 +800,7 @@ int sftp_cmd_mv(struct sftp_command *cmd) sftp_register(req = fxp_stat_send(dstfname)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - result = fxp_stat_recv(pktin, &attrs); + result = fxp_stat_recv(pktin, rreq, &attrs); if (result && (attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS) && @@ -818,7 +820,7 @@ int sftp_cmd_mv(struct sftp_command *cmd) sftp_register(req = fxp_rename_send(srcfname, dstfname)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - result = fxp_rename_recv(pktin); + result = fxp_rename_recv(pktin, rreq); error = result ? NULL : fxp_error(); } @@ -895,20 +897,20 @@ int sftp_cmd_chmod(struct sftp_command *cmd) default: printf("chmod: file mode '%.*s' contains unrecognised" " user/group/other specifier '%c'\n", - strcspn(modebegin, ","), modebegin, *mode); + (int)strcspn(modebegin, ","), modebegin, *mode); return 0; } mode++; } if (!*mode || *mode == ',') { printf("chmod: file mode '%.*s' is incomplete\n", - strcspn(modebegin, ","), modebegin); + (int)strcspn(modebegin, ","), modebegin); return 0; } action = *mode++; if (!*mode || *mode == ',') { printf("chmod: file mode '%.*s' is incomplete\n", - strcspn(modebegin, ","), modebegin); + (int)strcspn(modebegin, ","), modebegin); return 0; } perms = 0; @@ -923,7 +925,7 @@ int sftp_cmd_chmod(struct sftp_command *cmd) (subset & 06777) != 02070) { printf("chmod: file mode '%.*s': set[ug]id bit should" " be used with exactly one of u or g only\n", - strcspn(modebegin, ","), modebegin); + (int)strcspn(modebegin, ","), modebegin); return 0; } perms |= 06000; @@ -931,7 +933,7 @@ int sftp_cmd_chmod(struct sftp_command *cmd) default: printf("chmod: file mode '%.*s' contains unrecognised" " permission specifier '%c'\n", - strcspn(modebegin, ","), modebegin, *mode); + (int)strcspn(modebegin, ","), modebegin, *mode); return 0; } mode++; @@ -939,7 +941,7 @@ int sftp_cmd_chmod(struct sftp_command *cmd) if (!(subset & 06777) && (perms &~ subset)) { printf("chmod: file mode '%.*s' contains no user/group/other" " specifier and permissions other than 't' \n", - strcspn(modebegin, ","), modebegin); + (int)strcspn(modebegin, ","), modebegin); return 0; } perms &= subset; @@ -970,7 +972,7 @@ int sftp_cmd_chmod(struct sftp_command *cmd) sftp_register(req = fxp_stat_send(fname)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - result = fxp_stat_recv(pktin, &attrs); + result = fxp_stat_recv(pktin, rreq, &attrs); if (!result || !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS)) { printf("get attrs for %s: %s\n", fname, @@ -988,7 +990,7 @@ int sftp_cmd_chmod(struct sftp_command *cmd) sftp_register(req = fxp_setstat_send(fname, attrs)); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - result = fxp_setstat_recv(pktin); + result = fxp_setstat_recv(pktin, rreq); if (!result) { printf("set attrs for %s: %s\n", fname, fxp_error()); @@ -1024,34 +1026,21 @@ static int sftp_cmd_open(struct sftp_command *cmd) static int sftp_cmd_lcd(struct sftp_command *cmd) { - char *currdir; - int len; + char *currdir, *errmsg; if (cmd->nwords < 2) { printf("lcd: expects a local directory name\n"); return 0; } - if (!SetCurrentDirectory(cmd->words[1])) { - LPVOID message; - int i; - FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&message, 0, NULL); - i = strcspn((char *)message, "\n"); - printf("lcd: unable to change directory: %.*s\n", i, (LPCTSTR)message); - LocalFree(message); + errmsg = psftp_lcd(cmd->words[1]); + if (errmsg) { + printf("lcd: unable to change directory: %s\n", errmsg); + sfree(errmsg); return 0; } - currdir = snewn(256, char); - len = GetCurrentDirectory(256, currdir); - if (len > 256) - currdir = sresize(currdir, len, char); - GetCurrentDirectory(len, currdir); + currdir = psftp_getcwd(); printf("New local directory is %s\n", currdir); sfree(currdir); @@ -1061,13 +1050,8 @@ static int sftp_cmd_lcd(struct sftp_command *cmd) static int sftp_cmd_lpwd(struct sftp_command *cmd) { char *currdir; - int len; - currdir = snewn(256, char); - len = GetCurrentDirectory(256, currdir); - if (len > 256) - currdir = sresize(currdir, len, char); - GetCurrentDirectory(len, currdir); + currdir = psftp_getcwd(); printf("Current local directory is %s\n", currdir); sfree(currdir); @@ -1108,9 +1092,10 @@ static struct sftp_cmd_lookup { * in ASCII order. */ { - "!", TRUE, "run a local Windows command", + "!", TRUE, "run a local command", "\n" - " Runs a local Windows command. For example, \"!del myfile\".\n", + /* FIXME: this example is crap for non-Windows. */ + " Runs a local command. For example, \"!del myfile\".\n", sftp_cmd_pling }, { @@ -1498,7 +1483,7 @@ static int do_sftp_init(void) sftp_register(req = fxp_realpath_send(".")); rreq = sftp_find_request(pktin = sftp_recv()); assert(rreq == req); - homedir = fxp_realpath_recv(pktin); + homedir = fxp_realpath_recv(pktin, rreq); if (!homedir) { fprintf(stderr, @@ -1621,20 +1606,6 @@ void ldisc_send(void *handle, char *buf, int len, int interactive) } /* - * Be told what socket we're supposed to be using. - */ -static SOCKET sftp_ssh_socket; -char *do_select(SOCKET skt, int startup) -{ - if (startup) - sftp_ssh_socket = skt; - else - sftp_ssh_socket = INVALID_SOCKET; - return NULL; -} -extern int select_result(WPARAM, LPARAM); - -/* * In psftp, all agent requests should be synchronous, so this is a * never-called stub. */ @@ -1729,13 +1700,8 @@ int sftp_recvdata(char *buf, int len) } while (outlen > 0) { - fd_set readfds; - - FD_ZERO(&readfds); - FD_SET(sftp_ssh_socket, &readfds); - if (select(1, &readfds, NULL, NULL, NULL) < 0) + if (ssh_sftp_loop_iteration() < 0) return 0; /* doom */ - select_result((WPARAM) sftp_ssh_socket, (LPARAM) FD_READ); } return 1; @@ -1747,42 +1713,6 @@ int sftp_senddata(char *buf, int len) } /* - * Loop through the ssh connection and authentication process. - */ -static void ssh_sftp_init(void) -{ - if (sftp_ssh_socket == INVALID_SOCKET) - return; - while (!back->sendok(backhandle)) { - fd_set readfds; - FD_ZERO(&readfds); - FD_SET(sftp_ssh_socket, &readfds); - if (select(1, &readfds, NULL, NULL, NULL) < 0) - return; /* doom */ - select_result((WPARAM) sftp_ssh_socket, (LPARAM) FD_READ); - } -} - -/* - * 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)) { - fprintf(stderr, "Unable to initialise WinSock"); - cleanup_exit(1); - } - if (LOBYTE(wsadata.wVersion) != 1 || HIBYTE(wsadata.wVersion) != 1) { - fprintf(stderr, "WinSock version is incompatible with 1.1"); - cleanup_exit(1); - } -} - -/* * Short description of parameters. */ static void usage(void) @@ -1813,6 +1743,7 @@ static int psftp_connect(char *userhost, char *user, int portnumber) { char *host, *realhost; const char *err; + void *logctx; /* Separate host and username */ host = userhost; @@ -1963,7 +1894,12 @@ static int psftp_connect(char *userhost, char *user, int portnumber) logctx = log_init(NULL, &cfg); back->provide_logctx(backhandle, logctx); console_provide_logctx(logctx); - ssh_sftp_init(); + while (!back->sendok(backhandle)) { + if (ssh_sftp_loop_iteration() < 0) { + fprintf(stderr, "ssh_init: error during SSH connection setup\n"); + return 1; + } + } if (verbose && realhost != NULL) printf("Connected to %s\n", realhost); return 0; @@ -1983,7 +1919,7 @@ void cmdline_error(char *p, ...) /* * Main program. Parse arguments etc. */ -int main(int argc, char *argv[]) +int psftp_main(int argc, char *argv[]) { int i; int portnumber = 0; @@ -1993,10 +1929,13 @@ int main(int argc, char *argv[]) char *batchfile = NULL; int errors = 0; - flags = FLAG_STDERR | FLAG_INTERACTIVE | FLAG_SYNCAGENT; + flags = FLAG_STDERR | FLAG_INTERACTIVE +#ifdef FLAG_SYNCAGENT + | FLAG_SYNCAGENT +#endif + ; cmdline_tooltype = TOOLTYPE_FILETRANSFER; ssh_get_line = &console_get_line; - init_winsock(); sk_init(); userhost = user = NULL; @@ -2064,7 +2003,6 @@ int main(int argc, char *argv[]) back->special(backhandle, TS_EOF); sftp_recvdata(&ch, 1); } - WSACleanup(); random_save_seed(); return 0;