struct sftp_request *req;
uint64 offset;
RFile *file;
- int ret, err, eof;
+ int err = 0, eof;
struct fxp_attrs attrs;
long permissions;
if (restart) {
char decbuf[30];
struct fxp_attrs attrs;
+ int ret;
req = fxp_fstat_send(fh);
pktin = sftp_wait_for_reply(req);
if (!ret) {
printf("read size of %s: %s\n", outfname, fxp_error());
+ err = 1;
goto cleanup;
}
if (!(attrs.flags & SSH_FILEXFER_ATTR_SIZE)) {
printf("read size of %s: size was not given\n", outfname);
- ret = 0;
+ err = 1;
goto cleanup;
}
offset = attrs.size;
* FIXME: we can use FXP_FSTAT here to get the file size, and
* thus put up a progress bar.
*/
- ret = 1;
xfer = xfer_upload_init(fh, offset);
- err = eof = 0;
+ eof = 0;
while ((!err && !eof) || !xfer_done(xfer)) {
char buffer[4096];
int len, ret;
cleanup:
req = fxp_close_send(fh);
pktin = sftp_wait_for_reply(req);
- fxp_close_recv(pktin, req);
+ if (!fxp_close_recv(pktin, req)) {
+ if (!err) {
+ printf("error while closing: %s", fxp_error());
+ err = 1;
+ }
+ }
close_rfile(file);
- return ret;
+ return (err == 0) ? 1 : 0;
}
/* ----------------------------------------------------------------------
static void version(void)
{
- printf("psftp: %s\n", ver);
+ char *buildinfo_text = buildinfo("\n");
+ printf("psftp: %s\n%s\n", ver, buildinfo_text);
+ sfree(buildinfo_text);
cleanup_exit(1);
}