Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed CONFIG_FILE to CONFIG_PATH

Browse Source 
SVN revision: 1042
This commit is contained in:
Stefan Ritt 2004-08-06 13:39:49 +00:00
parent 064fa82499
commit 782a4ddfda
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
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.446 2004/08/06 13:39:49 midas
Changed CONFIG_FILE to CONFIG_PATH
Revision 1.445 2004/08/06 07:52:51 midas Revision 1.445 2004/08/06 07:52:51 midas
Use macro CFGFILE instead of hard-wired elogd.cfg Use macro CFGFILE instead of hard-wired elogd.cfg
@ -20973,13 +20976,15 @@ int main(int argc, char *argv[])
*/ */
redirect_to_stderr(); redirect_to_stderr();
/* default config file */
strcpy(config_file, CFGFILE);
/* evaluate predefined files and directories */ /* evaluate predefined files and directories */
#ifdef CONFIG_FILE #ifdef CONFIG_PATH
strlcpy(config_file, CONFIG_FILE, sizeof(config_file)); strcpy(config_file, CONFIG_PATH);
if (config_file[0] && config_file[strlen(config_file) - 1] != DIR_SEPARATOR)
strlcat(config_file, DIR_SEPARATOR_STR, sizeof(config_file));
#endif #endif
/* default config file */
strlcat(config_file, CFGFILE, sizeof(config_file));
#ifdef RESOURCE_DIR #ifdef RESOURCE_DIR
strlcpy(resource_dir, RESOURCE_DIR, sizeof(resource_dir)); strlcpy(resource_dir, RESOURCE_DIR, sizeof(resource_dir));
#endif #endif