Skip to content

Commit

Permalink
- (bal) scp.c 'limit' conflicts with Cray. Rename to 'limitbw'
Browse files Browse the repository at this point in the history
  • Loading branch information
mouring committed Mar 21, 2003
1 parent 5bd6eb7 commit d54d938
Showing 2 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -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 $
10 changes: 5 additions & 5 deletions scp.c
Original file line number Diff line number Diff line change
@@ -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) {

0 comments on commit d54d938

Please sign in to comment.