Merged latest OpenBSD changes.

1 files changed, 4 insertions, 4 deletions

diff --git a/scp.c b/scp.c
index 6145fdeb..a592c2ae 100644
--- a/scp.c
+++ b/scp.c
@@ -42,11 +42,11 @@ and ssh has the necessary privileges.)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: scp.c,v 1.1 1999/10/27 03:42:45 damien Exp $
+ *	$Id: scp.c,v 1.2 1999/10/28 05:23:30 damien Exp $
  */
 
 #include "includes.h"
-RCSID("$Id: scp.c,v 1.1 1999/10/27 03:42:45 damien Exp $");
+RCSID("$Id: scp.c,v 1.2 1999/10/28 05:23:30 damien Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -976,7 +976,7 @@ run_err(const char *fmt, ...)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: scp.c,v 1.1 1999/10/27 03:42:45 damien Exp $
+ *	$Id: scp.c,v 1.2 1999/10/28 05:23:30 damien Exp $
  */
 
 char *
@@ -1183,7 +1183,7 @@ progressmeter(int flag)
 		    " - stalled -");
 	} else {
 		remaining = (int)(totalbytes / (statbytes / elapsed) - elapsed);
-		i = elapsed / 3600;
+		i = remaining / 3600;
 		if (i)
 			snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
 			    "%2d:", i);