Attachment #604 for bug #842

Lines 53-59 static time_t last_update; /* last prog Link Here

(-)progressmeter.c (-2 / +2 lines)
53	static char file; / name of the file being transferred */	53	static char file; / name of the file being transferred */
54	static off_t end_pos; /* ending position of transfer */	54	static off_t end_pos; /* ending position of transfer */
55	static off_t cur_pos; /* transfer position as of last refresh */	55	static off_t cur_pos; /* transfer position as of last refresh */
56	static volatile off_t counter; / progress counter */	56	static volatile u_int64_t counter; / progress counter */
57	static long stalled; /* how long we have been stalled */	57	static long stalled; /* how long we have been stalled */
58	static int bytes_per_second; /* current speed in bytes per second */	58	static int bytes_per_second; /* current speed in bytes per second */
59	static int win_size; /* terminal window size */	59	static int win_size; /* terminal window size */
Lines 224-230 update_progress_meter(int ignore) Link Here
224	}	224	}
225		225
226	void	226	void
227	start_progress_meter(char f, off_t filesize, off_t stat)	227	start_progress_meter(char f, off_t filesize, u_int64_t stat)
228	{	228	{
229	struct winsize winsize;	229	struct winsize winsize;
230		230

Lines 23-27 Link Here

(-)progressmeter.h (-1 / +1 lines)
23	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	23	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24	*/	24	*/
25		25
26	void start_progress_meter(char , off_t, off_t );	26	void start_progress_meter(char , off_t, u_int64_t );
27	void stop_progress_meter(void);	27	void stop_progress_meter(void);




	struct stat stb;
	static BUF buffer;
	BUF *bp;
	off_t i, amt, result;
	u_int64_t statbytes;
	int fd, haderr, indx;
	char *last, *name, buf[2048];
	int len;

	BUF *bp;
	off_t i, j;
	int amt, count, exists, first, mask, mode, ofd, omode;
	off_t size;
	u_int64_t statbytes;
	int setimes, targisdir, wrerrno = 0;
	char ch, *cp, *np, *targ, *why, *vect[1], buf[2048];
	struct timeval tv[2];

Lines 737-743 do_download(struct sftp_conn *conn, char Link Here

(-)sftp-client.c (-1 / +1 lines)
737	int read_error, write_errno;	737	int read_error, write_errno;
738	u_int64_t offset, size;	738	u_int64_t offset, size;
739	u_int handle_len, mode, type, id, buflen;	739	u_int handle_len, mode, type, id, buflen;
740	off_t progress_counter;	740	u_int64_t progress_counter;
741	struct request {	741	struct request {
742	u_int id;	742	u_int id;
743	u_int len;	743	u_int len;

Return to bug 842

Lines 503-509 source(int argc, char **argv) Link Here

(-)scp.c (-2 / +4 lines)
503	struct stat stb;	503	struct stat stb;
504	static BUF buffer;	504	static BUF buffer;
505	BUF *bp;	505	BUF *bp;
506	off_t i, amt, result, statbytes;	506	off_t i, amt, result;
		507	u_int64_t statbytes;
507	int fd, haderr, indx;	508	int fd, haderr, indx;
508	char last, name, buf[2048];	509	char last, name, buf[2048];
509	int len;	510	int len;
Lines 723-729 sink(int argc, char **argv) Link Here
723	BUF *bp;	724	BUF *bp;
724	off_t i, j;	725	off_t i, j;
725	int amt, count, exists, first, mask, mode, ofd, omode;	726	int amt, count, exists, first, mask, mode, ofd, omode;
726	off_t size, statbytes;	727	off_t size;
		728	u_int64_t statbytes;
727	int setimes, targisdir, wrerrno = 0;	729	int setimes, targisdir, wrerrno = 0;
728	char ch, cp, np, targ, why, *vect[1], buf[2048];	730	char ch, cp, np, targ, why, *vect[1], buf[2048];
729	struct timeval tv[2];	731	struct timeval tv[2];