lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-09-03 01:21:16 +03:00
Code Activity

Enhance option parsing. In particular, empty strings might be valid options

Browse Source
This commit is contained in:
bel
2014-02-16 17:38:18 +01:00
parent a5d0ee5f63
commit c8684b89f5
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main.c
View File

@@ -196,7 +196,7 @@ static char *sdup(const char *str)
return p;
}
static void set_option(char **options, const char *name, const char *value)
static int set_option(char **options, const char *name, const char *value)
{
int i;
@@ -216,13 +216,16 @@ static void set_option(char **options, const char *name, const char *value)
if (i == MAX_OPTIONS - 3) {
die("%s", "Too many options specified");
}
/* TODO: check if this option is defined */
return 1;
}
static void read_config_file(const char *config_file, char **options)
{
char line[MAX_CONF_FILE_LINE_SIZE], opt[sizeof(line)], val[sizeof(line)], *p;
char line[MAX_CONF_FILE_LINE_SIZE], *p;
FILE *fp = NULL;
size_t i, cmd_line_opts_start = 1, line_no = 0;
size_t i, j, cmd_line_opts_start = 1, line_no = 0;
fp = fopen(config_file, "r");
@@ -252,11 +255,23 @@ static void read_config_file(const char *config_file, char **options)
continue;
}
if (sscanf(p, "%s %[^\r\n#]", opt, val) != 2) {
/* Skip spaces, \r and \n at the end of the line */
for (j = strlen(line)-1; isspace(* (unsigned char *) &line[j]) || iscntrl(* (unsigned char *) &line[j]); ) line[j--]=0;
/* Find the space character between option name and value */
for (j=i; !isspace(* (unsigned char *) &line[j]) && (line[j]!=0); ) j++;
/* Terminate the string - then the string at (line+i) contains the option name */
line[j] = 0;
j++;
/* Trim additional spaces between option name and value - then (line+j) contains the option value */
while (isspace(line[j])) j++;
/* Set option */
if (!set_option(options, line+i, line+j)) {
printf("%s: line %d is invalid, ignoring it:\n %s",
config_file, (int) line_no, p);
} else {
set_option(options, opt, val);
}
}