bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow comments after repo section header in pacman.conf

Browse source 
Pacman assumes that the final character of a line specifing a repo
in pacman.conf is a "]".  But it did not clean whitespace from the
line after removing any comments.  So lines like:

[allanbrokeit]  # could break system

caused pacman not to recognize the repo.  Adjust config parsing to
strip comments before trimming whitespace from the end of the string.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Allan McRae 2011-12-22 17:46:47 +10:00 • committed by Dan McGee
parent 67290441b8
commit d95c04945f
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/pacman/conf.c
View file

@ -719,16 +719,18 @@ static int _parseconfig(const char *file, struct section_t *section,
size_t line_len; size_t line_len;
linenum++; linenum++;
/* ignore whole line and end of line comments */
if((ptr = strchr(line, '#'))) {
*ptr = '\0';
}
strtrim(line); strtrim(line);
line_len = strlen(line); line_len = strlen(line);
/* ignore whole line and end of line comments */ if(line_len == 0) {
if(line_len == 0 || line[0] == '#') {
continue; continue;
} }
if((ptr = strchr(line, '#'))) {
*ptr = '\0';
}
if(line[0] == '[' && line[line_len - 1] == ']') { if(line[0] == '[' && line[line_len - 1] == ']') {
char *name; char *name;