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;
}
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;
}
while ( (newname = sftp_wildcard_get_filename(swcm)) != NULL ) {
cname = canonify(newname);
if (!cname) {
- printf("%s: %s\n", newname, fxp_error());
+ printf("%s: canonify: %s\n", newname, fxp_error());
ret = 0;
}
matched = TRUE;
} else {
cname = canonify(unwcfname);
if (!cname) {
- printf("%s: %s\n", filename, fxp_error());
+ printf("%s: canonify: %s\n", filename, fxp_error());
ret = 0;
}
ret = func(ctx, cname);
cdir = canonify(dir);
if (!cdir) {
- printf("%s: %s\n", dir, fxp_error());
+ printf("%s: canonify: %s\n", dir, fxp_error());
sfree(unwcdir);
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;
}
fname = canonify(origwfname);
if (!fname) {
- printf("%s: %s\n", origwfname, fxp_error());
+ printf("%s: canonify: %s\n", origwfname, fxp_error());
sfree(unwcfname);
return 0;
}
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);
for (i = 1; i < cmd->nwords; i++) {
dir = canonify(cmd->words[i]);
if (!dir) {
- printf("%s: %s\n", dir, fxp_error());
+ printf("%s: canonify: %s\n", dir, fxp_error());
return 0;
}
newname = dupcat(ctx->dstfname, "/", p, NULL);
newcanon = canonify(newname);
if (!newcanon) {
- printf("%s: %s\n", newname, fxp_error());
+ printf("%s: canonify: %s\n", newname, fxp_error());
sfree(newname);
return 0;
}
ctx->dstfname = canonify(cmd->words[cmd->nwords-1]);
if (!ctx->dstfname) {
- printf("%s: %s\n", ctx->dstfname, fxp_error());
+ printf("%s: canonify: %s\n", ctx->dstfname, fxp_error());
return 0;
}
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;
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");
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;
#endif
;
cmdline_tooltype = TOOLTYPE_FILETRANSFER;
- ssh_get_line = &console_get_line;
sk_init();
userhost = user = NULL;