diff options
| author | Curl Upstream <curl-library@cool.haxx.se> | 2017-04-19 05:41:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-05-11 15:26:45 (GMT) |
| commit | fd7d521c9d70655618db8232d45e5aaf81700f91 (patch) | |
| tree | 3bc749b90e932d6f220d7e1d33d6e0449def135c /lib/ftplistparser.c | |
| parent | 4cc2908fdaaf1ab8afe5c2ae5dbb3401859a9aab (diff) | |
| download | CMake-fd7d521c9d70655618db8232d45e5aaf81700f91.zip CMake-fd7d521c9d70655618db8232d45e5aaf81700f91.tar.gz CMake-fd7d521c9d70655618db8232d45e5aaf81700f91.tar.bz2 | |
curl 2017-04-19 (d957e218)
Code extracted from:
https://github.com/curl/curl.git
at commit d957e2189fdc73cef0ff3d1fb58043d354754449 (curl-7_54_0).
Diffstat (limited to 'lib/ftplistparser.c')
| -rw-r--r-- | lib/ftplistparser.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c index f94b31b..bc18680 100644 --- a/lib/ftplistparser.c +++ b/lib/ftplistparser.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, 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 @@ -280,7 +280,7 @@ static CURLcode ftp_pl_insert_finfo(struct connectdata *conn, curl_fnmatch_callback compare; struct WildcardData *wc = &conn->data->wildcard; struct ftp_wc_tmpdata *tmpdata = wc->tmp; - struct curl_llist *llist = wc->filelist; + struct curl_llist *llist = &wc->filelist; struct ftp_parselist_data *parser = tmpdata->parser; bool add = TRUE; @@ -433,10 +433,8 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, PL_ERROR(conn, CURLE_FTP_BAD_FILE_LIST); return bufflen; } - else { - parser->state.UNIX.main = PL_UNIX_FILETYPE; - finfo->b_used = 0; - } + parser->state.UNIX.main = PL_UNIX_FILETYPE; + finfo->b_used = 0; } else { PL_ERROR(conn, CURLE_FTP_BAD_FILE_LIST); |