35df710a1f
Currently we can end up passing EOF to isspace(), which is in fact libgit's sane_isspace which does: ((sane_ctype[(unsigned char)(x)] & (GIT_SPACE)) != 0) It is very unlikely that EOF cast to "unsigned char" will end up in a character that has the GIT_SPACE bit set, but the standard only requires that EOF be a negative integer, so it could access any value in the sane_ctype array. If it does end up returning true for isspace() then this loop will never terminate, so handle EOF as a special value in the same way as the other loops in this function. Signed-off-by: John Keeping <john@keeping.me.uk>
91 lignes
1.6 KiB
C
91 lignes
1.6 KiB
C
/* configfile.c: parsing of config files
|
|
*
|
|
* Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
|
|
*
|
|
* Licensed under GNU General Public License v2
|
|
* (see COPYING for full license text)
|
|
*/
|
|
|
|
#include <git-compat-util.h>
|
|
#include "configfile.h"
|
|
|
|
static int next_char(FILE *f)
|
|
{
|
|
int c = fgetc(f);
|
|
if (c == '\r') {
|
|
c = fgetc(f);
|
|
if (c != '\n') {
|
|
ungetc(c, f);
|
|
c = '\r';
|
|
}
|
|
}
|
|
return c;
|
|
}
|
|
|
|
static void skip_line(FILE *f)
|
|
{
|
|
int c;
|
|
|
|
while ((c = next_char(f)) && c != '\n' && c != EOF)
|
|
;
|
|
}
|
|
|
|
static int read_config_line(FILE *f, struct strbuf *name, struct strbuf *value)
|
|
{
|
|
int c = next_char(f);
|
|
|
|
strbuf_reset(name);
|
|
strbuf_reset(value);
|
|
|
|
/* Skip comments and preceding spaces. */
|
|
for(;;) {
|
|
if (c == EOF)
|
|
return 0;
|
|
else if (c == '#' || c == ';')
|
|
skip_line(f);
|
|
else if (!isspace(c))
|
|
break;
|
|
c = next_char(f);
|
|
}
|
|
|
|
/* Read variable name. */
|
|
while (c != '=') {
|
|
if (c == '\n' || c == EOF)
|
|
return 0;
|
|
strbuf_addch(name, c);
|
|
c = next_char(f);
|
|
}
|
|
|
|
/* Read variable value. */
|
|
c = next_char(f);
|
|
while (c != '\n' && c != EOF) {
|
|
strbuf_addch(value, c);
|
|
c = next_char(f);
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
int parse_configfile(const char *filename, configfile_value_fn fn)
|
|
{
|
|
static int nesting;
|
|
struct strbuf name = STRBUF_INIT;
|
|
struct strbuf value = STRBUF_INIT;
|
|
FILE *f;
|
|
|
|
/* cancel deeply nested include-commands */
|
|
if (nesting > 8)
|
|
return -1;
|
|
if (!(f = fopen(filename, "r")))
|
|
return -1;
|
|
nesting++;
|
|
while (read_config_line(f, &name, &value))
|
|
fn(name.buf, value.buf);
|
|
nesting--;
|
|
fclose(f);
|
|
strbuf_release(&name);
|
|
strbuf_release(&value);
|
|
return 0;
|
|
}
|
|
|