diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2019-05-05 17:08:21 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-05-13 08:17:09 +0200 |
| commit | 0e2208ada6e4c3edeb01ce242e3e2ca06084680b (patch) | |
| tree | 43f3fa28be281131d37729ad420df0555fb29f20 /lib/multi.c | |
| parent | 7c70a3b1ad5e156243199642c9c0abf34f9f1d8e (diff) | |
| download | curl-0e2208ada6e4c3edeb01ce242e3e2ca06084680b.tar.gz | |
wildcard: disable from build when FTP isn't present
Diffstat (limited to 'lib/multi.c')
| -rw-r--r-- | lib/multi.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/multi.c b/lib/multi.c index 71217989b..09e4830c6 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -1568,6 +1568,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, if(!result) { if(!dophase_done) { +#ifndef CURL_DISABLE_FTP /* some steps needed for wildcard matching */ if(data->state.wildcardmatch) { struct WildcardData *wc = &data->wildcard; @@ -1579,6 +1580,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, break; } } +#endif /* DO was not completed in one function call, we must continue DOING... */ multistate(data, CURLM_STATE_DOING); @@ -1718,10 +1720,12 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, (data->conn->writesockfd != CURL_SOCKET_BAD)) multistate(data, CURLM_STATE_PERFORM); else { +#ifndef CURL_DISABLE_FTP if(data->state.wildcardmatch && ((data->conn->handler->flags & PROTOPT_WILDCARD) == 0)) { data->wildcard.state = CURLWC_DONE; } +#endif multistate(data, CURLM_STATE_DONE); } rc = CURLM_CALL_MULTI_PERFORM; @@ -1942,6 +1946,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, detach_connnection(data); } +#ifndef CURL_DISABLE_FTP if(data->state.wildcardmatch) { if(data->wildcard.state != CURLWC_DONE) { /* if a wildcard is set and we are not ending -> lets start again @@ -1950,7 +1955,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, break; } } - +#endif /* after we have DONE what we're supposed to do, go COMPLETED, and it doesn't matter what the multi_done() returned! */ multistate(data, CURLM_STATE_COMPLETED); |