From cdb66e0e82a3c5d80f8445a3074ee77f356dbda8 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Tue, 2 Apr 2002 20:17:43 +0000 Subject: - (bal) Hand Sync of scp.c (reverted to upstream code) - deraadt@cvs.openbsd.org 2002/03/30 17:45:46 [scp.c] stretch banners --- ChangeLog | 8 +++++++- scp.c | 23 +++++++++++------------ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index fda2d506b..7ca3bd9ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20020402 + - (bal) Hand Sync of scp.c (reverted to upstream code) + - deraadt@cvs.openbsd.org 2002/03/30 17:45:46 + [scp.c] + stretch banners + 20020401 - (stevesk) [monitor.c] PAM should work again; will *not* work with UsePrivilegeSeparation=yes. @@ -8104,4 +8110,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.2006 2002/04/02 03:24:56 stevesk Exp $ +$Id: ChangeLog,v 1.2007 2002/04/02 20:17:43 mouring Exp $ diff --git a/scp.c b/scp.c index 83e7769d6..fcf55abde 100644 --- a/scp.c +++ b/scp.c @@ -75,7 +75,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.86 2001/12/05 03:56:39 itojun Exp $"); +RCSID("$OpenBSD: scp.c,v 1.87 2002/03/30 17:45:46 deraadt Exp $"); #include "xmalloc.h" #include "atomicio.h" @@ -94,14 +94,6 @@ char *__progname; /* alarm() interval for updating progress meter */ #define PROGRESSTIME 1 -/* Progress meter bar */ -#define BAR \ - "************************************************************"\ - "************************************************************"\ - "************************************************************"\ - "************************************************************" -#define MAX_BARLENGTH (sizeof(BAR) - 1) - /* Visual statistics about files as they are transferred. */ void progressmeter(int); @@ -1116,7 +1108,7 @@ progressmeter(int flag) off_t cursize, abbrevsize; double elapsed; int ratio, barlength, i, remaining; - char buf[256]; + char buf[512]; if (flag == -1) { (void) gettimeofday(&start, (struct timezone *) 0); @@ -1138,11 +1130,18 @@ progressmeter(int flag) 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, BAR, barlength - i, ""); + "|%.*s%*s|", i, + "*******************************************************" + "*******************************************************" + "*******************************************************" + "*******************************************************" + "*******************************************************" + "*******************************************************" + "*******************************************************", + barlength - i, ""); } i = 0; abbrevsize = cursize; -- cgit v1.2.3