sftp_register(req = fxp_realpath_send(fullname));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- canonname = fxp_realpath_recv(pktin);
+ canonname = fxp_realpath_recv(pktin, rreq);
if (canonname) {
sfree(fullname);
}
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- canonname = fxp_realpath_recv(pktin);
+ canonname = fxp_realpath_recv(pktin, rreq);
if (!canonname)
return fullname; /* even that failed; give up */
sftp_register(req = fxp_opendir_send(cdir));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- dirh = fxp_opendir_recv(pktin);
+ dirh = fxp_opendir_recv(pktin, rreq);
if (dirh == NULL) {
printf("Unable to open %s: %s\n", dir, fxp_error());
sftp_register(req = fxp_readdir_send(dirh));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- names = fxp_readdir_recv(pktin);
+ names = fxp_readdir_recv(pktin, rreq);
if (names == NULL) {
if (fxp_error_type() == SSH_FX_EOF)
sftp_register(req = fxp_close_send(dirh));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- fxp_close_recv(pktin);
+ fxp_close_recv(pktin, rreq);
/*
* Now we have our filenames. Sort them by actual file
sftp_register(req = fxp_opendir_send(dir));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- dirh = fxp_opendir_recv(pktin);
+ dirh = fxp_opendir_recv(pktin, rreq);
if (!dirh) {
printf("Directory %s: %s\n", dir, fxp_error());
sftp_register(req = fxp_close_send(dirh));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- fxp_close_recv(pktin);
+ fxp_close_recv(pktin, rreq);
sfree(pwd);
pwd = dir;
sftp_register(req = fxp_open_send(fname, SSH_FXF_READ));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- fh = fxp_open_recv(pktin);
+ fh = fxp_open_recv(pktin, rreq);
if (!fh) {
printf("%s: %s\n", fname, fxp_error());
sftp_register(req = fxp_close_send(fh));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- fxp_close_recv(pktin);
+ fxp_close_recv(pktin, rreq);
sfree(fname);
return 0;
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, buffer, sizeof(buffer));
+ len = fxp_read_recv(pktin, rreq, buffer, sizeof(buffer));
if ((len == -1 && fxp_error_type() == SSH_FX_EOF) || len == 0)
break;
sftp_register(req = fxp_close_send(fh));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- fxp_close_recv(pktin);
+ fxp_close_recv(pktin, rreq);
sfree(fname);
}
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- fh = fxp_open_recv(pktin);
+ fh = fxp_open_recv(pktin, rreq);
if (!fh) {
printf("%s: %s\n", outfname, fxp_error());
sftp_register(req = fxp_fstat_send(fh));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- ret = fxp_fstat_recv(pktin, &attrs);
+ ret = fxp_fstat_recv(pktin, rreq, &attrs);
if (!ret) {
printf("read size of %s: %s\n", outfname, fxp_error());
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);
+ ret = fxp_write_recv(pktin, rreq);
if (!ret) {
printf("error while writing: %s\n", fxp_error());
sftp_register(req = fxp_close_send(fh));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- fxp_close_recv(pktin);
+ fxp_close_recv(pktin, rreq);
fclose(fp);
sfree(outfname);
sftp_register(req = fxp_mkdir_send(dir));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- result = fxp_mkdir_recv(pktin);
+ result = fxp_mkdir_recv(pktin, rreq);
if (!result) {
printf("mkdir %s: %s\n", dir, fxp_error());
sftp_register(req = fxp_rmdir_send(dir));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- result = fxp_rmdir_recv(pktin);
+ result = fxp_rmdir_recv(pktin, rreq);
if (!result) {
printf("rmdir %s: %s\n", dir, fxp_error());
sftp_register(req = fxp_remove_send(fname));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- result = fxp_remove_recv(pktin);
+ result = fxp_remove_recv(pktin, rreq);
if (!result) {
printf("rm %s: %s\n", fname, fxp_error());
sftp_register(req = fxp_rename_send(srcfname, dstfname));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- result = fxp_rename_recv(pktin);
+ result = fxp_rename_recv(pktin, rreq);
if (!result) {
char const *error = fxp_error();
sftp_register(req = fxp_stat_send(dstfname));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- result = fxp_stat_recv(pktin, &attrs);
+ result = fxp_stat_recv(pktin, rreq, &attrs);
if (result &&
(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS) &&
sftp_register(req = fxp_rename_send(srcfname, dstfname));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- result = fxp_rename_recv(pktin);
+ result = fxp_rename_recv(pktin, rreq);
error = result ? NULL : fxp_error();
}
sftp_register(req = fxp_stat_send(fname));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- result = fxp_stat_recv(pktin, &attrs);
+ result = fxp_stat_recv(pktin, rreq, &attrs);
if (!result || !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS)) {
printf("get attrs for %s: %s\n", fname,
sftp_register(req = fxp_setstat_send(fname, attrs));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- result = fxp_setstat_recv(pktin);
+ result = fxp_setstat_recv(pktin, rreq);
if (!result) {
printf("set attrs for %s: %s\n", fname, fxp_error());
sftp_register(req = fxp_realpath_send("."));
rreq = sftp_find_request(pktin = sftp_recv());
assert(rreq == req);
- homedir = fxp_realpath_recv(pktin);
+ homedir = fxp_realpath_recv(pktin, rreq);
if (!homedir) {
fprintf(stderr,