/*
- * psftp.c: front end for PSFTP.
+ * psftp.c: (platform-independent) front end for PSFTP.
*/
-#include <windows.h>
-
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#define PUTTY_DO_GLOBALS
#include "putty.h"
+#include "psftp.h"
#include "storage.h"
#include "ssh.h"
#include "sftp.h"
static int psftp_connect(char *userhost, char *user, int portnumber);
static int do_sftp_init(void);
+void do_sftp_cleanup();
/* ----------------------------------------------------------------------
* sftp client state.
struct fxp_handle *fh;
struct sftp_packet *pktin;
struct sftp_request *req, *rreq;
+ struct fxp_xfer *xfer;
char *fname, *outfname;
uint64 offset;
FILE *fp;
* thus put up a progress bar.
*/
ret = 1;
- while (1) {
- char buffer[4096];
- int len;
+ xfer = xfer_download_init(fh, offset);
+ while (!xfer_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, rreq, 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;
+
+ sfree(vbuf);
}
- offset = uint64_add32(offset, len);
}
+ xfer_cleanup(xfer);
+
fclose(fp);
sftp_register(req = fxp_close_send(fh));
int sftp_general_put(struct sftp_command *cmd, int restart)
{
struct fxp_handle *fh;
+ struct fxp_xfer *xfer;
char *fname, *origoutfname, *outfname;
struct sftp_packet *pktin;
struct sftp_request *req, *rreq;
uint64 offset;
FILE *fp;
- int ret;
+ int ret, err, eof;
if (back == NULL) {
printf("psftp: not connected to a host; use \"open host.name\"\n");
* thus put up a progress bar.
*/
ret = 1;
- while (1) {
+ xfer = xfer_upload_init(fh, offset);
+ err = eof = 0;
+ while ((!err && !eof) || !xfer_done(xfer)) {
char buffer[4096];
int len, ret;
- len = fread(buffer, 1, sizeof(buffer), fp);
- if (len == -1) {
- printf("error while reading local file\n");
- ret = 0;
- break;
- } else if (len == 0) {
- break;
+ while (xfer_upload_ready(xfer) && !err && !eof) {
+ len = fread(buffer, 1, sizeof(buffer), fp);
+ if (len == -1) {
+ printf("error while reading local file\n");
+ err = 1;
+ } else if (len == 0) {
+ eof = 1;
+ } else {
+ xfer_upload_data(xfer, buffer, len);
+ }
}
- 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, rreq);
-
- if (!ret) {
- printf("error while writing: %s\n", fxp_error());
- ret = 0;
- break;
+ if (!xfer_done(xfer)) {
+ pktin = sftp_recv();
+ ret = xfer_upload_gotpkt(xfer, pktin);
+ if (!ret) {
+ printf("error while writing: %s\n", fxp_error());
+ err = 1;
+ }
}
- offset = uint64_add32(offset, len);
}
+ xfer_cleanup(xfer);
+
sftp_register(req = fxp_close_send(fh));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
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;
(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;
default:
printf("chmod: file mode '%.*s' contains unrecognised"
" permission specifier '%c'\n",
- strcspn(modebegin, ","), modebegin, *mode);
+ (int)strcspn(modebegin, ","), modebegin, *mode);
return 0;
}
mode++;
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;
static int sftp_cmd_open(struct sftp_command *cmd)
{
+ int portnumber;
+
if (back != NULL) {
printf("psftp: already connected\n");
return 0;
return 0;
}
- if (psftp_connect(cmd->words[1], NULL, 0)) {
+ if (cmd->nwords > 2) {
+ portnumber = atoi(cmd->words[2]);
+ if (portnumber == 0) {
+ printf("open: invalid port number\n");
+ return 0;
+ }
+ } else
+ portnumber = 0;
+
+ if (psftp_connect(cmd->words[1], NULL, portnumber)) {
back = NULL; /* connection is already closed */
return -1; /* this is fatal */
}
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);
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);
* in ASCII order.
*/
{
- "!", TRUE, "run a local Windows command",
+ "!", TRUE, "run a local command",
"<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
},
{
},
{
"open", TRUE, "connect to a host",
- " [<user>@]<hostname>\n"
+ " [<user>@]<hostname> [<port>]\n"
" Establishes an SFTP connection to a given host. Only usable\n"
" when you did not already specify a host name on the command\n"
" line.\n",
struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags)
{
char *line;
- int linelen, linesize;
struct sftp_command *cmd;
char *p, *q, *r;
int quoting;
- if ((mode == 0) || (modeflags & 1)) {
- printf("psftp> ");
- }
- fflush(stdout);
-
cmd = snew(struct sftp_command);
cmd->words = NULL;
cmd->nwords = 0;
cmd->wordssize = 0;
line = NULL;
- linesize = linelen = 0;
- while (1) {
- int len;
- char *ret;
-
- linesize += 512;
- line = sresize(line, linesize, char);
- ret = fgets(line + linelen, linesize - linelen, fp);
-
- if (!ret || (linelen == 0 && line[0] == '\0')) {
- cmd->obey = sftp_cmd_quit;
- if ((mode == 0) || (modeflags & 1))
- printf("quit\n");
- return cmd; /* eof */
- }
- len = linelen + strlen(line + linelen);
- linelen += len;
- if (line[linelen - 1] == '\n') {
- linelen--;
- line[linelen] = '\0';
- break;
- }
+
+ if (fp) {
+ if (modeflags & 1)
+ printf("psftp> ");
+ line = fgetline(fp);
+ } else {
+ line = ssh_sftp_get_cmdline("psftp> ");
}
+
+ if (!line || !*line) {
+ cmd->obey = sftp_cmd_quit;
+ if ((mode == 0) || (modeflags & 1))
+ printf("quit\n");
+ return cmd; /* eof */
+ }
+
+ line[strcspn(line, "\r\n")] = '\0';
+
if (modeflags & 1) {
printf("%s\n", line);
}
*/
cmd->nwords = cmd->wordssize = 2;
cmd->words = sresize(cmd->words, cmd->wordssize, char *);
- cmd->words[0] = "!";
- cmd->words[1] = p+1;
+ cmd->words[0] = dupstr("!");
+ cmd->words[1] = dupstr(p+1);
} else {
/*
cmd->wordssize = cmd->nwords + 16;
cmd->words = sresize(cmd->words, cmd->wordssize, char *);
}
- cmd->words[cmd->nwords++] = q;
+ cmd->words[cmd->nwords++] = dupstr(q);
}
}
+ sfree(line);
+
/*
* Now parse the first word and assign a function.
*/
return 0;
}
+void do_sftp_cleanup()
+{
+ char ch;
+ if (back) {
+ back->special(backhandle, TS_EOF);
+ sftp_recvdata(&ch, 1);
+ back->free(backhandle);
+ sftp_cleanup_request();
+ }
+ if (pwd) {
+ sfree(pwd);
+ pwd = NULL;
+ }
+ if (homedir) {
+ sfree(homedir);
+ homedir = NULL;
+ }
+}
+
void do_sftp(int mode, int modeflags, char *batchfile)
{
FILE *fp;
*/
while (1) {
struct sftp_command *cmd;
- cmd = sftp_getcmd(stdin, 0, 0);
+ cmd = sftp_getcmd(NULL, 0, 0);
if (!cmd)
break;
- if (cmd->obey(cmd) < 0)
+ ret = cmd->obey(cmd);
+ if (cmd->words) {
+ int i;
+ for(i = 0; i < cmd->nwords; i++)
+ sfree(cmd->words[i]);
+ sfree(cmd->words);
+ }
+ sfree(cmd);
+ if (ret < 0)
break;
}
} else {
assert(len == 0);
}
-/*
- * 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.
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;
}
if (!outptr)
return 0;
- if (outlen > 0) {
+ if ((outlen > 0) && (len > 0)) {
unsigned used = outlen;
if (used > len)
used = 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;
}
int sftp_senddata(char *buf, int len)
{
- back->send(backhandle, (unsigned char *) buf, len);
+ back->send(backhandle, buf, len);
return 1;
}
-/*
- * 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.
*/
{
printf("PuTTY Secure File Transfer (SFTP) client\n");
printf("%s\n", ver);
- printf("Usage: psftp [options] user@host\n");
+ printf("Usage: psftp [options] [user@]host\n");
printf("Options:\n");
printf(" -b file use specified batchfile\n");
printf(" -bc output batchfile commands\n");
printf(" -C enable compression\n");
printf(" -i key private key file for authentication\n");
printf(" -batch disable all interactive prompts\n");
+ printf(" -V print version information\n");
cleanup_exit(1);
}
+static void version(void)
+{
+ printf("psftp: %s\n", ver);
+ cleanup_exit(1);
+}
+
/*
* Connect to a host.
*/
{
char *host, *realhost;
const char *err;
+ void *logctx;
/* Separate host and username */
host = userhost;
user = userhost;
}
- /* Try to load settings for this host */
- do_defaults(host, &cfg);
- if (cfg.host[0] == '\0') {
- /* No settings for this host; use defaults */
- do_defaults(NULL, &cfg);
+ /*
+ * If we haven't loaded session details already (e.g., from -load),
+ * try looking for a session called "host".
+ */
+ if (!loaded_session) {
+ /* Try to load settings for `host' into a temporary config */
+ Config cfg2;
+ cfg2.host[0] = '\0';
+ do_defaults(host, &cfg2);
+ if (cfg2.host[0] != '\0') {
+ /* Settings present and include hostname */
+ /* Re-load data into the real config. */
+ do_defaults(host, &cfg);
+ } else {
+ /* Session doesn't exist or mention a hostname. */
+ /* Use `host' as a bare hostname. */
+ strncpy(cfg.host, host, sizeof(cfg.host) - 1);
+ cfg.host[sizeof(cfg.host) - 1] = '\0';
+ }
+ } else {
+ /* Patch in hostname `host' to session details. */
strncpy(cfg.host, host, sizeof(cfg.host) - 1);
cfg.host[sizeof(cfg.host) - 1] = '\0';
}
cfg.port = 22;
}
+ /*
+ * If saved session / Default Settings says SSH-1 (`1 only' or `1'),
+ * then change it to SSH-2, on the grounds that that's more likely to
+ * work for SFTP. (Can be overridden with `-1' option.)
+ * But if it says `2 only' or `2', respect which.
+ */
+ if (cfg.sshprot != 2 && cfg.sshprot != 3)
+ cfg.sshprot = 2;
+
/*
* Enact command-line overrides.
*/
/* See if host is of the form user@host */
if (cfg.host[0] != '\0') {
- char *atsign = strchr(cfg.host, '@');
+ char *atsign = strrchr(cfg.host, '@');
/* Make sure we're not overflowing the user field */
if (atsign) {
if (atsign - cfg.host < sizeof cfg.username) {
cfg.username[sizeof(cfg.username) - 1] = '\0';
}
if (!cfg.username[0]) {
- printf("login as: ");
- fflush(stdout);
- if (!fgets(cfg.username, sizeof(cfg.username), stdin)) {
- fprintf(stderr, "psftp: aborting\n");
+ if (!console_get_line("login as: ",
+ cfg.username, sizeof(cfg.username), FALSE)) {
+ fprintf(stderr, "psftp: no username, aborting\n");
cleanup_exit(1);
} else {
int len = strlen(cfg.username);
if (portnumber)
cfg.port = portnumber;
- /* SFTP uses SSH2 by default always */
- cfg.sshprot = 2;
-
/*
* Disable scary things which shouldn't be enabled for simple
* things like SCP and SFTP: agent forwarding, port forwarding,
back = &ssh_backend;
- err = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port, &realhost,0);
+ err = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port, &realhost,
+ 0, cfg.tcp_keepalives);
if (err != NULL) {
fprintf(stderr, "ssh_init: %s\n", err);
return 1;
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);
+ if (realhost != NULL)
+ sfree(realhost);
return 0;
}
/*
* Main program. Parse arguments etc.
*/
-int main(int argc, char *argv[])
+int psftp_main(int argc, char *argv[])
{
int i;
int portnumber = 0;
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;
+ /* Load Default Settings before doing anything else. */
+ do_defaults(NULL, &cfg);
+ loaded_session = FALSE;
+
errors = 0;
for (i = 1; i < argc; i++) {
int ret;
} else if (strcmp(argv[i], "-h") == 0 ||
strcmp(argv[i], "-?") == 0) {
usage();
+ } else if (strcmp(argv[i], "-V") == 0) {
+ version();
} else if (strcmp(argv[i], "-batch") == 0) {
console_batch_mode = 1;
} else if (strcmp(argv[i], "-b") == 0 && i + 1 < argc) {
argv += i;
back = NULL;
+ /*
+ * If the loaded session provides a hostname, and a hostname has not
+ * otherwise been specified, pop it in `userhost' so that
+ * `psftp -load sessname' is sufficient to start a session.
+ */
+ if (!userhost && cfg.host[0] != '\0') {
+ userhost = dupstr(cfg.host);
+ }
+
/*
* If a user@host string has already been provided, connect to
* it now.
*/
if (userhost) {
- if (psftp_connect(userhost, user, portnumber))
+ int ret;
+ ret = psftp_connect(userhost, user, portnumber);
+ sfree(userhost);
+ if (ret)
return 1;
if (do_sftp_init())
return 1;
} else {
printf("psftp: no hostname specified; use \"open host.name\""
- " to connect\n");
+ " to connect\n");
}
do_sftp(mode, modeflags, batchfile);
back->special(backhandle, TS_EOF);
sftp_recvdata(&ch, 1);
}
- WSACleanup();
random_save_seed();
+ cmdline_cleanup();
+ console_provide_logctx(NULL);
+ do_sftp_cleanup();
+ backhandle = NULL;
+ back = NULL;
+ sk_cleanup();
return 0;
}