=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/scp.c,v retrieving revision 1.85 retrieving revision 1.85.2.2 diff -u -r1.85 -r1.85.2.2 --- src/usr.bin/ssh/scp.c 2001/10/01 08:06:28 1.85 +++ src/usr.bin/ssh/scp.c 2002/05/17 00:03:24 1.85.2.2 @@ -75,7 +75,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.85 2001/10/01 08:06:28 markus Exp $"); +RCSID("$OpenBSD: scp.c,v 1.85.2.2 2002/05/17 00:03:24 miod Exp $"); #include "xmalloc.h" #include "atomicio.h" @@ -756,7 +756,7 @@ cursize = need; } (void) snprintf(namebuf, need, "%s%s%s", targ, - *targ ? "/" : "", cp); + strcmp(targ, "/") ? "/" : "", cp); np = namebuf; } else np = targ; @@ -895,7 +895,7 @@ } int -response() +response(void) { char ch, *cp, resp, rbuf[2048]; @@ -928,7 +928,7 @@ } void -usage() +usage(void) { (void) fprintf(stderr, "usage: scp [-pqrvBC46] [-F config] [-S ssh] [-P port] [-c cipher] [-i identity]\n" @@ -1073,7 +1073,7 @@ 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); @@ -1099,10 +1099,13 @@ i = barlength * ratio / 100; snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "|%.*s%*s|", i, - "***************************************" - "***************************************" - "***************************************" - "***************************************", + "*******************************************************" + "*******************************************************" + "*******************************************************" + "*******************************************************" + "*******************************************************" + "*******************************************************" + "*******************************************************", barlength - i, ""); } i = 0;