Stopped using ranges in scanf character sequences (e.g. %[a-z]) since that

is not ANSI C, just a common extension.  This caused problems on
at least Open Watcom C.
This commit is contained in:
Dan Fandrich 2008-06-22 06:57:00 +00:00
parent 8bae3d9007
commit 90a6a59a2f
3 changed files with 7 additions and 4 deletions

View File

@ -6,6 +6,11 @@
Changelog Changelog
Daniel Fandrich (21 Jun 2008)
- Stopped using ranges in scanf character sequences (e.g. %[a-z]) since that
is not ANSI C, just a common extension. This caused problems on
at least Open Watcom C.
Yang Tse (20 Jun 2008) Yang Tse (20 Jun 2008)
- Modified configuration script to actually verify if the compiler is good - Modified configuration script to actually verify if the compiler is good
enough at detecting compilation errors or at least it has been properly enough at detecting compilation errors or at least it has been properly

View File

@ -84,8 +84,6 @@
#include <curl/curl.h> #include <curl/curl.h>
static time_t parsedate(const char *date);
const char * const Curl_wkday[] = const char * const Curl_wkday[] =
{"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"}; {"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"};
static const char * const weekday[] = static const char * const weekday[] =
@ -248,7 +246,7 @@ static time_t parsedate(const char *date)
/* a name coming up */ /* a name coming up */
char buf[32]=""; char buf[32]="";
size_t len; size_t len;
sscanf(date, "%31[A-Za-z]", buf); sscanf(date, "%31[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz]", buf);
len = strlen(buf); len = strlen(buf);
if(wdaynum == -1) { if(wdaynum == -1) {

View File

@ -3839,7 +3839,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
* The conn->host.name is currently [user:passwd@]host[:port] where host * The conn->host.name is currently [user:passwd@]host[:port] where host
* could be a hostname, IPv4 address or IPv6 address. * could be a hostname, IPv4 address or IPv6 address.
*************************************************************/ *************************************************************/
if((1 == sscanf(conn->host.name, "[%*39[0-9a-fA-F:.]%c", &endbracket)) && if((1 == sscanf(conn->host.name, "[%*39[0123456789abcdefABCDEF:.]%c", &endbracket)) &&
(']' == endbracket)) { (']' == endbracket)) {
/* this is a RFC2732-style specified IP-address */ /* this is a RFC2732-style specified IP-address */
conn->bits.ipv6_ip = TRUE; conn->bits.ipv6_ip = TRUE;