Attachment 836 Details for Bug 901 – a better patch

[patch] a better patch

openssh-3.8.1p1-gauge.patch (text/plain), 1.53 KB, created by Pavel Kankovsky on 2005-02-25 04:03:48 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Kankovsky

Created: 2005-02-25 04:03:48 AEDT

Size: 1.53 KB

patch

obsolete

>--- openssh-3.8.1p1.old/progressmeter.c	Fri Feb  6 06:41:37 2004
>+++ openssh-3.8.1p1/progressmeter.c	Thu Feb 24 15:51:25 2005
>@@ -106,12 +106,12 @@
> 	time_t now;
> 	off_t transferred;
> 	double elapsed;
>-	int percent;
>+	int gauge_pos, percent;
> 	off_t bytes_left;
> 	int cur_speed;
> 	int hours, minutes, seconds;
> 	int i, len;
>-	int file_len;
>+	int file_len, gauge_len;
> 
> 	transferred = *counter - cur_pos;
> 	cur_pos = *counter;
>@@ -140,9 +140,22 @@
> 	} else
> 		bytes_per_second = cur_speed;
> 
>+	/* setup column widths; winsize = window size + 1! */
>+	file_len = strlen(file);
>+	if (win_size >= 69 && bytes_left > 0) {
>+		if (file_len < 20)
>+			file_len = 20;
>+		gauge_len = win_size - 39 - file_len;
>+		if (gauge_len < 10)
>+			gauge_len = 10;
>+		gauge_len = (gauge_len / 10) * 10;
>+		file_len = win_size - 38 - gauge_len;
>+	} else {
>+		file_len = win_size - 35;
>+		gauge_len = 0;
>+	}
>+
> 	/* filename */
>-	buf[0] = '\0';
>-	file_len = win_size - 35;
> 	if (file_len > 0) {
> 		len = snprintf(buf, file_len + 1, "\r%s", file);
> 		if (len < 0)
>@@ -150,6 +163,22 @@
> 		for (i = len;  i < file_len; i++ )
> 			buf[i] = ' ';
> 		buf[file_len] = '\0';
>+	} else {
>+		strlcpy(buf, "\r", win_size);
>+	}
>+
>+	/* gauge */
>+	if (gauge_len > 0) {
>+		strlcat(buf, " [", win_size);
>+		len = strlen(buf);
>+		gauge_pos = ((float)cur_pos / end_pos) * gauge_len;
>+		for (i = 0; i < gauge_len; ++i)
>+			buf[i + len] =
>+			    i < gauge_pos ? '=' :
>+			    i > gauge_pos ? ' ' :
>+			    '>';
>+		buf[len + gauge_len] = '\0';
>+		strlcat(buf, "]", win_size);
> 	}
> 
> 	/* percent of transfer done */

Actions: View | Diff

Attachments on bug 901: 692 | 836