|
Lines 1340-1346
do_upload(struct sftp_conn *conn, char *
Link Here
|
| 1340 |
int local_fd; |
1340 |
int local_fd; |
| 1341 |
int status = SSH2_FX_OK; |
1341 |
int status = SSH2_FX_OK; |
| 1342 |
u_int handle_len, id, type; |
1342 |
u_int handle_len, id, type; |
| 1343 |
off_t offset; |
1343 |
off_t offset, progress_counter; |
| 1344 |
char *handle, *data; |
1344 |
char *handle, *data; |
| 1345 |
Buffer msg; |
1345 |
Buffer msg; |
| 1346 |
struct stat sb; |
1346 |
struct stat sb; |
|
Lines 1408-1416
do_upload(struct sftp_conn *conn, char *
Link Here
|
| 1408 |
data = xmalloc(conn->transfer_buflen); |
1408 |
data = xmalloc(conn->transfer_buflen); |
| 1409 |
|
1409 |
|
| 1410 |
/* Read from local and write to remote */ |
1410 |
/* Read from local and write to remote */ |
| 1411 |
offset = 0; |
1411 |
offset = progress_counter = 0; |
| 1412 |
if (showprogress) |
1412 |
if (showprogress) |
| 1413 |
start_progress_meter(local_path, sb.st_size, &offset); |
1413 |
start_progress_meter(local_path, sb.st_size, |
|
|
1414 |
&progress_counter); |
| 1414 |
|
1415 |
|
| 1415 |
for (;;) { |
1416 |
for (;;) { |
| 1416 |
int len; |
1417 |
int len; |
|
Lines 1481-1486
do_upload(struct sftp_conn *conn, char *
Link Here
|
| 1481 |
debug3("In write loop, ack for %u %u bytes at %lld", |
1482 |
debug3("In write loop, ack for %u %u bytes at %lld", |
| 1482 |
ack->id, ack->len, (long long)ack->offset); |
1483 |
ack->id, ack->len, (long long)ack->offset); |
| 1483 |
++ackid; |
1484 |
++ackid; |
|
|
1485 |
progress_counter += ack->len; |
| 1484 |
xfree(ack); |
1486 |
xfree(ack); |
| 1485 |
} |
1487 |
} |
| 1486 |
offset += len; |
1488 |
offset += len; |