From f80ca7a05a2affce7b02f618592981aa02e61ce7 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Fri, 14 Feb 2014 21:59:51 +0000 Subject: tool_operate: Moved required argument getting into separate function --- src/tool_paramhlp.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) (limited to 'src/tool_paramhlp.c') diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c index 46e926952..6dcee8d5f 100644 --- a/src/tool_paramhlp.c +++ b/src/tool_paramhlp.c @@ -33,6 +33,7 @@ #include "tool_homedir.h" #include "tool_msgs.h" #include "tool_paramhlp.h" +#include "tool_version.h" #include "memdebug.h" /* keep this as LAST include */ @@ -365,8 +366,8 @@ ParameterError str2offset(curl_off_t *val, const char *str) return PARAM_BAD_NUMERIC; } -CURLcode checkpasswd(const char *kind, /* for what purpose */ - char **userpwd) /* pointer to allocated string */ +static CURLcode checkpasswd(const char *kind, /* for what purpose */ + char **userpwd) /* pointer to allocated string */ { char *psep; char *osep; @@ -464,3 +465,40 @@ long delegation(struct Configurable *config, char *str) return CURLGSSAPI_DELEGATION_NONE; } +/* + * my_useragent: returns allocated string with default user agent + */ +static char *my_useragent(void) +{ + return strdup(CURL_NAME "/" CURL_VERSION); +} + +CURLcode get_args(struct Configurable *config) +{ + CURLcode result = CURLE_OK; + + /* Check we have a password for the given host user */ + if(config->userpwd && !config->xoauth2_bearer) { + result = checkpasswd("host", &config->userpwd); + if(result) + return result; + } + + /* Check we have a password for the given proxy user */ + if(config->proxyuserpwd) { + result = checkpasswd("proxy", &config->proxyuserpwd); + if(result) + return result; + } + + /* Check we have a user agent */ + if(!config->useragent) { + config->useragent = my_useragent(); + if(!config->useragent) { + helpf(config->errors, "out of memory\n"); + result = CURLE_OUT_OF_MEMORY; + } + } + + return result; +} -- cgit v1.2.3