Commit 2ffe834b authored by Kamil Dudka's avatar Kamil Dudka
Browse files

ftp wildcard: a new option CURLOPT_FNMATCH_DATA

parent 027ceb37

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 


                                  Changelog



Kamil Dudka (16 May 2010)

- Pavel Raiskup introduced a new option CURLOPT_FNMATCH_DATA in order to pass

  a custom data pointer to the callback specified by CURLOPT_FNMATCH_FUNCTION.



Daniel Stenberg (14 May 2010)

- John-Mark Bell filed bug #3000052 that identified a problem (with an

  associated patch) with the OpenSSL handshake state machine when the multi

RELEASE-NOTES

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Curl and libcurl 7.21.0 


 Public curl releases:         116

 Command line options:         138

 curl_easy_setopt() options:   179

 curl_easy_setopt() options:   180

 Public functions in libcurl:  58

 Known libcurl bindings:       39

 Contributors:                 794

docs/libcurl/curl_easy_setopt.3

+6 −3
Original line number Diff line number Diff line
@@ -507,13 +507,16 @@ Pass a pointer that will be untouched by libcurl and passed as the ptr 
argument to the \fICURL_CHUNK_BGN_FUNTION\fP and \fICURL_CHUNK_END_FUNTION\fP.

(This was added in 7.21.0)

.IP CURLOPT_FNMATCH_FUNCTION

Function pointer that should match \fBint function(const char *pattern, const

char *string)\fP prototype (see \fIcurl/curl.h\fP). It is used internally for

the wildcard matching feature.

Function pointer that should match \fBint function(void *ptr, const char

*pattern, const char *string)\fP prototype (see \fIcurl/curl.h\fP). It is used

internally for the wildcard matching feature.



Return \fICURL_FNMATCHFUNC_MATCH\fP if pattern matches the string,

\fICURL_FNMATCHFUNC_NOMATCH\fP if not or \fICURL_FNMATCHFUNC_FAIL\fP if an

error occurred.  (This was added in 7.21.0)

.IP CURLOPT_FNMATCH_DATA

Pass a pointer that will be untouched by libcurl and passed as the ptr argument

to the \fICURL_FNMATCH_FUNCTION\fP. (This was added in 7.21.0)

.SH ERROR OPTIONS

.IP CURLOPT_ERRORBUFFER

Pass a char * to a buffer that the libcurl may store human readable error

docs/libcurl/symbols-in-versions

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ CURLOPT_FAILONERROR 7.1 
CURLOPT_FILE                    7.1           7.9.7

CURLOPT_FILETIME                7.5

CURLOPT_FLAGS                   7.1           -           7.9.2

CURLOPT_FNMATCH_DATA            7.21.0

CURLOPT_FNMATCH_FUNCTION        7.21.0

CURLOPT_FOLLOWLOCATION          7.1

CURLOPT_FORBID_REUSE            7.7

include/curl/curl.h

+5 −1
Original line number Diff line number Diff line
@@ -285,7 +285,8 @@ typedef long (*curl_chunk_end_callback)(void *ptr); 


/* callback type for wildcard downloading pattern matching. If the

   string matches the pattern, return CURL_FNMATCHFUNC_MATCH value, etc. */

typedef int (*curl_fnmatch_callback)(const char *pattern,

typedef int (*curl_fnmatch_callback)(void *ptr,

                                     const char *pattern,

                                     const char *string);



/* These are the return codes for the seek callbacks */
@@ -1431,6 +1432,9 @@ typedef enum { 
  /* Let the application define custom chunk data pointer */

  CINIT(CHUNK_DATA, OBJECTPOINT, 201),



  /* FNMATCH_FUNCTION user pointer */

  CINIT(FNMATCH_DATA, OBJECTPOINT, 202),



  CURLOPT_LASTENTRY /* the last unused */

} CURLoption;