summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--scp.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ecaed30b..14fdfa10e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@
21 - [mpaux.c] clear temp buffer 21 - [mpaux.c] clear temp buffer
22 - [servconf.c] print _all_ bad options found in configfile 22 - [servconf.c] print _all_ bad options found in configfile
23 - Make ssh-askpass support optional through autoconf 23 - Make ssh-askpass support optional through autoconf
24 - Fix nasty division-by-zero error in scp.c
25 - Released 1.2pre11
24 26
2519991111 2719991111
26 - Added (untested) Entropy Gathering Daemon (EGD) support 28 - Added (untested) Entropy Gathering Daemon (EGD) support
diff --git a/scp.c b/scp.c
index d31eb5cb5..95160e81f 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.4 1999/11/11 10:39:50 damien Exp $ 45 * $Id: scp.c,v 1.5 1999/11/12 05:28:02 damien Exp $
46 */ 46 */
47 47
48#include "includes.h" 48#include "includes.h"
49RCSID("$Id: scp.c,v 1.4 1999/11/11 10:39:50 damien Exp $"); 49RCSID("$Id: scp.c,v 1.5 1999/11/12 05:28:02 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.4 1999/11/11 10:39:50 damien Exp $ 979 * $Id: scp.c,v 1.5 1999/11/12 05:28:02 damien Exp $
980 */ 980 */
981 981
982char * 982char *
@@ -1131,7 +1131,7 @@ progressmeter(int flag)
1131 } 1131 }
1132 (void)gettimeofday(&now, (struct timezone *)0); 1132 (void)gettimeofday(&now, (struct timezone *)0);
1133 cursize = statbytes; 1133 cursize = statbytes;
1134 if (totalbytes != 0) { 1134 if ((totalbytes >> 10) != 0) {
1135 ratio = (cursize >> 10) * 100 / (totalbytes >> 10); 1135 ratio = (cursize >> 10) * 100 / (totalbytes >> 10);
1136 ratio = MAX(ratio, 0); 1136 ratio = MAX(ratio, 0);
1137 ratio = MIN(ratio, 100); 1137 ratio = MIN(ratio, 100);