Commit edeb1ae6 authored by Yang Tse's avatar Yang Tse
Browse files

curl: fix symbolic names for CURL_NETRC_* enum in --libcurl output

parent 82232bbb

src/tool_operate.c

+3 −3
Original line number Diff line number Diff line
@@ -933,11 +933,11 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[]) 
        my_setopt(curl, CURLOPT_APPEND, config->ftp_append?1L:0L);



        if(config->netrc_opt)

          my_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);

          my_setopt_enum(curl, CURLOPT_NETRC, (long)CURL_NETRC_OPTIONAL);

        else if(config->netrc || config->netrc_file)

          my_setopt(curl, CURLOPT_NETRC, CURL_NETRC_REQUIRED);

          my_setopt_enum(curl, CURLOPT_NETRC, (long)CURL_NETRC_REQUIRED);

        else

          my_setopt(curl, CURLOPT_NETRC, CURL_NETRC_IGNORED);

          my_setopt_enum(curl, CURLOPT_NETRC, (long)CURL_NETRC_IGNORED);



        if(config->netrc_file)

          my_setopt(curl, CURLOPT_NETRC_FILE, config->netrc_file);

src/tool_setopt.c

+7 −0
Original line number Diff line number Diff line
@@ -104,6 +104,13 @@ const NameValue setopt_nv_CURLUSESSL[] = { 
  NVEND,

};



const NameValue setopt_nv_CURL_NETRC[] = {

  NV(CURL_NETRC_IGNORED),

  NV(CURL_NETRC_OPTIONAL),

  NV(CURL_NETRC_REQUIRED),

  NVEND,

};



/* These mappings essentially triplicated - see

 * tool_libinfo.c and tool_paramhlp.c */

const NameValue setopt_nv_CURLPROTO[] = {

src/tool_setopt.h

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ extern const NameValue setopt_nv_CURL_SSLVERSION[]; 
extern const NameValue setopt_nv_CURL_TIMECOND[];

extern const NameValue setopt_nv_CURLFTPSSL_CCC[];

extern const NameValue setopt_nv_CURLUSESSL[];

extern const NameValue setopt_nv_CURL_NETRC[];

extern const NameValue setopt_nv_CURLPROTO[];

extern const NameValueUnsigned setopt_nv_CURLAUTH[];
@@ -62,6 +63,7 @@ extern const NameValueUnsigned setopt_nv_CURLAUTH[]; 
#define setopt_nv_CURLOPT_TIMECONDITION setopt_nv_CURL_TIMECOND

#define setopt_nv_CURLOPT_FTP_SSL_CCC setopt_nv_CURLFTPSSL_CCC

#define setopt_nv_CURLOPT_USE_SSL setopt_nv_CURLUSESSL

#define setopt_nv_CURLOPT_NETRC setopt_nv_CURL_NETRC

#define setopt_nv_CURLOPT_PROTOCOLS setopt_nv_CURLPROTO

#define setopt_nv_CURLOPT_REDIR_PROTOCOLS setopt_nv_CURLPROTO

#define setopt_nv_CURLOPT_PROXYTYPE setopt_nv_CURLPROXY