[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]
arglist args;
/* Bandwidth limit */
-off_t limit = 0;
+off_t limitbw = 0;
/* Name of current file being transferred. */
char *curfile;
speed = strtod(optarg, &endp);
if (speed <= 0 || *endp != '\0')
usage();
- limit = speed * 1024;
+ limitbw = speed * 1024;
break;
case 'p':
pflag = 1;
haderr = result >= 0 ? EIO : errno;
statbytes += result;
}
- if (limit)
+ if (limitbw)
bwlimit(amt);
}
if (showprogress)
return;
lamt *= 8;
- wait = (double)1000000L * lamt / limit;
+ wait = (double)1000000L * lamt / limitbw;
bwstart.tv_sec = wait / 1000000L;
bwstart.tv_usec = wait % 1000000L;
statbytes += j;
} while (amt > 0);
- if (limit)
+ if (limitbw)
bwlimit(4096);
if (count == bp->cnt) {