=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/scp.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- src/usr.bin/ssh/scp.c 1999/10/05 12:17:05 1.12 +++ src/usr.bin/ssh/scp.c 1999/10/08 01:25:20 1.13 @@ -42,11 +42,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scp.c,v 1.12 1999/10/05 12:17:05 aaron Exp $ + * $Id: scp.c,v 1.13 1999/10/08 01:25:20 aaron Exp $ */ #include "includes.h" -RCSID("$Id: scp.c,v 1.12 1999/10/05 12:17:05 aaron Exp $"); +RCSID("$Id: scp.c,v 1.13 1999/10/08 01:25:20 aaron Exp $"); #include "ssh.h" #include "xmalloc.h" @@ -976,7 +976,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scp.c,v 1.12 1999/10/05 12:17:05 aaron Exp $ + * $Id: scp.c,v 1.13 1999/10/08 01:25:20 aaron Exp $ */ char * @@ -1130,12 +1130,15 @@ lastsize = 0; } (void)gettimeofday(&now, (struct timezone *)0); - if (totalbytes <= 0) - return; cursize = statbytes; - ratio = cursize * 100 / totalbytes; - ratio = MAX(ratio, 0); - ratio = MIN(ratio, 100); + if (totalbytes != 0) { + ratio = cursize * 100 / totalbytes; + ratio = MAX(ratio, 0); + ratio = MIN(ratio, 100); + } + else + ratio = 100; + snprintf(buf, sizeof(buf), "\r%-20.20s %3d%% ", curfile, ratio); barlength = getttywidth() - 51;