Attachment 604 Details for Bug 842 – use u_int64_t for progressmeter

[patch] use u_int64_t for progressmeter

openssh-progressmeter-type.patch (text/plain), 2.99 KB, created by Darren Tucker on 2004-04-15 14:08:46 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2004-04-15 14:08:46 AEST

Size: 2.99 KB

patch

obsolete

>Index: progressmeter.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/progressmeter.c,v
>retrieving revision 1.19
>diff -u -p -r1.19 progressmeter.c
>--- progressmeter.c	6 Feb 2004 05:41:37 -0000	1.19
>+++ progressmeter.c	15 Apr 2004 01:26:47 -0000
>@@ -53,7 +53,7 @@ static time_t last_update; 	/* last prog
> static char *file; 		/* name of the file being transferred */
> static off_t end_pos; 		/* ending position of transfer */
> static off_t cur_pos; 		/* transfer position as of last refresh */
>-static volatile off_t *counter;	/* progress counter */
>+static volatile u_int64_t *counter;	/* progress counter */
> static long stalled; 		/* how long we have been stalled */
> static int bytes_per_second; 	/* current speed in bytes per second */
> static int win_size; 		/* terminal window size */
>@@ -224,7 +224,7 @@ update_progress_meter(int ignore)
> }
> 
> void
>-start_progress_meter(char *f, off_t filesize, off_t *stat)
>+start_progress_meter(char *f, off_t filesize, u_int64_t *stat)
> {
> 	struct winsize winsize;
> 
>Index: progressmeter.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/progressmeter.h,v
>retrieving revision 1.1
>diff -u -p -r1.1 progressmeter.h
>--- progressmeter.h	10 Jan 2003 10:46:02 -0000	1.1
>+++ progressmeter.h	15 Apr 2004 03:55:09 -0000
>@@ -23,5 +23,5 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-void	start_progress_meter(char *, off_t, off_t *);
>+void	start_progress_meter(char *, off_t, u_int64_t *);
> void	stop_progress_meter(void);
>Index: scp.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/scp.c,v
>retrieving revision 1.125
>diff -u -p -r1.125 scp.c
>--- scp.c	24 Nov 2003 02:09:28 -0000	1.125
>+++ scp.c	15 Apr 2004 01:34:39 -0000
>@@ -503,7 +503,8 @@ source(int argc, char **argv)
> 	struct stat stb;
> 	static BUF buffer;
> 	BUF *bp;
>-	off_t i, amt, result, statbytes;
>+	off_t i, amt, result;
>+	u_int64_t statbytes;
> 	int fd, haderr, indx;
> 	char *last, *name, buf[2048];
> 	int len;
>@@ -723,7 +724,8 @@ sink(int argc, char **argv)
> 	BUF *bp;
> 	off_t i, j;
> 	int amt, count, exists, first, mask, mode, ofd, omode;
>-	off_t size, statbytes;
>+	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];
>Index: sftp-client.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/sftp-client.c,v
>retrieving revision 1.51
>diff -u -p -r1.51 sftp-client.c
>--- sftp-client.c	8 Mar 2004 12:12:02 -0000	1.51
>+++ sftp-client.c	15 Apr 2004 01:26:00 -0000
>@@ -737,7 +737,7 @@ do_download(struct sftp_conn *conn, char
> 	int read_error, write_errno;
> 	u_int64_t offset, size;
> 	u_int handle_len, mode, type, id, buflen;
>-	off_t progress_counter;
>+	u_int64_t progress_counter;
> 	struct request {
> 		u_int id;
> 		u_int len;

Actions: View | Diff

Attachments on bug 842: 604 | 1287