From adf462fe0508e7229bcfabfd8ae7012aa57e5066 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 13 Nov 2005 11:06:48 +0000 Subject: Debian bug report 338681 by Jan Kunder: make curl better detect and report bad limit-rate units: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=338681 Now curl will return error if a bad unit is used. --- src/main.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 99edc61d7..c43241930 100644 --- a/src/main.c +++ b/src/main.c @@ -1497,7 +1497,11 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ /* We support G, M, K too */ char *unit; curl_off_t value = curlx_strtoofft(nextarg, &unit, 0); - switch(nextarg[strlen(nextarg)-1]) { + + if(strlen(unit) != 1) + unit="w"; /* unsupported */ + + switch(*unit) { case 'G': case 'g': value *= 1024*1024*1024; @@ -1510,6 +1514,13 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ case 'k': value *= 1024; break; + case 'b': + case 'B': + /* for plain bytes, leave as-is */ + break; + default: + warnf(config, "unsupported rate unit. Use G, M, K or B!\n"); + return PARAM_BAD_USE; } config->recvpersecond = value; config->sendpersecond = value; -- cgit v1.2.3