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 */
}
},
{
"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",
*/
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;
cmd = sftp_getcmd(stdin, 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 {
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;
}
int sftp_senddata(char *buf, int len)
{
- back->send(backhandle, (unsigned char *) buf, len);
+ back->send(backhandle, buf, len);
return 1;
}
{
char *host, *realhost;
const char *err;
+ void *logctx;
/* Separate host and username */
host = userhost;
}
if (verbose && realhost != NULL)
printf("Connected to %s\n", realhost);
+ if (realhost != NULL)
+ sfree(realhost);
return 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;
sk_init();
* 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);
sftp_recvdata(&ch, 1);
}
random_save_seed();
+ cmdline_cleanup();
+ console_provide_logctx(NULL);
+ do_sftp_cleanup();
+ backhandle = NULL;
+ back = NULL;
+ sk_cleanup();
return 0;
}