diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.inc | 6 | ||||
| -rw-r--r-- | src/tool_parsecfg.c | 67 |
2 files changed, 35 insertions, 38 deletions
diff --git a/src/Makefile.inc b/src/Makefile.inc index c0b9ad864..6f236fecc 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -36,7 +36,8 @@ CURLX_CFILES = \ ../lib/warnless.c \ ../lib/curl_ctype.c \ ../lib/curl_multibyte.c \ - ../lib/version_win32.c + ../lib/version_win32.c \ + ../lib/dynbuf.c CURLX_HFILES = \ ../lib/curl_setup.h \ @@ -45,7 +46,8 @@ CURLX_HFILES = \ ../lib/warnless.h \ ../lib/curl_ctype.h \ ../lib/curl_multibyte.h \ - ../lib/version_win32.h + ../lib/version_win32.h \ + ../lib/dynbuf.h CURL_CFILES = \ slist_wc.c \ diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c index 4e56492cb..f09180ed4 100644 --- a/src/tool_parsecfg.c +++ b/src/tool_parsecfg.c @@ -31,6 +31,7 @@ #include "tool_homedir.h" #include "tool_msgs.h" #include "tool_parsecfg.h" +#include "dynbuf.h" #include "memdebug.h" /* keep this as LAST include */ @@ -39,7 +40,9 @@ #define ISSEP(x,dash) (!dash && (((x) == '=') || ((x) == ':'))) static const char *unslashquote(const char *line, char *param); -static char *my_get_line(FILE *fp); + +#define MAX_CONFIG_LINE_LENGTH (100*1024) +static bool my_get_line(FILE *fp, struct curlx_dynbuf *, bool *error); #ifdef WIN32 static FILE *execpath(const char *filename) @@ -135,17 +138,23 @@ int parseconfig(const char *filename, struct GlobalConfig *global) if(file) { char *line; - char *aline; char *option; char *param; int lineno = 0; bool dashed_option; + struct curlx_dynbuf buf; + bool fileerror; + curlx_dyn_init(&buf, MAX_CONFIG_LINE_LENGTH); - while(NULL != (aline = my_get_line(file))) { + while(my_get_line(file, &buf, &fileerror)) { int res; bool alloced_param = FALSE; lineno++; - line = aline; + line = curlx_dyn_ptr(&buf); + if(!line) { + rc = 1; /* out of memory */ + break; + } /* line with # in the first non-blank column is a comment! */ while(*line && ISSPACE(*line)) @@ -158,7 +167,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global) case '\n': case '*': case '\0': - Curl_safefree(aline); + curlx_dyn_reset(&buf); continue; } @@ -190,7 +199,6 @@ int parseconfig(const char *filename, struct GlobalConfig *global) param = malloc(strlen(line) + 1); /* parameter */ if(!param) { /* out of memory */ - Curl_safefree(aline); rc = 1; break; } @@ -280,10 +288,13 @@ int parseconfig(const char *filename, struct GlobalConfig *global) if(alloced_param) Curl_safefree(param); - Curl_safefree(aline); + curlx_dyn_reset(&buf); } + curlx_dyn_free(&buf); if(file != stdin) fclose(file); + if(fileerror) + rc = 1; } else rc = 1; /* couldn't open the file */ @@ -335,39 +346,23 @@ static const char *unslashquote(const char *line, char *param) /* * Reads a line from the given file, ensuring is NUL terminated. - * The pointer must be freed by the caller. - * NULL is returned on an out of memory condition. */ -static char *my_get_line(FILE *fp) +static bool my_get_line(FILE *fp, struct curlx_dynbuf *db, + bool *error) { char buf[4096]; - char *nl = NULL; - char *line = NULL; - + *error = FALSE; do { - if(NULL == fgets(buf, sizeof(buf), fp)) - break; - if(!line) { - line = strdup(buf); - if(!line) - return NULL; + /* fgets() returns s on success, and NULL on error or when end of file + occurs while no characters have been read. */ + if(!fgets(buf, sizeof(buf), fp)) + /* only if there's data in the line, return TRUE */ + return curlx_dyn_len(db) ? TRUE : FALSE; + if(curlx_dyn_add(db, buf)) { + *error = TRUE; /* error */ + return FALSE; /* stop reading */ } - else { - char *ptr; - size_t linelen = strlen(line); - ptr = realloc(line, linelen + strlen(buf) + 1); - if(!ptr) { - Curl_safefree(line); - return NULL; - } - line = ptr; - strcpy(&line[linelen], buf); - } - nl = strchr(line, '\n'); - } while(!nl); + } while(!strchr(buf, '\n')); - if(nl) - *nl = '\0'; - - return line; + return TRUE; /* continue */ } |