*/
/*
- * Determine whether a string is entirely composed of dots.
- */
-static int is_dots(char *str)
-{
- return str[strspn(str, ".")] == '\0';
-}
-
-/*
* Attempt to canonify a pathname starting from the pwd. If
* canonification fails, at least fall back to returning a _valid_
* pathname (though it may be ugly, eg /home/simon/../foobar).
return strcmp(*a, *b);
}
+static void not_connected(void)
+{
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+}
+
/* ----------------------------------------------------------------------
* The meat of the `get' and `put' commands.
*/
-int sftp_get_file(char *fname, char *outfname, int recurse, int restart,
- char *wildcard)
+int sftp_get_file(char *fname, char *outfname, int recurse, int restart)
{
struct fxp_handle *fh;
struct sftp_packet *pktin;
struct sftp_request *req, *rreq;
struct fxp_xfer *xfer;
uint64 offset;
- FILE *fp;
- int ret;
+ WFile *file;
+ int ret, shown_err = FALSE;
/*
* In recursive mode, see if we're dealing with a directory.
* (If we're not in recursive mode, we need not even check: the
* subsequent FXP_OPEN will return a usable error message.)
*/
- if (wildcard || recurse) {
+ if (recurse) {
struct fxp_attrs attrs;
int result;
- if (!wildcard) {
- sftp_register(req = fxp_stat_send(fname));
- rreq = sftp_find_request(pktin = sftp_recv());
- assert(rreq == req);
- result = fxp_stat_recv(pktin, rreq, &attrs);
- } else
- result = 0; /* placate optimisers */
+ sftp_register(req = fxp_stat_send(fname));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ result = fxp_stat_recv(pktin, rreq, &attrs);
- if (wildcard ||
- (result &&
- (attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS) &&
- (attrs.permissions & 0040000))) {
+ if (result &&
+ (attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS) &&
+ (attrs.permissions & 0040000)) {
struct fxp_handle *dirhandle;
int nnames, namesize;
/*
* First, attempt to create the destination directory,
- * unless it already exists (or this is a wildcard
- * run).
+ * unless it already exists.
*/
- if (!wildcard &&
- file_type(outfname) != FILE_TYPE_DIRECTORY &&
+ if (file_type(outfname) != FILE_TYPE_DIRECTORY &&
!create_directory(outfname)) {
printf("%s: Cannot create directory\n", outfname);
return 0;
ournames = sresize(ournames, namesize, struct fxp_name *);
}
for (i = 0; i < names->nnames; i++)
- if (!is_dots(names->names[i].filename) &&
- (!wildcard || wc_match(wildcard,
- names->names[i].filename)))
- ournames[nnames++] = fxp_dup_name(&names->names[i]);
+ if (strcmp(names->names[i].filename, ".") &&
+ strcmp(names->names[i].filename, "..")) {
+ if (!vet_filename(names->names[i].filename)) {
+ printf("ignoring potentially dangerous server-"
+ "supplied filename '%s'\n",
+ names->names[i].filename);
+ } else {
+ ournames[nnames++] =
+ fxp_dup_name(&names->names[i]);
+ }
+ }
fxp_free_names(names);
}
sftp_register(req = fxp_close_send(dirhandle));
fxp_close_recv(pktin, rreq);
/*
- * A polite warning if nothing at all matched the
- * wildcard.
- */
- if (wildcard && !nnames) {
- printf("%s: nothing matched\n", wildcard);
- }
-
- /*
* Sort the names into a clear order. This ought to
* make things more predictable when we're doing a
* reget of the same directory, just in case two
ournames[i]->filename);
else
nextoutfname = dupstr(ournames[i]->filename);
- ret = sftp_get_file(nextfname, nextoutfname,
- recurse, restart, NULL);
+ ret = sftp_get_file(nextfname, nextoutfname, recurse, restart);
restart = FALSE; /* after first partial file, do full */
sfree(nextoutfname);
sfree(nextfname);
fh = fxp_open_recv(pktin, rreq);
if (!fh) {
- printf("%s: %s\n", fname, fxp_error());
+ printf("%s: open for read: %s\n", fname, fxp_error());
return 0;
}
if (restart) {
- fp = fopen(outfname, "rb+");
+ file = open_existing_wfile(outfname, NULL);
} else {
- fp = fopen(outfname, "wb");
+ file = open_new_file(outfname);
}
- if (!fp) {
+ if (!file) {
printf("local: unable to open %s\n", outfname);
sftp_register(req = fxp_close_send(fh));
}
if (restart) {
- long posn;
- fseek(fp, 0L, SEEK_END);
- posn = ftell(fp);
- printf("reget: restarting at file position %ld\n", posn);
- offset = uint64_make(0, posn);
+ char decbuf[30];
+ if (seek_file(file, uint64_make(0,0) , FROM_END) == -1) {
+ printf("reget: cannot restart %s - file too large\n",
+ outfname);
+ sftp_register(req = fxp_close_send(fh));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ fxp_close_recv(pktin, rreq);
+
+ return 0;
+ }
+
+ offset = get_file_posn(file);
+ uint64_decimal(offset, decbuf);
+ printf("reget: restarting at file position %s\n", decbuf);
} else {
offset = uint64_make(0, 0);
}
ret = xfer_download_gotpkt(xfer, pktin);
if (ret < 0) {
- printf("error while reading: %s\n", fxp_error());
+ if (!shown_err) {
+ printf("error while reading: %s\n", fxp_error());
+ shown_err = TRUE;
+ }
ret = 0;
}
wpos = 0;
while (wpos < len) {
- wlen = fwrite(buf + wpos, 1, len - wpos, fp);
+ wlen = write_to_file(file, buf + wpos, len - wpos);
if (wlen <= 0) {
printf("error while writing local file\n");
ret = 0;
xfer_cleanup(xfer);
- fclose(fp);
+ close_wfile(file);
sftp_register(req = fxp_close_send(fh));
rreq = sftp_find_request(pktin = sftp_recv());
return ret;
}
-int sftp_put_file(char *fname, char *outfname, int recurse, int restart,
- char *wildcard)
+int sftp_put_file(char *fname, char *outfname, int recurse, int restart)
{
struct fxp_handle *fh;
struct fxp_xfer *xfer;
struct sftp_packet *pktin;
struct sftp_request *req, *rreq;
uint64 offset;
- FILE *fp;
+ RFile *file;
int ret, err, eof;
/*
* (If we're not in recursive mode, we need not even check: the
* subsequent fopen will return an error message.)
*/
- if (wildcard || (recurse && file_type(fname) == FILE_TYPE_DIRECTORY)) {
+ if (recurse && file_type(fname) == FILE_TYPE_DIRECTORY) {
struct fxp_attrs attrs;
int result;
int nnames, namesize;
DirHandle *dh;
int i;
- if (!wildcard) {
- /*
- * First, attempt to create the destination directory,
- * unless it already exists.
- */
- sftp_register(req = fxp_stat_send(outfname));
+ /*
+ * First, attempt to create the destination directory,
+ * unless it already exists.
+ */
+ sftp_register(req = fxp_stat_send(outfname));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ result = fxp_stat_recv(pktin, rreq, &attrs);
+ if (!result ||
+ !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS) ||
+ !(attrs.permissions & 0040000)) {
+ sftp_register(req = fxp_mkdir_send(outfname));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- result = fxp_stat_recv(pktin, rreq, &attrs);
- if (!result ||
- !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS) ||
- !(attrs.permissions & 0040000)) {
- sftp_register(req = fxp_mkdir_send(outfname));
- rreq = sftp_find_request(pktin = sftp_recv());
- assert(rreq == req);
- result = fxp_mkdir_recv(pktin, rreq);
+ result = fxp_mkdir_recv(pktin, rreq);
- if (!result) {
- printf("%s: create directory: %s\n",
- outfname, fxp_error());
- return 0;
- }
+ if (!result) {
+ printf("%s: create directory: %s\n",
+ outfname, fxp_error());
+ return 0;
}
}
*/
nnames = namesize = 0;
ournames = NULL;
- if (wildcard) {
- WildcardMatcher *wcm;
- wcm = begin_wildcard_matching(wildcard);
- if (wcm) {
- while ((name = wildcard_get_filename(wcm)) != NULL) {
- if (nnames >= namesize) {
- namesize += 128;
- ournames = sresize(ournames, namesize, char *);
- }
- ournames[nnames++] = name;
- }
- finish_wildcard_matching(wcm);
- }
- } else {
- dh = open_directory(fname);
- if (!dh) {
- printf("%s: unable to open directory\n", fname);
- return 0;
- }
- while ((name = read_filename(dh)) != NULL) {
- if (nnames >= namesize) {
- namesize += 128;
- ournames = sresize(ournames, namesize, char *);
- }
- ournames[nnames++] = name;
- }
- close_directory(dh);
+ dh = open_directory(fname);
+ if (!dh) {
+ printf("%s: unable to open directory\n", fname);
+ return 0;
}
-
- /*
- * A polite warning if nothing at all matched the
- * wildcard.
- */
- if (wildcard && !nnames) {
- printf("%s: nothing matched\n", wildcard);
+ while ((name = read_filename(dh)) != NULL) {
+ if (nnames >= namesize) {
+ namesize += 128;
+ ournames = sresize(ournames, namesize, char *);
+ }
+ ournames[nnames++] = name;
}
+ close_directory(dh);
/*
* Sort the names into a clear order. This ought to make
else
nextfname = dupstr(ournames[i]);
nextoutfname = dupcat(outfname, "/", ournames[i], NULL);
- ret = sftp_put_file(nextfname, nextoutfname,
- recurse, restart, NULL);
+ ret = sftp_put_file(nextfname, nextoutfname, recurse, restart);
restart = FALSE; /* after first partial file, do full */
sfree(nextoutfname);
sfree(nextfname);
return 1;
}
- fp = fopen(fname, "rb");
- if (!fp) {
+ file = open_existing_file(fname, NULL, NULL, NULL);
+ if (!file) {
printf("local: unable to open %s\n", fname);
return 0;
}
fh = fxp_open_recv(pktin, rreq);
if (!fh) {
- printf("%s: %s\n", outfname, fxp_error());
+ printf("%s: open for write: %s\n", outfname, fxp_error());
return 0;
}
offset = attrs.size;
uint64_decimal(offset, decbuf);
printf("reput: restarting at file position %s\n", decbuf);
- if (uint64_compare(offset, uint64_make(0, LONG_MAX)) > 0) {
- printf("reput: remote file is larger than we can deal with\n");
- return 0;
- }
- if (fseek(fp, offset.lo, SEEK_SET) != 0)
- fseek(fp, 0, SEEK_END); /* *shrug* */
+
+ if (seek_file((WFile *)file, offset, FROM_START) != 0)
+ seek_file((WFile *)file, uint64_make(0,0), FROM_END); /* *shrug* */
} else {
offset = uint64_make(0, 0);
}
int len, ret;
while (xfer_upload_ready(xfer) && !err && !eof) {
- len = fread(buffer, 1, sizeof(buffer), fp);
+ len = read_from_file(file, buffer, sizeof(buffer));
if (len == -1) {
printf("error while reading local file\n");
err = 1;
assert(rreq == req);
fxp_close_recv(pktin, rreq);
- fclose(fp);
+ close_rfile(file);
return ret;
}
/* ----------------------------------------------------------------------
+ * A remote wildcard matcher, providing a similar interface to the
+ * local one in psftp.h.
+ */
+
+typedef struct SftpWildcardMatcher {
+ struct fxp_handle *dirh;
+ struct fxp_names *names;
+ int namepos;
+ char *wildcard, *prefix;
+} SftpWildcardMatcher;
+
+SftpWildcardMatcher *sftp_begin_wildcard_matching(char *name)
+{
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
+ char *wildcard;
+ char *unwcdir, *tmpdir, *cdir;
+ int len, check;
+ SftpWildcardMatcher *swcm;
+ struct fxp_handle *dirh;
+
+ /*
+ * We don't handle multi-level wildcards; so we expect to find
+ * a fully specified directory part, followed by a wildcard
+ * after that.
+ */
+ wildcard = stripslashes(name, 0);
+
+ unwcdir = dupstr(name);
+ len = wildcard - name;
+ unwcdir[len] = '\0';
+ if (len > 0 && unwcdir[len-1] == '/')
+ unwcdir[len-1] = '\0';
+ tmpdir = snewn(1 + len, char);
+ check = wc_unescape(tmpdir, unwcdir);
+ sfree(tmpdir);
+
+ if (!check) {
+ printf("Multiple-level wildcards are not supported\n");
+ sfree(unwcdir);
+ return NULL;
+ }
+
+ cdir = canonify(unwcdir);
+
+ sftp_register(req = fxp_opendir_send(cdir));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ dirh = fxp_opendir_recv(pktin, rreq);
+
+ if (dirh) {
+ swcm = snew(SftpWildcardMatcher);
+ swcm->dirh = dirh;
+ swcm->names = NULL;
+ swcm->wildcard = dupstr(wildcard);
+ swcm->prefix = unwcdir;
+ } else {
+ printf("Unable to open %s: %s\n", cdir, fxp_error());
+ swcm = NULL;
+ sfree(unwcdir);
+ }
+
+ sfree(cdir);
+
+ return swcm;
+}
+
+char *sftp_wildcard_get_filename(SftpWildcardMatcher *swcm)
+{
+ struct fxp_name *name;
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
+
+ while (1) {
+ if (swcm->names && swcm->namepos >= swcm->names->nnames) {
+ fxp_free_names(swcm->names);
+ swcm->names = NULL;
+ }
+
+ if (!swcm->names) {
+ sftp_register(req = fxp_readdir_send(swcm->dirh));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ swcm->names = fxp_readdir_recv(pktin, rreq);
+
+ if (!swcm->names) {
+ if (fxp_error_type() != SSH_FX_EOF)
+ printf("%s: reading directory: %s\n", swcm->prefix,
+ fxp_error());
+ return NULL;
+ }
+
+ swcm->namepos = 0;
+ }
+
+ assert(swcm->names && swcm->namepos < swcm->names->nnames);
+
+ name = &swcm->names->names[swcm->namepos++];
+
+ if (!strcmp(name->filename, ".") || !strcmp(name->filename, ".."))
+ continue; /* expected bad filenames */
+
+ if (!vet_filename(name->filename)) {
+ printf("ignoring potentially dangerous server-"
+ "supplied filename '%s'\n", name->filename);
+ continue; /* unexpected bad filename */
+ }
+
+ if (!wc_match(swcm->wildcard, name->filename))
+ continue; /* doesn't match the wildcard */
+
+ /*
+ * We have a working filename. Return it.
+ */
+ return dupprintf("%s%s%s", swcm->prefix,
+ (!swcm->prefix[0] ||
+ swcm->prefix[strlen(swcm->prefix)-1]=='/' ?
+ "" : "/"),
+ name->filename);
+ }
+}
+
+void sftp_finish_wildcard_matching(SftpWildcardMatcher *swcm)
+{
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
+
+ sftp_register(req = fxp_close_send(swcm->dirh));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ fxp_close_recv(pktin, rreq);
+
+ if (swcm->names)
+ fxp_free_names(swcm->names);
+
+ sfree(swcm->prefix);
+ sfree(swcm->wildcard);
+
+ sfree(swcm);
+}
+
+/*
+ * General function to match a potential wildcard in a filename
+ * argument and iterate over every matching file. Used in several
+ * PSFTP commands (rmdir, rm, chmod, mv).
+ */
+int wildcard_iterate(char *filename, int (*func)(void *, char *), void *ctx)
+{
+ char *unwcfname, *newname, *cname;
+ int is_wc, ret;
+
+ unwcfname = snewn(strlen(filename)+1, char);
+ is_wc = !wc_unescape(unwcfname, filename);
+
+ if (is_wc) {
+ SftpWildcardMatcher *swcm = sftp_begin_wildcard_matching(filename);
+ int matched = FALSE;
+ sfree(unwcfname);
+
+ if (!swcm)
+ return 0;
+
+ ret = 1;
+
+ while ( (newname = sftp_wildcard_get_filename(swcm)) != NULL ) {
+ cname = canonify(newname);
+ if (!cname) {
+ printf("%s: canonify: %s\n", newname, fxp_error());
+ ret = 0;
+ }
+ matched = TRUE;
+ ret &= func(ctx, cname);
+ sfree(cname);
+ }
+
+ if (!matched) {
+ /* Politely warn the user that nothing matched. */
+ printf("%s: nothing matched\n", filename);
+ }
+
+ sftp_finish_wildcard_matching(swcm);
+ } else {
+ cname = canonify(unwcfname);
+ if (!cname) {
+ printf("%s: canonify: %s\n", filename, fxp_error());
+ ret = 0;
+ }
+ ret = func(ctx, cname);
+ sfree(cname);
+ sfree(unwcfname);
+ }
+
+ return ret;
+}
+
+/*
+ * Handy helper function.
+ */
+int is_wildcard(char *name)
+{
+ char *unwcfname = snewn(strlen(name)+1, char);
+ int is_wc = !wc_unescape(unwcfname, name);
+ sfree(unwcfname);
+ return is_wc;
+}
+
+/* ----------------------------------------------------------------------
* Actual sftp commands.
*/
struct sftp_command {
int sftp_cmd_close(struct sftp_command *cmd)
{
if (back == NULL) {
- printf("psftp: not connected to a host; use \"open host.name\"\n");
+ not_connected();
return 0;
}
- if (back != NULL && back->socket(backhandle) != NULL) {
+ if (back != NULL && back->connected(backhandle)) {
char ch;
back->special(backhandle, TS_EOF);
sftp_recvdata(&ch, 1);
int i;
if (back == NULL) {
- printf("psftp: not connected to a host; use \"open host.name\"\n");
+ not_connected();
return 0;
}
cdir = canonify(dir);
if (!cdir) {
- printf("%s: %s\n", dir, fxp_error());
+ printf("%s: canonify: %s\n", dir, fxp_error());
sfree(unwcdir);
return 0;
}
char *dir;
if (back == NULL) {
- printf("psftp: not connected to a host; use \"open host.name\"\n");
+ not_connected();
return 0;
}
dir = canonify(cmd->words[1]);
if (!dir) {
- printf("%s: %s\n", dir, fxp_error());
+ printf("%s: canonify: %s\n", dir, fxp_error());
return 0;
}
int sftp_cmd_pwd(struct sftp_command *cmd)
{
if (back == NULL) {
- printf("psftp: not connected to a host; use \"open host.name\"\n");
+ not_connected();
return 0;
}
*/
int sftp_general_get(struct sftp_command *cmd, int restart, int multiple)
{
- char *fname, *unwcfname, *origfname, *outfname;
+ char *fname, *unwcfname, *origfname, *origwfname, *outfname;
int i, ret;
int recurse = FALSE;
if (back == NULL) {
- printf("psftp: not connected to a host; use \"open host.name\"\n");
+ not_connected();
return 0;
}
} else if (!strcmp(cmd->words[i], "-r")) {
recurse = TRUE;
} else {
- printf("get: unrecognised option '%s'\n", cmd->words[i]);
+ printf("%s: unrecognised option '%s'\n", cmd->words[0], cmd->words[i]);
return 0;
}
i++;
}
if (i >= cmd->nwords) {
- printf("get: expects a filename\n");
+ printf("%s: expects a filename\n", cmd->words[0]);
return 0;
}
+ ret = 1;
do {
- unwcfname = NULL;
+ SftpWildcardMatcher *swcm;
+
origfname = cmd->words[i++];
+ unwcfname = snewn(strlen(origfname)+1, char);
- if (multiple &&
- !wc_unescape(unwcfname = snewn(strlen(origfname)+1, char),
- origfname)) {
- ret = sftp_get_file(pwd, NULL, recurse, restart, origfname);
+ if (multiple && !wc_unescape(unwcfname, origfname)) {
+ swcm = sftp_begin_wildcard_matching(origfname);
+ if (!swcm) {
+ sfree(unwcfname);
+ continue;
+ }
+ origwfname = sftp_wildcard_get_filename(swcm);
+ if (!origwfname) {
+ /* Politely warn the user that nothing matched. */
+ printf("%s: nothing matched\n", origfname);
+ sftp_finish_wildcard_matching(swcm);
+ sfree(unwcfname);
+ continue;
+ }
} else {
- fname = canonify(origfname);
+ origwfname = origfname;
+ swcm = NULL;
+ }
+
+ while (origwfname) {
+ fname = canonify(origwfname);
+
if (!fname) {
- printf("%s: %s\n", origfname, fxp_error());
+ printf("%s: canonify: %s\n", origwfname, fxp_error());
sfree(unwcfname);
return 0;
}
if (!multiple && i < cmd->nwords)
outfname = cmd->words[i++];
else
- outfname = stripslashes(origfname, 0);
+ outfname = stripslashes(origwfname, 0);
- ret = sftp_get_file(fname, outfname, recurse, restart, NULL);
+ ret = sftp_get_file(fname, outfname, recurse, restart);
sfree(fname);
+
+ if (swcm) {
+ sfree(origwfname);
+ origwfname = sftp_wildcard_get_filename(swcm);
+ } else {
+ origwfname = NULL;
+ }
}
sfree(unwcfname);
+ if (swcm)
+ sftp_finish_wildcard_matching(swcm);
if (!ret)
return ret;
*/
int sftp_general_put(struct sftp_command *cmd, int restart, int multiple)
{
- char *fname, *origoutfname, *outfname;
+ char *fname, *wfname, *origoutfname, *outfname;
int i, ret;
int recurse = FALSE;
if (back == NULL) {
- printf("psftp: not connected to a host; use \"open host.name\"\n");
+ not_connected();
return 0;
}
} else if (!strcmp(cmd->words[i], "-r")) {
recurse = TRUE;
} else {
- printf("put: unrecognised option '%s'\n", cmd->words[i]);
+ printf("%s: unrecognised option '%s'\n", cmd->words[0], cmd->words[i]);
return 0;
}
i++;
}
if (i >= cmd->nwords) {
- printf("put: expects a filename\n");
+ printf("%s: expects a filename\n", cmd->words[0]);
return 0;
}
+ ret = 1;
do {
+ WildcardMatcher *wcm;
fname = cmd->words[i++];
if (multiple && test_wildcard(fname, FALSE) == WCTYPE_WILDCARD) {
- ret = sftp_put_file(NULL, pwd, recurse, restart, fname);
+ wcm = begin_wildcard_matching(fname);
+ wfname = wildcard_get_filename(wcm);
+ if (!wfname) {
+ /* Politely warn the user that nothing matched. */
+ printf("%s: nothing matched\n", fname);
+ finish_wildcard_matching(wcm);
+ continue;
+ }
} else {
+ wfname = fname;
+ wcm = NULL;
+ }
+
+ while (wfname) {
if (!multiple && i < cmd->nwords)
origoutfname = cmd->words[i++];
else
- origoutfname = stripslashes(fname, 1);
+ origoutfname = stripslashes(wfname, 1);
outfname = canonify(origoutfname);
if (!outfname) {
- printf("%s: %s\n", origoutfname, fxp_error());
+ printf("%s: canonify: %s\n", origoutfname, fxp_error());
+ if (wcm) {
+ sfree(wfname);
+ finish_wildcard_matching(wcm);
+ }
return 0;
}
- ret = sftp_put_file(fname, outfname, recurse, restart, NULL);
+ ret = sftp_put_file(wfname, outfname, recurse, restart);
sfree(outfname);
+
+ if (wcm) {
+ sfree(wfname);
+ wfname = wildcard_get_filename(wcm);
+ } else {
+ wfname = NULL;
+ }
}
+
+ if (wcm)
+ finish_wildcard_matching(wcm);
+
if (!ret)
return ret;
struct sftp_packet *pktin;
struct sftp_request *req, *rreq;
int result;
+ int i, ret;
if (back == NULL) {
- printf("psftp: not connected to a host; use \"open host.name\"\n");
+ not_connected();
return 0;
}
return 0;
}
- dir = canonify(cmd->words[1]);
- if (!dir) {
- printf("%s: %s\n", dir, fxp_error());
- return 0;
+ ret = 1;
+ for (i = 1; i < cmd->nwords; i++) {
+ dir = canonify(cmd->words[i]);
+ if (!dir) {
+ printf("%s: canonify: %s\n", dir, fxp_error());
+ return 0;
+ }
+
+ sftp_register(req = fxp_mkdir_send(dir));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ result = fxp_mkdir_recv(pktin, rreq);
+
+ if (!result) {
+ printf("mkdir %s: %s\n", dir, fxp_error());
+ ret = 0;
+ } else
+ printf("mkdir %s: OK\n", dir);
+
+ sfree(dir);
}
- sftp_register(req = fxp_mkdir_send(dir));
+ return ret;
+}
+
+static int sftp_action_rmdir(void *vctx, char *dir)
+{
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
+ int result;
+
+ sftp_register(req = fxp_rmdir_send(dir));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- result = fxp_mkdir_recv(pktin, rreq);
+ result = fxp_rmdir_recv(pktin, rreq);
if (!result) {
- printf("mkdir %s: %s\n", dir, fxp_error());
- sfree(dir);
+ printf("rmdir %s: %s\n", dir, fxp_error());
return 0;
}
- sfree(dir);
+ printf("rmdir %s: OK\n", dir);
+
return 1;
}
int sftp_cmd_rmdir(struct sftp_command *cmd)
{
- char *dir;
- struct sftp_packet *pktin;
- struct sftp_request *req, *rreq;
- int result;
+ int i, ret;
if (back == NULL) {
- printf("psftp: not connected to a host; use \"open host.name\"\n");
+ not_connected();
return 0;
}
return 0;
}
- dir = canonify(cmd->words[1]);
- if (!dir) {
- printf("%s: %s\n", dir, fxp_error());
- return 0;
- }
+ ret = 1;
+ for (i = 1; i < cmd->nwords; i++)
+ ret &= wildcard_iterate(cmd->words[i], sftp_action_rmdir, NULL);
- sftp_register(req = fxp_rmdir_send(dir));
+ return ret;
+}
+
+static int sftp_action_rm(void *vctx, char *fname)
+{
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
+ int result;
+
+ sftp_register(req = fxp_remove_send(fname));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- result = fxp_rmdir_recv(pktin, rreq);
+ result = fxp_remove_recv(pktin, rreq);
if (!result) {
- printf("rmdir %s: %s\n", dir, fxp_error());
- sfree(dir);
+ printf("rm %s: %s\n", fname, fxp_error());
return 0;
}
- sfree(dir);
+ printf("rm %s: OK\n", fname);
+
return 1;
}
int sftp_cmd_rm(struct sftp_command *cmd)
{
- char *fname;
- struct sftp_packet *pktin;
- struct sftp_request *req, *rreq;
- int result;
+ int i, ret;
if (back == NULL) {
- printf("psftp: not connected to a host; use \"open host.name\"\n");
+ not_connected();
return 0;
}
return 0;
}
- fname = canonify(cmd->words[1]);
- if (!fname) {
- printf("%s: %s\n", fname, fxp_error());
- return 0;
+ ret = 1;
+ for (i = 1; i < cmd->nwords; i++)
+ ret &= wildcard_iterate(cmd->words[i], sftp_action_rm, NULL);
+
+ return ret;
+}
+
+static int check_is_dir(char *dstfname)
+{
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
+ struct fxp_attrs attrs;
+ int result;
+
+ sftp_register(req = fxp_stat_send(dstfname));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ result = fxp_stat_recv(pktin, rreq, &attrs);
+
+ if (result &&
+ (attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS) &&
+ (attrs.permissions & 0040000))
+ return TRUE;
+ else
+ return FALSE;
+}
+
+struct sftp_context_mv {
+ char *dstfname;
+ int dest_is_dir;
+};
+
+static int sftp_action_mv(void *vctx, char *srcfname)
+{
+ struct sftp_context_mv *ctx = (struct sftp_context_mv *)vctx;
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
+ const char *error;
+ char *finalfname, *newcanon = NULL;
+ int ret, result;
+
+ if (ctx->dest_is_dir) {
+ char *p;
+ char *newname;
+
+ p = srcfname + strlen(srcfname);
+ while (p > srcfname && p[-1] != '/') p--;
+ newname = dupcat(ctx->dstfname, "/", p, NULL);
+ newcanon = canonify(newname);
+ if (!newcanon) {
+ printf("%s: canonify: %s\n", newname, fxp_error());
+ sfree(newname);
+ return 0;
+ }
+ sfree(newname);
+
+ finalfname = newcanon;
+ } else {
+ finalfname = ctx->dstfname;
}
- sftp_register(req = fxp_remove_send(fname));
+ sftp_register(req = fxp_rename_send(srcfname, finalfname));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- result = fxp_remove_recv(pktin, rreq);
+ result = fxp_rename_recv(pktin, rreq);
- if (!result) {
- printf("rm %s: %s\n", fname, fxp_error());
- sfree(fname);
- return 0;
+ error = result ? NULL : fxp_error();
+
+ if (error) {
+ printf("mv %s %s: %s\n", srcfname, finalfname, error);
+ ret = 0;
+ } else {
+ printf("%s -> %s\n", srcfname, finalfname);
+ ret = 1;
}
- sfree(fname);
- return 1;
+ sfree(newcanon);
+ return ret;
}
int sftp_cmd_mv(struct sftp_command *cmd)
{
- char *srcfname, *dstfname;
- struct sftp_packet *pktin;
- struct sftp_request *req, *rreq;
- int result;
+ struct sftp_context_mv actx, *ctx = &actx;
+ int i, ret;
if (back == NULL) {
- printf("psftp: not connected to a host; use \"open host.name\"\n");
+ not_connected();
return 0;
}
printf("mv: expects two filenames\n");
return 0;
}
- srcfname = canonify(cmd->words[1]);
- if (!srcfname) {
- printf("%s: %s\n", srcfname, fxp_error());
+
+ ctx->dstfname = canonify(cmd->words[cmd->nwords-1]);
+ if (!ctx->dstfname) {
+ printf("%s: canonify: %s\n", ctx->dstfname, fxp_error());
return 0;
}
- dstfname = canonify(cmd->words[2]);
- if (!dstfname) {
- printf("%s: %s\n", dstfname, fxp_error());
+ /*
+ * If there's more than one source argument, or one source
+ * argument which is a wildcard, we _require_ that the
+ * destination is a directory.
+ */
+ ctx->dest_is_dir = check_is_dir(ctx->dstfname);
+ if ((cmd->nwords > 3 || is_wildcard(cmd->words[1])) && !ctx->dest_is_dir) {
+ printf("mv: multiple or wildcard arguments require the destination"
+ " to be a directory\n");
+ sfree(ctx->dstfname);
return 0;
}
- sftp_register(req = fxp_rename_send(srcfname, dstfname));
+ /*
+ * Now iterate over the source arguments.
+ */
+ ret = 1;
+ for (i = 1; i < cmd->nwords-1; i++)
+ ret &= wildcard_iterate(cmd->words[i], sftp_action_mv, ctx);
+
+ sfree(ctx->dstfname);
+ return ret;
+}
+
+struct sftp_context_chmod {
+ unsigned attrs_clr, attrs_xor;
+};
+
+static int sftp_action_chmod(void *vctx, char *fname)
+{
+ struct fxp_attrs attrs;
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
+ int result;
+ unsigned oldperms, newperms;
+ struct sftp_context_chmod *ctx = (struct sftp_context_chmod *)vctx;
+
+ sftp_register(req = fxp_stat_send(fname));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- result = fxp_rename_recv(pktin, rreq);
+ result = fxp_stat_recv(pktin, rreq, &attrs);
- if (!result) {
- char const *error = fxp_error();
- struct fxp_attrs attrs;
+ if (!result || !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS)) {
+ printf("get attrs for %s: %s\n", fname,
+ result ? "file permissions not provided" : fxp_error());
+ return 0;
+ }
- /*
- * The move might have failed because dstfname pointed at a
- * directory. We check this possibility now: if dstfname
- * _is_ a directory, we re-attempt the move by appending
- * the basename of srcfname to dstfname.
- */
- sftp_register(req = fxp_stat_send(dstfname));
- rreq = sftp_find_request(pktin = sftp_recv());
- assert(rreq == req);
- result = fxp_stat_recv(pktin, rreq, &attrs);
+ attrs.flags = SSH_FILEXFER_ATTR_PERMISSIONS; /* perms _only_ */
+ oldperms = attrs.permissions & 07777;
+ attrs.permissions &= ~ctx->attrs_clr;
+ attrs.permissions ^= ctx->attrs_xor;
+ newperms = attrs.permissions & 07777;
- if (result &&
- (attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS) &&
- (attrs.permissions & 0040000)) {
- char *p;
- char *newname, *newcanon;
- printf("(destination %s is a directory)\n", dstfname);
- p = srcfname + strlen(srcfname);
- while (p > srcfname && p[-1] != '/') p--;
- newname = dupcat(dstfname, "/", p, NULL);
- newcanon = canonify(newname);
- sfree(newname);
- if (newcanon) {
- sfree(dstfname);
- dstfname = newcanon;
+ if (oldperms == newperms)
+ return 1; /* no need to do anything! */
- sftp_register(req = fxp_rename_send(srcfname, dstfname));
- rreq = sftp_find_request(pktin = sftp_recv());
- assert(rreq == req);
- result = fxp_rename_recv(pktin, rreq);
+ sftp_register(req = fxp_setstat_send(fname, attrs));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ result = fxp_setstat_recv(pktin, rreq);
- error = result ? NULL : fxp_error();
- }
- }
- if (error) {
- printf("mv %s %s: %s\n", srcfname, dstfname, error);
- sfree(srcfname);
- sfree(dstfname);
- return 0;
- }
+ if (!result) {
+ printf("set attrs for %s: %s\n", fname, fxp_error());
+ return 0;
}
- printf("%s -> %s\n", srcfname, dstfname);
- sfree(srcfname);
- sfree(dstfname);
+ printf("%s: %04o -> %04o\n", fname, oldperms, newperms);
+
return 1;
}
int sftp_cmd_chmod(struct sftp_command *cmd)
{
- char *fname, *mode;
- int result;
- struct fxp_attrs attrs;
- unsigned attrs_clr, attrs_xor, oldperms, newperms;
- struct sftp_packet *pktin;
- struct sftp_request *req, *rreq;
+ char *mode;
+ int i, ret;
+ struct sftp_context_chmod actx, *ctx = &actx;
if (back == NULL) {
- printf("psftp: not connected to a host; use \"open host.name\"\n");
+ not_connected();
return 0;
}
* Additionally, the s attribute may not be specified for any
* [ugoa] specifications other than exactly u or exactly g.
*/
- attrs_clr = attrs_xor = 0;
+ ctx->attrs_clr = ctx->attrs_xor = 0;
mode = cmd->words[1];
if (mode[0] >= '0' && mode[0] <= '9') {
if (mode[strspn(mode, "01234567")]) {
" contain digits 0-7 only\n");
return 0;
}
- attrs_clr = 07777;
- sscanf(mode, "%o", &attrs_xor);
- attrs_xor &= attrs_clr;
+ ctx->attrs_clr = 07777;
+ sscanf(mode, "%o", &ctx->attrs_xor);
+ ctx->attrs_xor &= ctx->attrs_clr;
} else {
while (*mode) {
char *modebegin = mode;
perms &= subset;
switch (action) {
case '+':
- attrs_clr |= perms;
- attrs_xor |= perms;
+ ctx->attrs_clr |= perms;
+ ctx->attrs_xor |= perms;
break;
case '-':
- attrs_clr |= perms;
- attrs_xor &= ~perms;
+ ctx->attrs_clr |= perms;
+ ctx->attrs_xor &= ~perms;
break;
case '=':
- attrs_clr |= subset;
- attrs_xor |= perms;
+ ctx->attrs_clr |= subset;
+ ctx->attrs_xor |= perms;
break;
}
if (*mode) mode++; /* eat comma */
}
}
- fname = canonify(cmd->words[2]);
- if (!fname) {
- printf("%s: %s\n", fname, fxp_error());
- return 0;
- }
-
- sftp_register(req = fxp_stat_send(fname));
- rreq = sftp_find_request(pktin = sftp_recv());
- assert(rreq == req);
- result = fxp_stat_recv(pktin, rreq, &attrs);
-
- if (!result || !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS)) {
- printf("get attrs for %s: %s\n", fname,
- result ? "file permissions not provided" : fxp_error());
- sfree(fname);
- return 0;
- }
-
- attrs.flags = SSH_FILEXFER_ATTR_PERMISSIONS; /* perms _only_ */
- oldperms = attrs.permissions & 07777;
- attrs.permissions &= ~attrs_clr;
- attrs.permissions ^= attrs_xor;
- newperms = attrs.permissions & 07777;
-
- sftp_register(req = fxp_setstat_send(fname, attrs));
- rreq = sftp_find_request(pktin = sftp_recv());
- assert(rreq == req);
- result = fxp_setstat_recv(pktin, rreq);
-
- if (!result) {
- printf("set attrs for %s: %s\n", fname, fxp_error());
- sfree(fname);
- return 0;
- }
-
- printf("%s: %04o -> %04o\n", fname, oldperms, newperms);
+ ret = 1;
+ for (i = 2; i < cmd->nwords; i++)
+ ret &= wildcard_iterate(cmd->words[i], sftp_action_chmod, ctx);
- sfree(fname);
- return 1;
+ return ret;
}
static int sftp_cmd_open(struct sftp_command *cmd)
},
{
"cd", TRUE, "change your remote working directory",
- " [ <New working directory> ]\n"
+ " [ <new working directory> ]\n"
" Change the remote working directory for your SFTP session.\n"
" If a new working directory is not supplied, you will be\n"
" returned to your home directory.\n",
},
{
"chmod", TRUE, "change file permissions and modes",
- " ( <octal-digits> | <modifiers> ) <filename>\n"
- " Change the file permissions on a file or directory.\n"
- " <octal-digits> can be any octal Unix permission specifier.\n"
- " Alternatively, <modifiers> can include:\n"
+ " <modes> <filename-or-wildcard> [ <filename-or-wildcard>... ]\n"
+ " Change the file permissions on one or more remote files or\n"
+ " directories.\n"
+ " <modes> can be any octal Unix permission specifier.\n"
+ " Alternatively, <modes> can include the following modifiers:\n"
" u+r make file readable by owning user\n"
" u+w make file writable by owning user\n"
" u+x make file executable by owning user\n"
sftp_cmd_close
},
{
- "del", TRUE, "delete a file",
- " <filename>\n"
- " Delete a file.\n",
+ "del", TRUE, "delete files on the remote server",
+ " <filename-or-wildcard> [ <filename-or-wildcard>... ]\n"
+ " Delete a file or files from the server.\n",
sftp_cmd_rm
},
{
"delete", FALSE, "del", NULL, sftp_cmd_rm
},
{
- "dir", TRUE, "list contents of a remote directory",
- " [ <directory-name> ]\n"
+ "dir", TRUE, "list remote files",
+ " [ <directory-name> ]/[ <wildcard> ]\n"
" List the contents of a specified directory on the server.\n"
" If <directory-name> is not given, the current working directory\n"
- " will be listed.\n",
+ " is assumed.\n"
+ " If <wildcard> is given, it is treated as a set of files to\n"
+ " list; otherwise, all files are listed.\n",
sftp_cmd_ls
},
{
},
{
"get", TRUE, "download a file from the server to your local machine",
- " <filename> [ <local-filename> ]\n"
+ " [ -r ] [ -- ] <filename> [ <local-filename> ]\n"
" Downloads a file on the server and stores it locally under\n"
" the same name, or under a different one if you supply the\n"
- " argument <local-filename>.\n",
+ " argument <local-filename>.\n"
+ " If -r specified, recursively fetch a directory.\n",
sftp_cmd_get
},
{
},
{
"mget", TRUE, "download multiple files at once",
- " <filename-or-wildcard> [ <filename-or-wildcard>... ]\n"
+ " [ -r ] [ -- ] <filename-or-wildcard> [ <filename-or-wildcard>... ]\n"
" Downloads many files from the server, storing each one under\n"
" the same name it has on the server side. You can use wildcards\n"
- " such as \"*.c\" to specify lots of files at once.\n",
+ " such as \"*.c\" to specify lots of files at once.\n"
+ " If -r specified, recursively fetch files and directories.\n",
sftp_cmd_mget
},
{
- "mkdir", TRUE, "create a directory on the remote server",
- " <directory-name>\n"
- " Creates a directory with the given name on the server.\n",
+ "mkdir", TRUE, "create directories on the remote server",
+ " <directory-name> [ <directory-name>... ]\n"
+ " Creates directories with the given names on the server.\n",
sftp_cmd_mkdir
},
{
"mput", TRUE, "upload multiple files at once",
- " <filename-or-wildcard> [ <filename-or-wildcard>... ]\n"
+ " [ -r ] [ -- ] <filename-or-wildcard> [ <filename-or-wildcard>... ]\n"
" Uploads many files to the server, storing each one under the\n"
" same name it has on the client side. You can use wildcards\n"
- " such as \"*.c\" to specify lots of files at once.\n",
+ " such as \"*.c\" to specify lots of files at once.\n"
+ " If -r specified, recursively store files and directories.\n",
sftp_cmd_mput
},
{
- "mv", TRUE, "move or rename a file on the remote server",
- " <source-filename> <destination-filename>\n"
- " Moves or renames the file <source-filename> on the server,\n"
- " so that it is accessible under the name <destination-filename>.\n",
+ "mv", TRUE, "move or rename file(s) on the remote server",
+ " <source> [ <source>... ] <destination>\n"
+ " Moves or renames <source>(s) on the server to <destination>,\n"
+ " also on the server.\n"
+ " If <destination> specifies an existing directory, then <source>\n"
+ " may be a wildcard, and multiple <source>s may be given; all\n"
+ " source files are moved into <destination>.\n"
+ " Otherwise, <source> must specify a single file, which is moved\n"
+ " or renamed so that it is accessible under the name <destination>.\n",
sftp_cmd_mv
},
{
"open", TRUE, "connect to a host",
" [<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",
+ " when you are not already connected to a server.\n",
sftp_cmd_open
},
{
"put", TRUE, "upload a file from your local machine to the server",
- " <filename> [ <remote-filename> ]\n"
+ " [ -r ] [ -- ] <filename> [ <remote-filename> ]\n"
" Uploads a file to the server and stores it there under\n"
" the same name, or under a different one if you supply the\n"
- " argument <remote-filename>.\n",
+ " argument <remote-filename>.\n"
+ " If -r specified, recursively store a directory.\n",
sftp_cmd_put
},
{
sftp_cmd_quit
},
{
- "reget", TRUE, "continue downloading a file",
- " <filename> [ <local-filename> ]\n"
+ "reget", TRUE, "continue downloading files",
+ " [ -r ] [ -- ] <filename> [ <local-filename> ]\n"
" Works exactly like the \"get\" command, but the local file\n"
" must already exist. The download will begin at the end of the\n"
- " file. This is for resuming a download that was interrupted.\n",
+ " file. This is for resuming a download that was interrupted.\n"
+ " If -r specified, resume interrupted \"get -r\".\n",
sftp_cmd_reget
},
{
sftp_cmd_mv
},
{
- "reput", TRUE, "continue uploading a file",
- " <filename> [ <remote-filename> ]\n"
+ "reput", TRUE, "continue uploading files",
+ " [ -r ] [ -- ] <filename> [ <remote-filename> ]\n"
" Works exactly like the \"put\" command, but the remote file\n"
" must already exist. The upload will begin at the end of the\n"
- " file. This is for resuming an upload that was interrupted.\n",
+ " file. This is for resuming an upload that was interrupted.\n"
+ " If -r specified, resume interrupted \"put -r\".\n",
sftp_cmd_reput
},
{
sftp_cmd_rm
},
{
- "rmdir", TRUE, "remove a directory on the remote server",
- " <directory-name>\n"
+ "rmdir", TRUE, "remove directories on the remote server",
+ " <directory-name> [ <directory-name>... ]\n"
" Removes the directory with the given name on the server.\n"
- " The directory will not be removed unless it is empty.\n",
+ " The directory will not be removed unless it is empty.\n"
+ " Wildcards may be used to specify multiple directories.\n",
sftp_cmd_rmdir
}
};
return 0;
}
+int from_backend_untrusted(void *frontend_handle, const char *data, int len)
+{
+ /*
+ * No "untrusted" output should get here (the way the code is
+ * currently, it's all diverted by FLAG_STDERR).
+ */
+ assert(!"Unexpected call to from_backend_untrusted()");
+ return 0; /* not reached */
+}
int sftp_recvdata(char *buf, int len)
{
outptr = (unsigned char *) buf;
}
while (outlen > 0) {
- if (ssh_sftp_loop_iteration() < 0)
+ if (back->exitcode(backhandle) >= 0 || ssh_sftp_loop_iteration() < 0)
return 0; /* doom */
}
printf("%s\n", ver);
printf("Usage: psftp [options] [user@]host\n");
printf("Options:\n");
+ printf(" -V print version information and exit\n");
+ printf(" -pgpfp print PGP key fingerprints and exit\n");
printf(" -b file use specified batchfile\n");
printf(" -bc output batchfile commands\n");
printf(" -be don't stop batchfile processing if errors\n");
printf(" -P port connect to specified port\n");
printf(" -pw passw login with specified password\n");
printf(" -1 -2 force use of particular SSH protocol version\n");
+ printf(" -4 -6 force use of IPv4 or IPv6\n");
printf(" -C enable compression\n");
printf(" -i key private key file for authentication\n");
+ printf(" -noagent disable use of Pageant\n");
+ printf(" -agent enable use of Pageant\n");
printf(" -batch disable all interactive prompts\n");
- printf(" -V print version information\n");
cleanup_exit(1);
}
strncpy(cfg.username, user, sizeof(cfg.username) - 1);
cfg.username[sizeof(cfg.username) - 1] = '\0';
}
- if (!cfg.username[0]) {
- 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 (cfg.username[len - 1] == '\n')
- cfg.username[len - 1] = '\0';
- }
- }
if (portnumber)
cfg.port = portnumber;
cfg.nopty = TRUE;
/*
- * Set up fallback option, for SSH1 servers or servers with the
+ * Set up fallback option, for SSH-1 servers or servers with the
* sftp subsystem not enabled but the server binary installed
* in the usual place. We only support fallback on Unix
* systems, and we use a kludgy piece of shellery which should
#endif
;
cmdline_tooltype = TOOLTYPE_FILETRANSFER;
- ssh_get_line = &console_get_line;
sk_init();
userhost = user = NULL;
} else if (strcmp(argv[i], "-h") == 0 ||
strcmp(argv[i], "-?") == 0) {
usage();
+ } else if (strcmp(argv[i], "-pgpfp") == 0) {
+ pgp_fingerprints();
+ return 1;
} else if (strcmp(argv[i], "-V") == 0) {
version();
} else if (strcmp(argv[i], "-batch") == 0) {
do_sftp(mode, modeflags, batchfile);
- if (back != NULL && back->socket(backhandle) != NULL) {
+ if (back != NULL && back->connected(backhandle)) {
char ch;
back->special(backhandle, TS_EOF);
sftp_recvdata(&ch, 1);
projects / u / mdw / putty / blobdiff