# minimum and maximum long signed values
my $minlong = "LONG_MIN";
my $maxlong = "LONG_MAX";
-# maximum long unsigned value
-my $maxulong = "ULONG_MAX";
+# maximum curl_off_t
+my $maxofft = "CURL_OFF_T_MAX";
my $line = "";
my $incomment = 0;
+# Options allowed to return CURLE_BAD_FUNCTION_ARGUMENT if given a string they
+# do not recognize as valid
+my @bad_function_argument = (
+ 'CURLOPT_DNS_LOCAL_IP4',
+ 'CURLOPT_DNS_LOCAL_IP6',
+ 'CURLOPT_DNS_SERVERS',
+ 'CURLOPT_PROXY_TLSAUTH_TYPE',
+ 'CURLOPT_SSLENGINE',
+ 'CURLOPT_TLSAUTH_TYPE',
+);
+
+# Options allowed to return CURLE_UNSUPPORTED_PROTOCOL if given a string they
+# do not recognize as valid
+my @unsupported_protocol = (
+ 'CURLOPT_PROTOCOLS_STR',
+ 'CURLOPT_REDIR_PROTOCOLS_STR',
+ );
+
+# Options allowed to return CURLE_SSL_ENGINE_NOTFOUND if given a string they
+# do not recognize as valid
+my @ssl_engine_notfound = (
+ 'CURLOPT_SSLENGINE',
+ );
+
+# Options allowed to return CURLE_UNSUPPORTED_PROTOCOL if given a bad
+# numerical input they do not recognize as valid
+my @unsupported_protocol_num = (
+ 'CURLOPT_HTTP_VERSION',
+ );
+
+# Options allowed to return CURLE_NOT_BUILT_IN if given a bad
+# numerical input they do not recognize as valid
+my @not_built_in_num = (
+ 'CURLOPT_HTTPAUTH',
+ 'CURLOPT_PROXYAUTH',
+ 'CURLOPT_SOCKS5_AUTH',
+ );
+
+
+#
+# Generate a set of string checks
+#
+
+my $allowedstringerrors = <<MOO
+ switch(code) {
+ case CURLE_BAD_FUNCTION_ARGUMENT:
+MOO
+ ;
+
+for my $o (@bad_function_argument) {
+ $allowedstringerrors .= <<MOO
+ if(!strcmp("$o", name))
+ return;
+MOO
+ ;
+}
+
+$allowedstringerrors .= <<MOO
+ break;
+MOO
+ ;
+
+$allowedstringerrors .= <<MOO
+ case CURLE_UNSUPPORTED_PROTOCOL:
+MOO
+ ;
+for my $o (@unsupported_protocol) {
+ $allowedstringerrors .= <<MOO
+ if(!strcmp("$o", name))
+ return;
+MOO
+ ;
+}
+$allowedstringerrors .= <<MOO
+ break;
+MOO
+ ;
+
+$allowedstringerrors .= <<MOO
+ case CURLE_SSL_ENGINE_NOTFOUND:
+MOO
+ ;
+for my $o (@ssl_engine_notfound) {
+ $allowedstringerrors .= <<MOO
+ if(!strcmp("$o", name))
+ return;
+MOO
+ ;
+}
+$allowedstringerrors .= <<MOO
+ break;
+ default:
+ break;
+ }
+MOO
+ ;
+
+#
+# Generate a set of string checks
+#
+
+my $allowednumerrors = <<MOO
+ switch(code) {
+ case CURLE_UNSUPPORTED_PROTOCOL:
+MOO
+ ;
+
+for my $o (@unsupported_protocol_num) {
+ $allowednumerrors .= <<MOO
+ if(!strcmp("$o", name))
+ return;
+MOO
+ ;
+}
+
+$allowednumerrors .= <<MOO
+ break;
+ case CURLE_NOT_BUILT_IN:
+MOO
+ ;
+
+for my $o (@not_built_in_num) {
+ $allowednumerrors .= <<MOO
+ if(!strcmp("$o", name))
+ return;
+MOO
+ ;
+}
+
+$allowednumerrors .= <<MOO
+ break;
+ default:
+ break;
+ }
+MOO
+ ;
+
print <<HEADER
/***************************************************************************
* _ _ ____ _
* | (__| |_| | _ <| |___
* \\___|\\___/|_| \\_\\_____|
*
- * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) Daniel Stenberg, <daniel\@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
#define LO $minlong
#define HI $maxlong
#define OFF_LO (curl_off_t) LO
-#define OFF_HI (curl_off_t) $maxulong
+#define OFF_HI (curl_off_t) $maxofft
#define OFF_NO (curl_off_t) 0
-/* Unexpected error.
- CURLE_NOT_BUILT_IN - means disabled at build
- CURLE_UNKNOWN_OPTION - means no such option (anymore?)
- CURLE_SSL_ENGINE_NOTFOUND - set unknown ssl engine
- CURLE_UNSUPPORTED_PROTOCOL - set bad HTTP version
- CURLE_BAD_FUNCTION_ARGUMENT - unsupported value
- */
-#define UNEX(x) ((x) && \\
- ((x) != CURLE_NOT_BUILT_IN) && \\
- ((x) != CURLE_UNKNOWN_OPTION) && \\
- ((x) != CURLE_SSL_ENGINE_NOTFOUND) && \\
- ((x) != CURLE_UNSUPPORTED_PROTOCOL) && \\
- ((x) != CURLE_BAD_FUNCTION_ARGUMENT) )
-
static size_t writecb(char *buffer, size_t size, size_t nitems,
void *outstream)
{
return 0;
}
-static int err(const char *name, CURLcode val, int lineno)
+static void errlongzero(const char *name, CURLcode code, int lineno)
+{
+ printf("%s set to 0 returned %d, \\"%s\\" on line %d\\n",
+ name, code, curl_easy_strerror(code), lineno);
+}
+
+static void errlong(const char *name, CURLcode code, int lineno)
+{
+$allowednumerrors
+ printf("%s set to non-zero returned %d, \\"%s\\" on line %d\\n",
+ name, code, curl_easy_strerror(code), lineno);
+}
+
+static void errstring(const char *name, CURLcode code, int lineno)
+{
+ /* allow this set of options to return CURLE_BAD_FUNCTION_ARGUMENT
+ when given a strange string input */
+$allowedstringerrors
+ printf("%s set to a string returned %d, \\"%s\\" on line %d\\n",
+ name, code, curl_easy_strerror(code), lineno);
+}
+
+static void err(const char *name, CURLcode val, int lineno)
+{
+ printf("%s returned %d, \\"%s\\" on line %d\\n",
+ name, val, curl_easy_strerror(val), lineno);
+}
+
+static void errnull(const char *name, CURLcode val, int lineno)
{
- printf("CURLOPT_%s returned %d, \\"%s\\" on line %d\\n",
+ printf("%s set to NULL returned %d, \\"%s\\" on line %d\\n",
name, val, curl_easy_strerror(val), lineno);
- return (int)val;
}
-static int geterr(const char *name, CURLcode val, int lineno)
+static void geterr(const char *name, CURLcode val, int lineno)
{
printf("CURLINFO_%s returned %d, \\"%s\\" on line %d\\n",
name, val, curl_easy_strerror(val), lineno);
- return (int)val;
}
static curl_progress_callback progresscb;
static curl_resolver_start_callback resolver_start_cb;
static curl_prereq_callback prereqcb;
+/* long options that are okay to return
+ CURLE_BAD_FUNCTION_ARGUMENT */
+static bool bad_long(CURLcode res, int check)
+{
+ if(res != CURLE_BAD_FUNCTION_ARGUMENT)
+ return 0; /* not okay */
+
+ if(check < CURLOPTTYPE_OBJECTPOINT) {
+ /* LONG */
+ return 1;
+ }
+ else if((check >= CURLOPTTYPE_OFF_T) &&
+ (check < CURLOPTTYPE_BLOB)) {
+ /* OFF_T */
+ return 1;
+ }
+ return 0;
+}
+
+/* macro to check the first setopt of an option which then is allowed to get a
+ non-existing function return code back */
+#define present(x) ((x != CURLE_NOT_BUILT_IN) && (x != CURLE_UNKNOWN_OPTION))
+
CURLcode test(char *URL)
{
CURL *curl = NULL;
res = CURLE_OUT_OF_MEMORY;
goto test_cleanup;
}
-
HEADER
;
if($_ =~ /^CURLOPT(?:DEPRECATED)?\(([^ ]*), ([^ ]*), (\d*)[,)]/) {
my ($name, $type, $val)=($1, $2, $3);
my $w=" ";
- my $pref = "${w}res = curl_easy_setopt(curl, $name,";
- my $i = ' ' x (length($w) + 23);
- my $check = " if(UNEX(res)) {\n err(\"$name\", res, __LINE__);\n goto test_cleanup;\n }\n";
+ my $w2="$w$w";
+ my $w3="$w$w$w";
+ my $opt = $name;
+ $opt =~ s/^CURLOPT_//;
+ my $exists = "${w}{\n";
+ # the first check for an option
+ my $fpref = "${exists}${w2}CURLcode first =\n${w3}curl_easy_setopt(curl, $name,";
+ my $ifpresent = "${w2}if(present(first)) {\n";
+ my $pref = "${w3}res = curl_easy_setopt(curl, $name,";
+ my $i = ' ' x (length($w) + 25);
+ my $fcheck = <<MOO
+ if(first && present(first)) /* first setopt check only */
+ err("$name", first, __LINE__);
+MOO
+ ;
+ my $fstringcheck = <<MOO
+ if(first && present(first)) /* first setopt check only */
+ errstring("$name", first, __LINE__);
+MOO
+ ;
+ my $check = <<MOO
+ if(res)
+ err("$name", res, __LINE__);
+MOO
+ ;
+ my $flongcheckzero = <<MOO
+ if(first && present(first) && !bad_long(res,
+ $name))
+ errlongzero("$name", first, __LINE__);
+MOO
+ ;
+
+ my $longcheck = <<MOO
+ if(res && !bad_long(res, $name))
+ errlong("$name", res, __LINE__);
+MOO
+ ;
+
+ my $nullcheck = <<MOO
+ if(res)
+ errnull(\"$name\", res, __LINE__);
+MOO
+ ;
+
+ print "\n /****** Verify $name ******/\n";
if($type eq "CURLOPTTYPE_STRINGPOINT") {
- print "${pref} \"string\");\n$check";
- print "${pref} NULL);\n$check";
+ print "${fpref} \"string\");\n$fstringcheck";
+ print "$ifpresent";
+ print "${pref} NULL);\n$nullcheck";
}
elsif(($type eq "CURLOPTTYPE_LONG") ||
($type eq "CURLOPTTYPE_VALUES")) {
- print "${pref} 0L);\n$check";
- print "${pref} 22L);\n$check";
- print "${pref} LO);\n$check";
- print "${pref} HI);\n$check";
+ print "${fpref} 0L);\n$flongcheckzero";
+ print "$ifpresent";
+ print "${pref} 22L);\n$longcheck";
+ print "${pref} LO);\n$longcheck";
+ print "${pref} HI);\n$longcheck";
+ }
+ elsif($type eq "CURLOPTTYPE_OFF_T") {
+ print "${fpref} OFF_NO);\n$flongcheckzero";
+ print "$ifpresent";
+ my $lvl = " " x 29;
+ print "${pref}\n${lvl}(curl_off_t)22);\n$longcheck";
+ print "${pref} OFF_HI);\n$longcheck";
+ print "${pref} OFF_LO);\n$longcheck";
}
elsif(($type eq "CURLOPTTYPE_OBJECTPOINT") ||
($type eq "CURLOPTTYPE_CBPOINT")) {
if($name =~ /DEPENDS/) {
- print "${pref} dep);\n$check";
+ print "${fpref} dep);\n$fcheck";
}
elsif($name =~ "SHARE") {
- print "${pref} share);\n$check";
+ print "${fpref} share);\n$fcheck";
}
elsif($name eq "CURLOPT_ERRORBUFFER") {
- print "${pref} errorbuffer);\n$check";
+ print "${fpref} errorbuffer);\n$fcheck";
}
elsif(($name eq "CURLOPT_POSTFIELDS") ||
($name eq "CURLOPT_COPYPOSTFIELDS")) {
# set size to zero to avoid it being "illegal"
print " (void)curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, 0);\n";
- print "${pref} stringpointerextra);\n$check";
+ print "${fpref} stringpointerextra);\n$fcheck";
}
elsif($name eq "CURLOPT_HTTPPOST") {
- print "${pref} httppost);\n$check";
+ print "${fpref} httppost);\n$fcheck";
}
elsif($name eq "CURLOPT_MIMEPOST") {
- print "${pref} mimepost);\n$check";
+ print "${fpref} mimepost);\n$fcheck";
}
elsif($name eq "CURLOPT_STDERR") {
- print "${pref} stream);\n$check";
+ print "${fpref} stream);\n$fcheck";
}
else {
- print "${pref} &object);\n$check";
+ print "${fpref} &object);\n$fcheck";
}
- print "${pref} NULL);\n$check";
+ print "$ifpresent";
+ print "${pref} NULL);\n$nullcheck";
}
elsif($type eq "CURLOPTTYPE_SLISTPOINT") {
- print "${pref} slist);\n$check";
+ print "${fpref} slist);\n$fcheck";
+ print "$ifpresent";
+ print "${pref} NULL);\n$nullcheck";
}
elsif($type eq "CURLOPTTYPE_FUNCTIONPOINT") {
if($name =~ /([^ ]*)FUNCTION/) {
my $l=lc($1);
$l =~ s/^curlopt_//;
- print "${pref}\n$i${l}cb);\n$check";
+ print "${fpref}\n$i${l}cb);\n$fcheck";
}
else {
- print "${pref} &func);\n$check";
+ print "${fpref} &func);\n$fcheck";
}
- print "${pref} NULL);\n$check";
- }
- elsif($type eq "CURLOPTTYPE_OFF_T") {
- # play conservative to work with 32bit curl_off_t
- print "${pref} OFF_NO);\n$check";
- print "${pref} OFF_HI);\n$check";
- print "${pref} OFF_LO);\n$check";
+ print "$ifpresent";
+ print "${pref} NULL);\n$nullcheck";
}
elsif($type eq "CURLOPTTYPE_BLOB") {
- print "${pref} &blob);\n$check";
+ print "${fpref} &blob);\n$check";
+ print "$ifpresent";
+ print "${pref} NULL);\n$nullcheck";
}
else {
print STDERR "\nUnknown type: $type\n";
exit 22; # exit to make this noticed!
}
+
+ print <<MOO
+ } /* end of secondary checks */
+ } /* end of single setopt */
+MOO
+ ;
}
elsif($_ =~ /^CURLINFO_NONE/) {
$infomode = 1;
($_ =~ /^CURLINFO_([^ ]*) *= *CURLINFO_([^ ]*)/)) {
my ($info, $type)=($1, $2);
my $c = " res = curl_easy_getinfo(curl, CURLINFO_$info,";
- my $check = " if(UNEX(res)) {\n geterr(\"$info\", res, __LINE__);\n goto test_cleanup;\n }\n";
+ my $check = " if(res)\n geterr(\"$info\", res, __LINE__);\n";
if($type eq "STRING") {
print "$c &charp);\n$check";
}
curl_share_cleanup(share);
curl_global_cleanup();
+ if(!res)
+ puts("ok");
return res;
}
FOOTER
projects / thirdparty / curl.git / commitdiff
