summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--scp.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c9024fc3..59a4d36fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
8 Integers should not be printed with %s 8 Integers should not be printed with %s
9 - EGD uses a socket, not a named pipe. Duh. 9 - EGD uses a socket, not a named pipe. Duh.
10 - Fix includes in fingerprint.c 10 - Fix includes in fingerprint.c
11 - Fix scp progress bar bug again.
11 12
1219991118 1319991118
13 - Merged OpenBSD CVS changes 14 - Merged OpenBSD CVS changes
diff --git a/scp.c b/scp.c
index e156f7ba7..9cc9528b8 100644
--- a/scp.c
+++ b/scp.c
@@ -42,11 +42,11 @@ and ssh has the necessary privileges.)
42 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 42 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
43 * SUCH DAMAGE. 43 * SUCH DAMAGE.
44 * 44 *
45 * $Id: scp.c,v 1.7 1999/11/17 22:28:11 damien Exp $ 45 * $Id: scp.c,v 1.8 1999/11/19 01:34:14 damien Exp $
46 */ 46 */
47 47
48#include "includes.h" 48#include "includes.h"
49RCSID("$Id: scp.c,v 1.7 1999/11/17 22:28:11 damien Exp $"); 49RCSID("$Id: scp.c,v 1.8 1999/11/19 01:34:14 damien Exp $");
50 50
51#include "ssh.h" 51#include "ssh.h"
52#include "xmalloc.h" 52#include "xmalloc.h"
@@ -976,7 +976,7 @@ run_err(const char *fmt, ...)
976 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 976 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
977 * SUCH DAMAGE. 977 * SUCH DAMAGE.
978 * 978 *
979 * $Id: scp.c,v 1.7 1999/11/17 22:28:11 damien Exp $ 979 * $Id: scp.c,v 1.8 1999/11/19 01:34:14 damien Exp $
980 */ 980 */
981 981
982char * 982char *
@@ -1148,7 +1148,7 @@ progressmeter(int flag)
1148 (void)gettimeofday(&now, (struct timezone *)0); 1148 (void)gettimeofday(&now, (struct timezone *)0);
1149 cursize = statbytes; 1149 cursize = statbytes;
1150 if (totalbytes != 0) { 1150 if (totalbytes != 0) {
1151 ratio = cursize * 100 / totalbytes; 1151 ratio = cursize * 100.0 / totalbytes;
1152 ratio = MAX(ratio, 0); 1152 ratio = MAX(ratio, 0);
1153 ratio = MIN(ratio, 100); 1153 ratio = MIN(ratio, 100);
1154 } 1154 }