Call for testing for 3.6

[Wendy Palm]

this works great.

Ben Lindstrom wrote:

> On Wed, 12 Mar 2003, Wendy Palm wrote:
> 
> 
>>cray is broken also wrt nanosleep().
>>
>>additionally, there's a stupid locality error that cray is having a problem with in scp.c.
>>
>>a variable "limit" has been added at line 99.
>>this causes an incompatible declaration with cray's limit function defined in /usr/include/sys/resource.h
>>which is included in includes.h.
>>
>>
> 
> Below is the patch I'm planing on commiting to the portable tree here soon
> (and hopefully upstream if there is no complaints).
> 
> Index: scp.c
> ===================================================================
> RCS file: /var/cvs/openssh/scp.c,v
> retrieving revision 1.109
> diff -u -r1.109 scp.c
> --- scp.c	10 Mar 2003 00:21:18 -0000	1.109
> +++ scp.c	18 Mar 2003 18:36:10 -0000
> @@ -96,7 +96,7 @@
>  arglist args;
> 
>  /* Bandwidth limit */
> -off_t limit = 0;
> +off_t limitbw = 0;
> 
>  /* Name of current file being transferred. */
>  char *curfile;
> @@ -251,7 +251,7 @@
>  			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 @@
>  					haderr = result >= 0 ? EIO : errno;
>  				statbytes += result;
>  			}
> -			if (limit)
> +			if (limitbw)
>  				bwlimit(amt);
>  		}
>  		if (showprogress)
> @@ -688,7 +688,7 @@
>  		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 @@
>  				statbytes += j;
>  			} while (amt > 0);
> 
> -			if (limit)
> +			if (limitbw)
>  				bwlimit(4096);
> 
>  			if (count == bp->cnt) {
> 


-- 
wendy palm
Cray OS Sustaining Engineering, Cray Inc.
wendyp at cray.com, 651-605-9154