openssh unix dev - Jul 2000 - minor cosmetic bug

The progress metre in scp(1) breaks when the tty is too wide.

This patch is the effortless fix:

###########################################################################
:; diff -u openssh-2.1.1p2/scp.c openssh-2.1.1p2+jhc/scp.c
--- openssh-2.1.1p2+jhc/scp.c   Thu Jun 22 07:32:32 2000
+++ openssh-2.1.1p2/scp.c       Sat Jul  1 22:15:36 2000
@@ -1176,8 +1176,9 @@
                i = barlength * ratio / 100;
                snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
                         "|%.*s%*s|", i,
-                       
"*****************************************************************************"
-                       
"*****************************************************************************",
+                       
"*********************************************************************"
+                       
"*********************************************************************"
+                       
"*********************************************************************",
                         barlength - i, "");
        }
        i = 0;
###########################################################################

In case it numges in mail, change from two strings of 77 asterisks each to
three of 69 each.  Limiting it to 207 *s keeps the bargraph from overwriting
the octet-count and time-to-go; 210 is too many.  I didn't try 209 or 208,
prefering to keep the three strings equal in length....

-JimC
-- 
James H. Cloos, Jr.  <http://jhcloos.com/public_key>     1024D/ED7DAEA6 
<cloos at jhcloos.com>  E9E9 F828 61A4 6EA9 0F2B  63E7 997A 9F17 ED7D AEA6
     Is this post worth two cents?  Then goto <http://2cw.org/23>!

On 1 Jul 2000, James H. Cloos Jr. wrote:
> The progress metre in scp(1) breaks when the tty is too wide.
> 
> This patch is the effortless fix:
Here is a slightly more general one, which shouldn't break on any
line size:

Index: scp.c
==================================================================RCS file:
/cvs/src/usr.bin/ssh/scp.c,v
retrieving revision 1.32
diff -u -r1.32 scp.c
--- scp.c	2000/06/20 01:39:44	1.32
+++ scp.c	2000/07/02 08:58:49
@@ -56,6 +56,14 @@
 /* For progressmeter() -- number of seconds before xfer considered
"stalled" */
 #define STALLTIME	5
 
+/* Progress meter bar */
+#define BAR \
+	"************************************************************"\
+	"************************************************************"\
+	"************************************************************"\
+	"************************************************************"
+#define MAX_BARLENGTH (sizeof(BAR) - 1)
+
 /* Visual statistics about files as they are transferred. */
 void progressmeter(int);
 
@@ -1170,13 +1178,11 @@
 	snprintf(buf, sizeof(buf), "\r%-20.20s %3d%% ", curfile, ratio);
 
 	barlength = getttywidth() - 51;
+	barlength = (barlength <= MAX_BARLENGTH)?barlength:MAX_BARLENGTH;
 	if (barlength > 0) {
 		i = barlength * ratio / 100;
 		snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-			 "|%.*s%*s|", i,
-			
"*****************************************************************************"
-			
"*****************************************************************************",
-			 barlength - i, "");
+			 "|%.*s%*s|", i, BAR, barlength - i, "");
 	}
 	i = 0;
 	abbrevsize = cursize;


-- 
| "Bombay is 250ms from New York in the new world order" - Alan Cox
| Damien Miller - http://www.mindrot.org/
| Email: djm at mindrot.org (home) -or- djm at ibs.com.au (work)