tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (bal) Hand Sync of scp.c (reverted to upstream code) 

- deraadt@cvs.openbsd.org 2002/03/30 17:45:46
     [scp.c]
     stretch banners
This commit is contained in:
Ben Lindstrom 2002-04-02 20:17:43 +00:00
parent 38c4a28a7e
commit cdb66e0e82
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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 $

23
scp.c
View File

@ -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;