diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-11-22 09:01:24 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-11-23 08:26:51 +0100 |
| commit | dcd6f810255785d52b89150e18460fb0899d4f7e (patch) | |
| tree | c3cb7cdcb79dbf752edcd997934e44a2e9998397 /src/tool_parsecfg.c | |
| parent | 9944d6ba334f07b0b6199bdb5bb82091c88c16ed (diff) | |
| download | curl-dcd6f810255785d52b89150e18460fb0899d4f7e.tar.gz | |
snprintf: renamed and we now only use msnprintf()
The function does not return the same value as snprintf() normally does,
so readers may be mislead into thinking the code works differently than
it actually does. A different function name makes this easier to detect.
Reported-by: Tomas Hoger
Assisted-by: Daniel Gustafsson
Fixes #3296
Closes #3297
Diffstat (limited to 'src/tool_parsecfg.c')
| -rw-r--r-- | src/tool_parsecfg.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c index e57d76026..e36b06c23 100644 --- a/src/tool_parsecfg.c +++ b/src/tool_parsecfg.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2018, 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 @@ -60,8 +60,8 @@ int parseconfig(const char *filename, struct GlobalConfig *global) filename = CURLRC; /* sensible default */ if(home) { if(strlen(home) < (sizeof(filebuffer) - strlen(CURLRC))) { - snprintf(filebuffer, sizeof(filebuffer), - "%s%s%s", home, DIR_CHAR, CURLRC); + msnprintf(filebuffer, sizeof(filebuffer), + "%s%s%s", home, DIR_CHAR, CURLRC); #ifdef WIN32 /* Check if the file exists - if not, try CURLRC in the same @@ -87,11 +87,9 @@ int parseconfig(const char *filename, struct GlobalConfig *global) /* If we have enough space, build the RC filename */ remaining = sizeof(filebuffer) - strlen(filebuffer); if(strlen(CURLRC) < remaining - 1) { - snprintf(lastdirchar, remaining, - "%s%s", DIR_CHAR, CURLRC); - /* Don't bother checking if it exists - we do - * that later - */ + msnprintf(lastdirchar, remaining, + "%s%s", DIR_CHAR, CURLRC); + /* Don't bother checking if it exists - we do that later */ filename = filebuffer; } } |