===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/scp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- src/usr.bin/ssh/scp.c	1999/09/30 05:11:29	1.5
+++ src/usr.bin/ssh/scp.c	1999/09/30 21:25:03	1.6
@@ -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.5 1999/09/30 05:11:29 deraadt Exp $
+ *	$Id: scp.c,v 1.6 1999/09/30 21:25:03 aaron Exp $
  */
 
 #include "includes.h"
-RCSID("$Id: scp.c,v 1.5 1999/09/30 05:11:29 deraadt Exp $");
+RCSID("$Id: scp.c,v 1.6 1999/09/30 21:25:03 aaron Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -68,6 +68,9 @@
 /* This is set to non-zero if compression is desired. */
 int compress = 0;
 
+/* This is set to zero if the progressmeter is not desired. */
+int showprogress = 1;
+
 /* This is set to non-zero if running in batch mode (that is, password
    and passphrase queries are not allowed). */
 int batchmode = 0;
@@ -226,7 +229,7 @@
 	extern int optind;
 
 	fflag = tflag = 0;
-	while ((ch = getopt(argc, argv,  "dfprtvBCc:i:P:")) != EOF)
+	while ((ch = getopt(argc, argv,  "dfprtvBCc:i:P:q")) != EOF)
 		switch(ch) {			/* User-visible flags. */
 		case 'p':
 			pflag = 1;
@@ -264,6 +267,9 @@
 		case 'C':
 		  	compress = 1;
 		  	break;
+		case 'q':
+		  	showprogress = 0;
+		  	break;
 		case '?':
 		default:
 			usage();
@@ -511,7 +517,8 @@
 		totalbytes = stb.st_size;
 
 		/* kick-start the progress meter */
-		progressmeter(-1);
+		if(showprogress)
+			progressmeter(-1);
 
 		/* Keep writing after an error so that we stay sync'd up. */
 		for (haderr = i = 0; i < stb.st_size; i += bp->cnt) {
@@ -532,7 +539,8 @@
 				statbytes += result;
 			}
 		}
-		progressmeter(1);
+		if(showprogress)
+			progressmeter(1);
 
 		if (close(fd) < 0 && !haderr)
 			haderr = errno;
@@ -878,7 +886,7 @@
 usage()
 {
 	(void)fprintf(stderr,
-	    "usage: scp [-p] f1 f2; or: scp [-pr] f1 ... fn directory\n");
+	    "usage: scp [-pqrvC] [-P port] [-c cipher] [-i identity] f1 f2; or:\n       scp [options] f1 ... fn directory\n");
 	exit(1);
 }
 
@@ -941,7 +949,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: scp.c,v 1.5 1999/09/30 05:11:29 deraadt Exp $
+ *	$Id: scp.c,v 1.6 1999/09/30 21:25:03 aaron Exp $
  */
 
 char *
@@ -1101,7 +1109,7 @@
 	}
 
 	timersub(&now, &start, &td);
-	elapsed = td.tv_sec + (td.tv_sec / 1000000.0);
+	elapsed = td.tv_sec + (td.tv_usec / 1000000.0);
 
 	if (statbytes <= 0 || elapsed <= 0.0 || cursize > totalbytes) {
 		snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),