projects
/
platform
/
upstream
/
curl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 7.53.1
[platform/upstream/curl.git]
/
src
/
tool_paramhlp.c
diff --git
a/src/tool_paramhlp.c
b/src/tool_paramhlp.c
index
f2e68da
..
257e5c6
100644
(file)
--- a/
src/tool_paramhlp.c
+++ b/
src/tool_paramhlp.c
@@
-5,7
+5,7
@@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 201
5
, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 201
6
, 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
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@
-21,7
+21,7
@@
***************************************************************************/
#include "tool_setup.h"
***************************************************************************/
#include "tool_setup.h"
-#include "
rawstr
.h"
+#include "
strcase
.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
@@
-66,12
+66,15
@@
ParameterError file2string(char **bufp, FILE *file)
if(file) {
while(fgets(buffer, sizeof(buffer), file)) {
if(file) {
while(fgets(buffer, sizeof(buffer), file)) {
- if((ptr = strchr(buffer, '\r')) != NULL)
+ ptr = strchr(buffer, '\r');
+ if(ptr)
*ptr = '\0';
*ptr = '\0';
- if((ptr = strchr(buffer, '\n')) != NULL)
+ ptr = strchr(buffer, '\n');
+ if(ptr)
*ptr = '\0';
buflen = strlen(buffer);
*ptr = '\0';
buflen = strlen(buffer);
- if((ptr = realloc(string, stringlen+buflen+1)) == NULL) {
+ ptr = realloc(string, stringlen+buflen+1);
+ if(!ptr) {
Curl_safefree(string);
return PARAM_NO_MEM;
}
Curl_safefree(string);
return PARAM_NO_MEM;
}
@@
-102,7
+105,8
@@
ParameterError file2memory(char **bufp, size_t *size, FILE *file)
}
alloc *= 2;
/* allocate an extra char, reserved space, for null termination */
}
alloc *= 2;
/* allocate an extra char, reserved space, for null termination */
- if((newbuf = realloc(buffer, alloc+1)) == NULL) {
+ newbuf = realloc(buffer, alloc+1);
+ if(!newbuf) {
Curl_safefree(buffer);
return PARAM_NO_MEM;
}
Curl_safefree(buffer);
return PARAM_NO_MEM;
}
@@
-115,7
+119,8
@@
ParameterError file2memory(char **bufp, size_t *size, FILE *file)
buffer[nused] = '\0';
/* free trailing slack space, if possible */
if(alloc != nused) {
buffer[nused] = '\0';
/* free trailing slack space, if possible */
if(alloc != nused) {
- if((newbuf = realloc(buffer, nused+1)) == NULL) {
+ newbuf = realloc(buffer, nused+1);
+ if(!newbuf) {
Curl_safefree(buffer);
return PARAM_NO_MEM;
}
Curl_safefree(buffer);
return PARAM_NO_MEM;
}
@@
-284,6
+289,8
@@
long proto2num(struct OperationConfig *config, long *val, const char *str)
if(!buffer)
return 1;
if(!buffer)
return 1;
+ /* Allow strtok() here since this isn't used threaded */
+ /* !checksrc! disable BANNEDFUNC 2 */
for(token = strtok(buffer, sep);
token;
token = strtok(NULL, sep)) {
for(token = strtok(buffer, sep);
token;
token = strtok(NULL, sep)) {
@@
-310,8
+317,8
@@
long proto2num(struct OperationConfig *config, long *val, const char *str)
}
for(pp=protos; pp->name; pp++) {
}
for(pp=protos; pp->name; pp++) {
- if(curl
x_raw_
equal(token, pp->name)) {
- switch
(action) {
+ if(curl
_str
equal(token, pp->name)) {
+ switch(action) {
case deny:
*val &= ~(pp->bit);
break;
case deny:
*val &= ~(pp->bit);
break;
@@
-353,7
+360,7
@@
int check_protocol(const char *str)
if(!str)
return PARAM_REQUIRES_PARAMETER;
for(pp = curlinfo->protocols; *pp; pp++) {
if(!str)
return PARAM_REQUIRES_PARAMETER;
for(pp = curlinfo->protocols; *pp; pp++) {
- if(curl
x_raw_
equal(*pp, str))
+ if(curl
_str
equal(*pp, str))
return PARAM_OK;
}
return PARAM_LIBCURL_UNSUPPORTED_PROTOCOL;
return PARAM_OK;
}
return PARAM_LIBCURL_UNSUPPORTED_PROTOCOL;
@@
-464,11
+471,11
@@
ParameterError add2list(struct curl_slist **list, const char *ptr)
int ftpfilemethod(struct OperationConfig *config, const char *str)
{
int ftpfilemethod(struct OperationConfig *config, const char *str)
{
- if(curl
x_raw_
equal("singlecwd", str))
+ if(curl
_str
equal("singlecwd", str))
return CURLFTPMETHOD_SINGLECWD;
return CURLFTPMETHOD_SINGLECWD;
- if(curl
x_raw_
equal("nocwd", str))
+ if(curl
_str
equal("nocwd", str))
return CURLFTPMETHOD_NOCWD;
return CURLFTPMETHOD_NOCWD;
- if(curl
x_raw_
equal("multicwd", str))
+ if(curl
_str
equal("multicwd", str))
return CURLFTPMETHOD_MULTICWD;
warnf(config->global, "unrecognized ftp file method '%s', using default\n",
return CURLFTPMETHOD_MULTICWD;
warnf(config->global, "unrecognized ftp file method '%s', using default\n",
@@
-479,9
+486,9
@@
int ftpfilemethod(struct OperationConfig *config, const char *str)
int ftpcccmethod(struct OperationConfig *config, const char *str)
{
int ftpcccmethod(struct OperationConfig *config, const char *str)
{
- if(curl
x_raw_
equal("passive", str))
+ if(curl
_str
equal("passive", str))
return CURLFTPSSL_CCC_PASSIVE;
return CURLFTPSSL_CCC_PASSIVE;
- if(curl
x_raw_
equal("active", str))
+ if(curl
_str
equal("active", str))
return CURLFTPSSL_CCC_ACTIVE;
warnf(config->global, "unrecognized ftp CCC method '%s', using default\n",
return CURLFTPSSL_CCC_ACTIVE;
warnf(config->global, "unrecognized ftp CCC method '%s', using default\n",
@@
-492,11
+499,11
@@
int ftpcccmethod(struct OperationConfig *config, const char *str)
long delegation(struct OperationConfig *config, char *str)
{
long delegation(struct OperationConfig *config, char *str)
{
- if(curl
x_raw_
equal("none", str))
+ if(curl
_str
equal("none", str))
return CURLGSSAPI_DELEGATION_NONE;
return CURLGSSAPI_DELEGATION_NONE;
- if(curl
x_raw_
equal("policy", str))
+ if(curl
_str
equal("policy", str))
return CURLGSSAPI_DELEGATION_POLICY_FLAG;
return CURLGSSAPI_DELEGATION_POLICY_FLAG;
- if(curl
x_raw_
equal("always", str))
+ if(curl
_str
equal("always", str))
return CURLGSSAPI_DELEGATION_FLAG;
warnf(config->global, "unrecognized delegation method '%s', using none\n",
return CURLGSSAPI_DELEGATION_FLAG;
warnf(config->global, "unrecognized delegation method '%s', using none\n",