Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-12 19:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in parse_config_file()

Browse Source 
SVN revision: 1220
This commit is contained in:
Stefan Ritt 2005-02-22 07:19:41 +00:00
parent c7fb901ef8
commit 6f899d48d8
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 1.568 2005/02/22 07:19:41 ritt
Fixed bug in parse_config_file()
Revision 1.567 2005/02/20 20:18:26 ritt Revision 1.567 2005/02/20 20:18:26 ritt
Fixed problem with conditional attributes and presets Fixed problem with conditional attributes and presets
@ -3083,6 +3086,7 @@ int parse_config_file(char *file_name)
lb_config[n_lb_config].n_params = i; lb_config[n_lb_config].n_params = i;
} }
/* search for next line beginning */
while (*p && *p != '\r' && *p != '\n') while (*p && *p != '\r' && *p != '\n')
p++; p++;
while (*p && (*p == '\r' || *p == '\n')) while (*p && (*p == '\r' || *p == '\n'))
@ -3095,6 +3099,13 @@ int parse_config_file(char *file_name)
n_lb_config++; n_lb_config++;
index++; index++;
} }
/* search for next line beginning */
while (*p && *p != '\r' && *p != '\n' && *p != '[')
p++;
while (*p && (*p == '\r' || *p == '\n'))
p++;
} while (*p); } while (*p);
xfree(str); xfree(str);
@ -22144,7 +22155,7 @@ int main(int argc, char *argv[])
close(fh); close(fh);
/* parse contents of config file into internal structure */ /* parse contents of config file into internal structure */
parse_config_file(config_file); check_config();
/* evaluate directories from config file */ /* evaluate directories from config file */
if (getcfg("global", "Resource Dir", str, sizeof(str))) if (getcfg("global", "Resource Dir", str, sizeof(str)))