- (bal) scp.c 'limit' conflicts with Cray. Rename to 'limitbw'

diff --git a/ChangeLog b/ChangeLog
index d35c4e42e8fd06747d156897f7ae22e8b014a003..fa3a64deb44d44159e2e4ae516baf13ef9cadbdf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
      [version.h]
      enter 3.6
  - (bal) The days of lack of int64_t support are over.  Sorry kids.
+ - (bal) scp.c 'limit' conflicts with Cray.  Rename to 'limitbw'
 
 20030318
  - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
@@ -1232,4 +1233,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2634 2003/03/21 00:34:34 mouring Exp $
+$Id: ChangeLog,v 1.2635 2003/03/21 00:55:32 mouring Exp $

diff --git a/scp.c b/scp.c
index ab67c0bb8b7fe79f952bbcf3ab4a3ca6265e8bb7..35d4c5f7143e5a23bdf659f7a8200125fb7fdcab 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -96,7 +96,7 @@ void bwlimit(int);
 arglist args;
 
 /* Bandwidth limit */
-off_t limit = 0;
+off_t limitbw = 0;
 
 /* Name of current file being transferred. */
 char *curfile;
@@ -251,7 +251,7 @@ main(argc, argv)
                        speed = strtod(optarg, &endp);
                        if (speed <= 0 || *endp != '\0')
                                usage();
-                       limit = speed * 1024;
+                       limitbw = speed * 1024;
                        break;
                case 'p':
                        pflag = 1;
@@ -594,7 +594,7 @@ next:                       (void) close(fd);
                                        haderr = result >= 0 ? EIO : errno;
                                statbytes += result;
                        }
-                       if (limit)
+                       if (limitbw)
                                bwlimit(amt);
                }
                if (showprogress)
@@ -688,7 +688,7 @@ bwlimit(int amount)
                return;
 
        lamt *= 8;
-       wait = (double)1000000L * lamt / limit;
+       wait = (double)1000000L * lamt / limitbw;
 
        bwstart.tv_sec = wait / 1000000L;
        bwstart.tv_usec = wait % 1000000L;
@@ -917,7 +917,7 @@ bad:                        run_err("%s: %s", np, strerror(errno));
                                statbytes += j;
                        } while (amt > 0);
                
-                       if (limit)
+                       if (limitbw)
                                bwlimit(4096);
 
                        if (count == bp->cnt) {