2006-01-24 23:41:05 +00:00
|
|
|
/*
|
2006-02-21 23:19:53 +00:00
|
|
|
* $idx: conf.c,v 1.4 2006/02/21 03:08:14 rpedde Exp $
|
2006-01-24 23:41:05 +00:00
|
|
|
* Functions for reading and writing the config file
|
|
|
|
*
|
|
|
|
* Copyright (C) 2006 Ron Pedde (ron@pedde.com)
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \file config.c
|
|
|
|
*
|
|
|
|
* Config file reading and writing
|
|
|
|
*/
|
|
|
|
|
2006-03-06 06:55:58 +00:00
|
|
|
#ifdef HAVE_CONFIG_H
|
2006-01-24 23:41:05 +00:00
|
|
|
# include "config.h"
|
|
|
|
#endif
|
|
|
|
|
2006-03-07 07:55:36 +00:00
|
|
|
#include <limits.h>
|
2006-02-21 03:08:14 +00:00
|
|
|
#include <pthread.h>
|
2006-01-24 23:41:05 +00:00
|
|
|
#include <stdio.h>
|
2006-03-03 06:05:34 +00:00
|
|
|
#include <stdlib.h>
|
2006-02-14 06:39:06 +00:00
|
|
|
#include <string.h>
|
2006-01-24 23:41:05 +00:00
|
|
|
|
2006-03-06 06:29:03 +00:00
|
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
|
|
# include <sys/param.h>
|
|
|
|
#endif
|
2006-03-03 06:05:34 +00:00
|
|
|
|
2006-02-08 23:02:43 +00:00
|
|
|
#include "conf.h"
|
2006-02-05 00:22:46 +00:00
|
|
|
#include "err.h"
|
|
|
|
#include "ll.h"
|
|
|
|
#include "daapd.h"
|
2006-01-24 23:41:05 +00:00
|
|
|
|
|
|
|
/** Globals */
|
2006-03-03 06:05:34 +00:00
|
|
|
//static int ecode;
|
2006-02-21 03:08:14 +00:00
|
|
|
static LL_HANDLE conf_main=NULL;
|
2006-03-13 06:33:58 +00:00
|
|
|
static LL_HANDLE conf_comments=NULL;
|
|
|
|
|
2006-02-21 23:19:53 +00:00
|
|
|
static char *conf_main_file = NULL;
|
2006-02-21 03:08:14 +00:00
|
|
|
static pthread_mutex_t conf_mutex = PTHREAD_MUTEX_INITIALIZER;
|
2006-02-05 00:22:46 +00:00
|
|
|
|
2006-03-12 21:25:29 +00:00
|
|
|
#define CONF_LINEBUFFER 128
|
2006-01-24 23:41:05 +00:00
|
|
|
|
2006-02-08 23:02:43 +00:00
|
|
|
#define CONF_T_INT 0
|
|
|
|
#define CONF_T_STRING 1
|
2006-03-03 06:05:34 +00:00
|
|
|
#define CONF_T_EXISTPATH 2
|
2006-02-08 23:02:43 +00:00
|
|
|
|
|
|
|
/** Forwards */
|
2006-02-14 06:39:06 +00:00
|
|
|
static int _conf_verify(LL_HANDLE pll);
|
2006-02-20 03:56:47 +00:00
|
|
|
static LL_ITEM *_conf_fetch_item(LL_HANDLE pll, char *section, char *term);
|
2006-02-14 06:39:06 +00:00
|
|
|
static int _conf_exists(LL_HANDLE pll, char *section, char *term);
|
2006-02-21 03:08:14 +00:00
|
|
|
static void _conf_lock(void);
|
|
|
|
static void _conf_unlock(void);
|
2006-03-13 06:33:58 +00:00
|
|
|
static int _conf_write(FILE *fp, LL *pll, int sublevel, char *parent);
|
2006-02-08 23:02:43 +00:00
|
|
|
|
|
|
|
typedef struct _CONF_ELEMENTS {
|
|
|
|
int required;
|
|
|
|
int deprecated;
|
|
|
|
int type;
|
|
|
|
char *section;
|
|
|
|
char *term;
|
|
|
|
} CONF_ELEMENTS;
|
|
|
|
|
|
|
|
static CONF_ELEMENTS conf_elements[] = {
|
|
|
|
{ 1, 0, CONF_T_STRING,"general","runas" },
|
2006-03-03 06:05:34 +00:00
|
|
|
{ 1, 0, CONF_T_EXISTPATH,"general","web_root" },
|
2006-02-08 23:02:43 +00:00
|
|
|
{ 1, 0, CONF_T_INT,"general","port" },
|
|
|
|
{ 1, 0, CONF_T_STRING,"general","admin_pw" },
|
|
|
|
{ 1, 0, CONF_T_STRING,"general","mp3_dir" },
|
2006-03-03 06:05:34 +00:00
|
|
|
{ 0, 1, CONF_T_EXISTPATH,"general","db_dir" },
|
2006-02-08 23:02:43 +00:00
|
|
|
{ 0, 0, CONF_T_STRING,"general","db_type" },
|
|
|
|
{ 0, 0, CONF_T_STRING,"general","db_parms" },
|
|
|
|
{ 0, 0, CONF_T_INT,"general","debuglevel" },
|
|
|
|
{ 1, 0, CONF_T_STRING,"general","servername" },
|
|
|
|
{ 0, 0, CONF_T_INT,"general","rescan_interval" },
|
|
|
|
{ 0, 0, CONF_T_INT,"general","always_scan" },
|
|
|
|
{ 0, 1, CONF_T_INT,"general","latin1_tags" },
|
|
|
|
{ 0, 0, CONF_T_INT,"general","process_m3u" },
|
|
|
|
{ 0, 0, CONF_T_INT,"general","scan_type" },
|
|
|
|
{ 0, 1, CONF_T_INT,"general","compress" },
|
|
|
|
{ 0, 0, CONF_T_STRING,"general","playlist" },
|
|
|
|
{ 0, 0, CONF_T_STRING,"general","extensions" },
|
|
|
|
{ 0, 0, CONF_T_STRING,"general","interface" },
|
|
|
|
{ 0, 0, CONF_T_STRING,"general","ssc_codectypes" },
|
|
|
|
{ 0, 0, CONF_T_STRING,"general","ssc_prog" },
|
|
|
|
{ 0, 0, CONF_T_STRING,"general","password" },
|
|
|
|
{ 0, 0, CONF_T_STRING,"general","compdirs" },
|
2006-02-14 06:39:06 +00:00
|
|
|
{ 0, 0, CONF_T_STRING,"general","logfile" },
|
|
|
|
{ 0, 0, CONF_T_INT, NULL, NULL }
|
2006-02-08 23:02:43 +00:00
|
|
|
};
|
|
|
|
|
2006-02-21 03:08:14 +00:00
|
|
|
/**
|
|
|
|
* lock the conf mutex
|
|
|
|
*/
|
|
|
|
void _conf_lock() {
|
|
|
|
int err;
|
2006-02-21 23:19:53 +00:00
|
|
|
|
2006-02-21 03:08:14 +00:00
|
|
|
if((err=pthread_mutex_lock(&conf_mutex))) {
|
|
|
|
DPRINTF(E_FATAL,L_CONF,"Cannot lock configuration mutex: %s\n",
|
|
|
|
strerror(err));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* unlock the conf mutex
|
|
|
|
*/
|
|
|
|
void _conf_unlock() {
|
|
|
|
int err;
|
2006-02-21 23:19:53 +00:00
|
|
|
|
2006-02-21 03:08:14 +00:00
|
|
|
if((err = pthread_mutex_unlock(&conf_mutex))) {
|
|
|
|
DPRINTF(E_FATAL,L_CONF,"Cannot unlock configuration mutex %s\n",
|
|
|
|
strerror(err));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-20 03:56:47 +00:00
|
|
|
/**
|
|
|
|
* fetch item based on section/term basis, rather than just a single
|
|
|
|
* level deep, like ll_fetch_item does
|
2006-02-21 23:19:53 +00:00
|
|
|
*
|
2006-02-20 03:56:47 +00:00
|
|
|
* @param pll top level linked list to test (config tree)
|
|
|
|
* @param section section to term (key) is in
|
|
|
|
* @param term term/key to look for
|
|
|
|
* @returns LL_ITEM of the key, or NULL
|
|
|
|
*/
|
|
|
|
LL_ITEM *_conf_fetch_item(LL_HANDLE pll, char *section, char *term) {
|
|
|
|
LL_ITEM *psection;
|
2006-02-14 06:39:06 +00:00
|
|
|
LL_ITEM *pitem;
|
2006-02-20 03:56:47 +00:00
|
|
|
|
|
|
|
if(!(psection = ll_fetch_item(pll,section)))
|
2006-02-21 03:08:14 +00:00
|
|
|
return NULL;
|
2006-02-20 03:56:47 +00:00
|
|
|
|
|
|
|
if(psection->type != LL_TYPE_LL)
|
2006-02-21 03:08:14 +00:00
|
|
|
return NULL;
|
2006-02-20 03:56:47 +00:00
|
|
|
|
|
|
|
if(!(pitem = ll_fetch_item(psection->value.as_ll,term)))
|
2006-02-21 03:08:14 +00:00
|
|
|
return NULL;
|
2006-02-20 03:56:47 +00:00
|
|
|
|
|
|
|
return pitem;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* simple test to see if a particular section/key value exists
|
|
|
|
*
|
|
|
|
* @param pll config tree to test
|
|
|
|
* @param section section to find the term under
|
|
|
|
* @param term key to search for under the specified section
|
|
|
|
* @returns TRUE if key exists, FALSE otherwise
|
|
|
|
*/
|
|
|
|
int _conf_exists(LL_HANDLE pll, char *section, char *term) {
|
|
|
|
if(!_conf_fetch_item(pll,section,term))
|
2006-02-21 03:08:14 +00:00
|
|
|
return FALSE;
|
2006-02-20 03:56:47 +00:00
|
|
|
|
2006-02-14 06:39:06 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-01-24 23:41:05 +00:00
|
|
|
/**
|
2006-02-14 06:39:06 +00:00
|
|
|
* Verify that the configuration isn't obviously wrong.
|
|
|
|
* Type checking has already been done, this just checks
|
|
|
|
* required stuff isn't missing.
|
2006-02-08 23:02:43 +00:00
|
|
|
*
|
|
|
|
* @param pll tree to check
|
2006-02-14 06:39:06 +00:00
|
|
|
* @returns TRUE if configuration appears valid, FALSE otherwise
|
2006-02-08 23:02:43 +00:00
|
|
|
*/
|
2006-02-14 06:39:06 +00:00
|
|
|
int _conf_verify(LL_HANDLE pll) {
|
|
|
|
LL_ITEM *pi = NULL;
|
|
|
|
CONF_ELEMENTS *pce;
|
|
|
|
int is_valid=TRUE;
|
2006-03-03 06:05:34 +00:00
|
|
|
char resolved_path[PATH_MAX];
|
2006-02-21 23:19:53 +00:00
|
|
|
|
2006-02-14 06:39:06 +00:00
|
|
|
/* first, walk through the elements and make sure
|
|
|
|
* all required elements are there */
|
|
|
|
pce = &conf_elements[0];
|
|
|
|
while(pce->section) {
|
|
|
|
if(pce->required) {
|
2006-02-21 03:08:14 +00:00
|
|
|
if(!_conf_exists(pll,pce->section, pce->term)) {
|
2006-02-14 06:39:06 +00:00
|
|
|
DPRINTF(E_LOG,L_CONF,"Missing configuration entry "
|
|
|
|
" %s/%s. Please review the sample config\n",
|
|
|
|
pce->section, pce->term);
|
2006-02-21 03:08:14 +00:00
|
|
|
is_valid=FALSE;
|
|
|
|
}
|
2006-02-14 06:39:06 +00:00
|
|
|
}
|
|
|
|
if(pce->deprecated) {
|
2006-03-13 06:33:58 +00:00
|
|
|
if(_conf_exists(pll,pce->section,pce->term)) {
|
|
|
|
DPRINTF(E_LOG,L_CONF,"Config entry %s/%s is deprecated. Please "
|
|
|
|
"review the sample config\n",
|
|
|
|
pce->section, pce->term);
|
|
|
|
}
|
2006-02-14 06:39:06 +00:00
|
|
|
}
|
2006-03-03 06:05:34 +00:00
|
|
|
if(pce->type == CONF_T_EXISTPATH) {
|
|
|
|
/* first, need to resolve */
|
|
|
|
pi = _conf_fetch_item(pll,pce->section, pce->term);
|
|
|
|
if(pi) {
|
|
|
|
memset(resolved_path,0,sizeof(resolved_path));
|
|
|
|
if(pi->value.as_string) {
|
|
|
|
realpath(pi->value.as_string,resolved_path);
|
|
|
|
free(pi->value.as_string);
|
|
|
|
pi->value.as_string = strdup(resolved_path);
|
|
|
|
}
|
|
|
|
/* now, should verify it exists */
|
|
|
|
}
|
|
|
|
}
|
2006-02-14 06:39:06 +00:00
|
|
|
pce++;
|
|
|
|
}
|
2006-02-21 23:19:53 +00:00
|
|
|
|
2006-02-14 06:39:06 +00:00
|
|
|
/* here we would walk through derived sections, if there
|
|
|
|
* were any */
|
2006-02-08 23:02:43 +00:00
|
|
|
|
2006-02-14 06:39:06 +00:00
|
|
|
return is_valid;
|
2006-02-08 23:02:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* read a configfile into a tree
|
2006-01-24 23:41:05 +00:00
|
|
|
*
|
|
|
|
* @param file file to read
|
|
|
|
* @returns TRUE if successful, FALSE otherwise
|
|
|
|
*/
|
2006-02-21 03:08:14 +00:00
|
|
|
int conf_read(char *file) {
|
2006-01-25 22:31:53 +00:00
|
|
|
FILE *fin;
|
|
|
|
int err;
|
2006-03-12 21:25:29 +00:00
|
|
|
LL_HANDLE pllnew, plltemp, pllcurrent, pllcomment;
|
|
|
|
char linebuffer[CONF_LINEBUFFER+1];
|
2006-03-13 06:33:58 +00:00
|
|
|
char keybuffer[256];
|
2006-02-05 00:22:46 +00:00
|
|
|
char *comment, *term, *value, *delim;
|
2006-03-13 06:33:58 +00:00
|
|
|
char *section_name=NULL;
|
|
|
|
char *prev_comments=NULL;
|
|
|
|
int prev_comment_length=20;
|
2006-02-05 00:22:46 +00:00
|
|
|
int compat_mode=1;
|
2006-02-08 23:02:43 +00:00
|
|
|
int line=0;
|
2006-03-13 06:33:58 +00:00
|
|
|
int ws=0;
|
2006-03-12 21:25:29 +00:00
|
|
|
|
2006-02-21 23:19:53 +00:00
|
|
|
if(conf_main_file) {
|
|
|
|
conf_close();
|
|
|
|
}
|
|
|
|
|
|
|
|
conf_main_file = strdup(file);
|
|
|
|
|
2006-01-25 22:31:53 +00:00
|
|
|
fin=fopen(file,"r");
|
|
|
|
if(!fin) {
|
2006-02-08 23:02:43 +00:00
|
|
|
return CONF_E_FOPEN;
|
2006-01-25 22:31:53 +00:00
|
|
|
}
|
|
|
|
|
2006-03-13 06:33:58 +00:00
|
|
|
prev_comments = (char*)malloc(prev_comment_length);
|
|
|
|
prev_comments[0] = '\0';
|
|
|
|
|
2006-02-05 00:22:46 +00:00
|
|
|
if((err=ll_create(&pllnew)) != LL_E_SUCCESS) {
|
|
|
|
DPRINTF(E_LOG,L_CONF,"Error creating linked list: %d\n",err);
|
|
|
|
fclose(fin);
|
2006-02-08 23:02:43 +00:00
|
|
|
return CONF_E_UNKNOWN;
|
2006-01-25 22:31:53 +00:00
|
|
|
}
|
2006-01-24 23:41:05 +00:00
|
|
|
|
2006-03-12 21:25:29 +00:00
|
|
|
ll_create(&pllcomment); /* don't care if we lose comments */
|
2006-03-13 06:33:58 +00:00
|
|
|
|
2006-03-12 21:25:29 +00:00
|
|
|
comment = NULL;
|
2006-02-08 23:02:43 +00:00
|
|
|
pllcurrent=NULL;
|
|
|
|
|
2006-02-05 00:22:46 +00:00
|
|
|
/* got what will be the root of the config tree, now start walking through
|
|
|
|
* the input file, populating the tree
|
|
|
|
*/
|
2006-03-12 21:25:29 +00:00
|
|
|
while(fgets(linebuffer,CONF_LINEBUFFER,fin)) {
|
2006-02-08 23:02:43 +00:00
|
|
|
line++;
|
2006-03-12 21:25:29 +00:00
|
|
|
linebuffer[CONF_LINEBUFFER] = '\0';
|
2006-03-13 06:33:58 +00:00
|
|
|
ws=0;
|
2006-02-05 00:22:46 +00:00
|
|
|
|
|
|
|
comment=strchr(linebuffer,'#');
|
|
|
|
if(comment) {
|
|
|
|
*comment = '\0';
|
2006-03-12 21:25:29 +00:00
|
|
|
comment++;
|
2006-02-05 00:22:46 +00:00
|
|
|
}
|
|
|
|
|
2006-03-13 06:33:58 +00:00
|
|
|
while(strlen(linebuffer) &&
|
|
|
|
(strchr("\n\r ",linebuffer[strlen(linebuffer)-1])))
|
2006-02-05 00:22:46 +00:00
|
|
|
linebuffer[strlen(linebuffer)-1] = '\0';
|
|
|
|
|
|
|
|
if(linebuffer[0] == '[') {
|
|
|
|
/* section header */
|
|
|
|
compat_mode=0;
|
|
|
|
term=&linebuffer[1];
|
|
|
|
value = strchr(term,']');
|
|
|
|
if(!value) {
|
|
|
|
ll_destroy(pllnew);
|
|
|
|
fclose(fin);
|
2006-02-08 23:02:43 +00:00
|
|
|
return CONF_E_BADHEADER;
|
2006-02-05 00:22:46 +00:00
|
|
|
}
|
|
|
|
*value = '\0';
|
|
|
|
|
|
|
|
if((err = ll_create(&plltemp)) != LL_E_SUCCESS) {
|
|
|
|
ll_destroy(pllnew);
|
|
|
|
fclose(fin);
|
2006-02-08 23:02:43 +00:00
|
|
|
return CONF_E_UNKNOWN;
|
2006-02-05 00:22:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ll_add_ll(pllnew,term,plltemp);
|
2006-03-13 06:33:58 +00:00
|
|
|
|
|
|
|
/* set current section and name */
|
2006-02-08 23:02:43 +00:00
|
|
|
pllcurrent = plltemp;
|
2006-03-13 06:33:58 +00:00
|
|
|
if(section_name)
|
|
|
|
free(section_name);
|
|
|
|
section_name = strdup(term);
|
|
|
|
|
|
|
|
/* set precomments */
|
|
|
|
if(prev_comments[0] != '\0') {
|
|
|
|
/* we had some preceding comments */
|
|
|
|
snprintf(keybuffer,sizeof(keybuffer),"pre_%s",section_name);
|
|
|
|
ll_add_string(pllcomment,keybuffer,prev_comments);
|
|
|
|
prev_comments[0] = '\0';
|
|
|
|
}
|
|
|
|
if(comment) {
|
|
|
|
/* we had some preceding comments */
|
|
|
|
snprintf(keybuffer,sizeof(keybuffer),"in_%s",section_name);
|
|
|
|
ll_add_string(pllcomment,keybuffer,comment);
|
|
|
|
prev_comments[0] = '\0';
|
|
|
|
comment = NULL;
|
|
|
|
}
|
2006-02-05 00:22:46 +00:00
|
|
|
} else {
|
|
|
|
/* k/v pair */
|
|
|
|
term=&linebuffer[0];
|
|
|
|
|
|
|
|
while((*term=='\t') || (*term==' '))
|
|
|
|
term++;
|
|
|
|
|
|
|
|
value=term;
|
|
|
|
|
|
|
|
if(compat_mode) {
|
|
|
|
delim="\t ";
|
|
|
|
} else {
|
|
|
|
delim="=";
|
|
|
|
}
|
|
|
|
|
|
|
|
strsep(&value,delim);
|
|
|
|
if((value) && (term) && (strlen(term))) {
|
2006-03-13 06:33:58 +00:00
|
|
|
while((strlen(term) && (strchr("\t ",term[strlen(term)-1]))))
|
|
|
|
term[strlen(term)-1] = '\0';
|
2006-02-05 00:22:46 +00:00
|
|
|
while(strlen(value) && (strchr("\t ",*value)))
|
|
|
|
value++;
|
2006-03-13 06:33:58 +00:00
|
|
|
while((strlen(value) && (strchr("\t ",value[strlen(value)-1]))))
|
|
|
|
value[strlen(value)-1] = '\0';
|
2006-02-05 00:22:46 +00:00
|
|
|
|
2006-02-08 23:02:43 +00:00
|
|
|
if(!pllcurrent) {
|
2006-03-13 06:33:58 +00:00
|
|
|
/* in compat mode -- add a general section */
|
2006-02-08 23:02:43 +00:00
|
|
|
if((err=ll_create(&plltemp)) != LL_E_SUCCESS) {
|
2006-03-13 06:33:58 +00:00
|
|
|
DPRINTF(E_LOG,L_CONF,"Error creating list: %d\n",err);
|
2006-02-08 23:02:43 +00:00
|
|
|
ll_destroy(pllnew);
|
|
|
|
fclose(fin);
|
|
|
|
return CONF_E_UNKNOWN;
|
|
|
|
}
|
|
|
|
ll_add_ll(pllnew,"general",plltemp);
|
|
|
|
pllcurrent = plltemp;
|
2006-03-13 06:33:58 +00:00
|
|
|
|
|
|
|
if(section_name)
|
|
|
|
free(section_name); /* shouldn't ahppen */
|
|
|
|
section_name = strdup("general");
|
|
|
|
|
|
|
|
/* no inline comments, just precomments */
|
|
|
|
if(prev_comments[0] != '\0') {
|
|
|
|
/* we had some preceding comments */
|
|
|
|
ll_add_string(pllcomment,"pre_general",prev_comments);
|
|
|
|
prev_comments[0] = '\0';
|
|
|
|
}
|
|
|
|
|
2006-02-08 23:02:43 +00:00
|
|
|
}
|
|
|
|
ll_add_string(pllcurrent,term,value);
|
2006-03-13 06:33:58 +00:00
|
|
|
|
|
|
|
if(comment) {
|
|
|
|
/* this is an inline comment */
|
|
|
|
snprintf(keybuffer,sizeof(keybuffer),"in_%s_%s",
|
|
|
|
section_name,term);
|
|
|
|
DPRINTF(E_SPAM,L_CONF,"Adding %s: %s\n",keybuffer,comment);
|
|
|
|
ll_add_string(pllcomment,keybuffer,comment);
|
|
|
|
comment = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(prev_comments[0] != '\0') {
|
|
|
|
/* we had some preceding comments */
|
|
|
|
snprintf(keybuffer,sizeof(keybuffer),"pre_%s_%s",
|
|
|
|
section_name, term);
|
|
|
|
DPRINTF(E_SPAM,L_CONF,"Adding %s: %s\n",keybuffer,
|
|
|
|
prev_comments);
|
|
|
|
ll_add_string(pllcomment,keybuffer,prev_comments);
|
|
|
|
prev_comments[0] = '\0';
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ws=1;
|
2006-02-08 23:02:43 +00:00
|
|
|
}
|
2006-03-13 06:33:58 +00:00
|
|
|
|
2006-02-08 23:02:43 +00:00
|
|
|
if(((term) && (strlen(term))) && (!value)) {
|
|
|
|
DPRINTF(E_LOG,L_CONF,"Error in config file on line %d\n",line);
|
|
|
|
ll_destroy(pllnew);
|
|
|
|
return CONF_E_PARSE;
|
2006-02-05 00:22:46 +00:00
|
|
|
}
|
|
|
|
}
|
2006-03-13 06:33:58 +00:00
|
|
|
|
|
|
|
if((comment)||(ws)) {
|
|
|
|
if(!comment)
|
|
|
|
comment = "";
|
|
|
|
|
|
|
|
DPRINTF(E_SPAM,L_CONF,"found comment: %s\n",comment);
|
|
|
|
|
|
|
|
/* add to prev comments */
|
|
|
|
if((int)strlen(comment) + 2 >=
|
|
|
|
(prev_comment_length - (int)strlen(prev_comments))) {
|
|
|
|
/* need to expand the buffer */
|
|
|
|
if(prev_comment_length < 32768) {
|
|
|
|
prev_comment_length *= 2;
|
|
|
|
DPRINTF(E_SPAM,L_CONF,"Expanding precomments to %d\n",
|
|
|
|
prev_comment_length);
|
|
|
|
prev_comments=realloc(prev_comments,prev_comment_length);
|
|
|
|
if(!prev_comments)
|
|
|
|
DPRINTF(E_FATAL,L_CONF,"Malloc error\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(strlen(comment)) {
|
|
|
|
strcat(prev_comments,"#");
|
|
|
|
strcat(prev_comments,comment);
|
|
|
|
} else {
|
|
|
|
strcat(prev_comments,"\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
DPRINTF(E_SPAM,L_CONF,"Current comment block: \n%s\n",prev_comments);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(section_name)
|
|
|
|
free(section_name);
|
|
|
|
|
|
|
|
if(prev_comments) {
|
|
|
|
if(prev_comments[0] != '\0') {
|
|
|
|
ll_add_string(pllcomment,"end",prev_comments);
|
|
|
|
}
|
|
|
|
free(prev_comments);
|
2006-02-05 00:22:46 +00:00
|
|
|
}
|
2006-01-24 23:41:05 +00:00
|
|
|
|
2006-01-25 22:31:53 +00:00
|
|
|
fclose(fin);
|
2006-02-05 00:22:46 +00:00
|
|
|
|
|
|
|
/* Sanity check */
|
2006-02-21 03:08:14 +00:00
|
|
|
if(_conf_verify(pllnew)) {
|
|
|
|
DPRINTF(E_INF,L_CONF,"Loading new config file.\n");
|
|
|
|
_conf_lock();
|
|
|
|
if(conf_main) {
|
|
|
|
ll_destroy(conf_main);
|
|
|
|
}
|
2006-03-13 06:33:58 +00:00
|
|
|
|
|
|
|
if(conf_comments) {
|
|
|
|
ll_destroy(conf_comments);
|
|
|
|
}
|
|
|
|
|
2006-02-21 03:08:14 +00:00
|
|
|
conf_main = pllnew;
|
2006-03-13 06:33:58 +00:00
|
|
|
conf_comments = pllcomment;
|
2006-02-21 03:08:14 +00:00
|
|
|
_conf_unlock();
|
|
|
|
} else {
|
|
|
|
ll_destroy(pllnew);
|
2006-03-13 06:33:58 +00:00
|
|
|
ll_destroy(pllcomment);
|
2006-02-21 03:08:14 +00:00
|
|
|
DPRINTF(E_LOG,L_CONF,"Could not validate config file. Ignoring\n");
|
|
|
|
}
|
2006-02-05 00:22:46 +00:00
|
|
|
|
2006-02-08 23:02:43 +00:00
|
|
|
return CONF_E_SUCCESS;
|
2006-01-24 23:41:05 +00:00
|
|
|
}
|
|
|
|
|
2006-02-20 03:56:47 +00:00
|
|
|
/**
|
|
|
|
* do final config file shutdown
|
|
|
|
*/
|
2006-02-21 03:08:14 +00:00
|
|
|
int conf_close(void) {
|
2006-02-21 23:19:53 +00:00
|
|
|
if(conf_main) {
|
2006-02-21 03:08:14 +00:00
|
|
|
ll_destroy(conf_main);
|
2006-02-21 23:19:53 +00:00
|
|
|
conf_main = NULL;
|
|
|
|
}
|
|
|
|
|
2006-03-13 06:33:58 +00:00
|
|
|
if(conf_comments) {
|
|
|
|
ll_destroy(conf_comments);
|
|
|
|
conf_comments = NULL;
|
|
|
|
}
|
|
|
|
|
2006-02-21 23:19:53 +00:00
|
|
|
if(conf_main_file) {
|
|
|
|
free(conf_main_file);
|
|
|
|
conf_main_file = NULL;
|
|
|
|
}
|
2006-01-24 23:41:05 +00:00
|
|
|
|
2006-02-08 23:02:43 +00:00
|
|
|
return CONF_E_SUCCESS;
|
2006-01-24 23:41:05 +00:00
|
|
|
}
|
|
|
|
|
2006-02-20 03:56:47 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* read a value from the CURRENT config tree as an integer
|
|
|
|
*
|
|
|
|
* @param section section name to search in
|
|
|
|
* @param key key to search for
|
2006-02-21 03:08:14 +00:00
|
|
|
* @param dflt default value to return if key not found
|
|
|
|
* @returns value as integer if found, dflt value otherwise
|
2006-02-20 03:56:47 +00:00
|
|
|
*/
|
2006-02-21 03:08:14 +00:00
|
|
|
int conf_get_int(char *section, char *key, int dflt) {
|
2006-02-20 03:56:47 +00:00
|
|
|
LL_ITEM *pitem;
|
2006-02-21 03:08:14 +00:00
|
|
|
int retval;
|
|
|
|
|
|
|
|
_conf_lock();
|
|
|
|
pitem = _conf_fetch_item(conf_main,section,key);
|
|
|
|
if((!pitem) || (pitem->type != LL_TYPE_STRING)) {
|
|
|
|
retval = dflt;
|
|
|
|
} else {
|
|
|
|
retval = atoi(pitem->value.as_string);
|
|
|
|
}
|
|
|
|
_conf_unlock();
|
2006-02-21 23:19:53 +00:00
|
|
|
|
2006-02-21 03:08:14 +00:00
|
|
|
return retval;
|
|
|
|
}
|
2006-02-20 03:56:47 +00:00
|
|
|
|
2006-02-21 03:08:14 +00:00
|
|
|
/**
|
|
|
|
* read a value from the CURRENT config tree as a string
|
|
|
|
*
|
|
|
|
* @param section section name to search in
|
|
|
|
* @param key key to search for
|
|
|
|
* @param dflt default value to return if key not found
|
|
|
|
* @param out buffer to put resulting string in
|
|
|
|
* @param size pointer to size of buffer
|
|
|
|
* @returns CONF_E_SUCCESS with out filled on success,
|
|
|
|
* or CONF_E_OVERFLOW, with size set to required buffer size
|
|
|
|
*/
|
|
|
|
int conf_get_string(char *section, char *key, char *dflt, char *out, int *size) {
|
|
|
|
LL_ITEM *pitem;
|
|
|
|
char *result;
|
|
|
|
int len;
|
2006-02-21 23:19:53 +00:00
|
|
|
|
2006-02-21 03:08:14 +00:00
|
|
|
_conf_lock();
|
|
|
|
pitem = _conf_fetch_item(conf_main,section,key);
|
|
|
|
if((!pitem) || (pitem->type != LL_TYPE_STRING)) {
|
|
|
|
result = dflt;
|
|
|
|
} else {
|
|
|
|
result = pitem->value.as_string;
|
|
|
|
}
|
2006-02-21 23:19:53 +00:00
|
|
|
|
2006-02-27 23:39:11 +00:00
|
|
|
if(!result) {
|
|
|
|
_conf_unlock();
|
|
|
|
return CONF_E_NOTFOUND;
|
|
|
|
}
|
|
|
|
|
2006-02-27 22:55:05 +00:00
|
|
|
len = (int) strlen(result) + 1;
|
2006-02-21 23:19:53 +00:00
|
|
|
|
2006-02-21 03:08:14 +00:00
|
|
|
if(len <= *size) {
|
|
|
|
*size = len;
|
|
|
|
strcpy(out,result);
|
|
|
|
} else {
|
|
|
|
_conf_unlock();
|
|
|
|
*size = len;
|
|
|
|
return CONF_E_OVERFLOW;
|
|
|
|
}
|
2006-02-21 23:19:53 +00:00
|
|
|
|
|
|
|
_conf_unlock();
|
|
|
|
return CONF_E_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* set (update) the config tree with a particular value.
|
|
|
|
* this accepts an int, but it actually adds it as a string.
|
|
|
|
* in that sense, it's really just a wrapper for conf_set_string
|
|
|
|
*
|
|
|
|
* @param section section that the key is in
|
|
|
|
* @param key key to update
|
|
|
|
* @param value value to set it to
|
|
|
|
* @returns E_CONF_SUCCESS on success, error code otherwise
|
|
|
|
*/
|
|
|
|
int conf_set_int(char *section, char *key, int value) {
|
|
|
|
char buffer[40]; /* ?? */
|
|
|
|
snprintf(buffer,sizeof(buffer),"%d",value);
|
|
|
|
|
|
|
|
return conf_set_string(section, key, buffer);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* set (update) the config tree with a particular string value
|
|
|
|
*
|
|
|
|
* @param section section that the key is in
|
|
|
|
* @param key key to update
|
|
|
|
* @param value value to set it to
|
|
|
|
* @returns E_CONF_SUCCESS on success, error code otherwise
|
|
|
|
*/
|
|
|
|
int conf_set_string(char *section, char *key, char *value) {
|
|
|
|
LL_ITEM *pitem;
|
|
|
|
LL_ITEM *psection;
|
|
|
|
LL *section_ll;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
_conf_lock();
|
|
|
|
pitem = _conf_fetch_item(conf_main,section,key);
|
|
|
|
if(!pitem) {
|
|
|
|
/* fetch the section and add it to that list */
|
|
|
|
if(!(psection = ll_fetch_item(conf_main,section))) {
|
|
|
|
/* that subkey doesn't exist yet... */
|
|
|
|
if((err = ll_create(§ion_ll)) != LL_E_SUCCESS) {
|
|
|
|
DPRINTF(E_LOG,L_CONF,"Could not create linked list: %d\n",err);
|
|
|
|
_conf_unlock();
|
|
|
|
return CONF_E_UNKNOWN;
|
|
|
|
}
|
|
|
|
if((err=ll_add_ll(conf_main,section,section_ll)) != LL_E_SUCCESS) {
|
|
|
|
DPRINTF(E_LOG,L_CONF,"Error inserting new subkey: %d\n",err);
|
|
|
|
_conf_unlock();
|
|
|
|
return CONF_E_UNKNOWN;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
section_ll = psection->value.as_ll;
|
|
|
|
}
|
|
|
|
/* have the section, now add it */
|
|
|
|
if((err = ll_add_string(section_ll,key,value)) != LL_E_SUCCESS) {
|
|
|
|
DPRINTF(E_LOG,L_CONF,"Error in conf_set_string: "
|
|
|
|
"(%s/%s)\n",section,key);
|
|
|
|
_conf_unlock();
|
|
|
|
return CONF_E_UNKNOWN;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* we have the item, let's update it */
|
|
|
|
ll_update_string(pitem,value);
|
|
|
|
}
|
|
|
|
|
2006-02-21 03:08:14 +00:00
|
|
|
_conf_unlock();
|
2006-02-21 23:19:53 +00:00
|
|
|
return CONF_E_SUCCESS;
|
2006-02-20 03:56:47 +00:00
|
|
|
}
|
2006-02-21 23:19:53 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* determine if the configuration file is writable
|
|
|
|
*
|
|
|
|
* @returns TRUE if writable, FALSE otherwise
|
|
|
|
*/
|
|
|
|
int conf_iswritable(void) {
|
|
|
|
FILE *fp;
|
|
|
|
int retval = FALSE;
|
|
|
|
|
|
|
|
/* don't want configfile reopened under us */
|
|
|
|
_conf_lock();
|
|
|
|
|
|
|
|
if(!conf_main_file)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if((fp = fopen(conf_main_file,"r+")) != NULL) {
|
|
|
|
fclose(fp);
|
|
|
|
retval = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
_conf_unlock();
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* write the current config tree back to the config file
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
int conf_write(void) {
|
|
|
|
int retval = FALSE;
|
|
|
|
FILE *fp;
|
|
|
|
|
|
|
|
if(!conf_main_file) {
|
|
|
|
return CONF_E_NOCONF;
|
|
|
|
}
|
|
|
|
|
|
|
|
_conf_lock();
|
|
|
|
if((fp = fopen(conf_main_file,"w+")) != NULL) {
|
2006-03-13 06:33:58 +00:00
|
|
|
retval = _conf_write(fp,conf_main,0,NULL);
|
2006-02-21 23:19:53 +00:00
|
|
|
fclose(fp);
|
|
|
|
}
|
|
|
|
_conf_unlock();
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* do the actual work of writing the config file
|
|
|
|
*
|
|
|
|
* @param fp file we are writing the config file to
|
|
|
|
* @param pll list we are dumping k/v pairs for
|
|
|
|
* @param sublevel whether this is the root, or a subkey
|
|
|
|
* @returns TRUE on success, FALSE otherwise
|
|
|
|
*/
|
2006-03-13 06:33:58 +00:00
|
|
|
int _conf_write(FILE *fp, LL *pll, int sublevel, char *parent) {
|
2006-02-21 23:19:53 +00:00
|
|
|
LL_ITEM *pli;
|
2006-03-13 06:33:58 +00:00
|
|
|
LL_ITEM *ppre, *pin;
|
|
|
|
char keybuffer[256];
|
2006-02-21 23:19:53 +00:00
|
|
|
|
|
|
|
if(!pll)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* write all the solo keys, first! */
|
|
|
|
pli = pll->itemlist.next;
|
|
|
|
while(pli) {
|
2006-03-13 06:33:58 +00:00
|
|
|
/* if there is a PRE there, then let's emit that*/
|
|
|
|
if(sublevel) {
|
|
|
|
snprintf(keybuffer,sizeof(keybuffer),"pre_%s_%s",parent,pli->key);
|
|
|
|
ppre=ll_fetch_item(conf_comments,keybuffer);
|
|
|
|
snprintf(keybuffer,sizeof(keybuffer),"in_%s_%s",parent,pli->key);
|
|
|
|
pin = ll_fetch_item(conf_comments,keybuffer);
|
|
|
|
} else {
|
|
|
|
snprintf(keybuffer,sizeof(keybuffer),"pre_%s",pli->key);
|
|
|
|
ppre=ll_fetch_item(conf_comments,keybuffer);
|
|
|
|
snprintf(keybuffer,sizeof(keybuffer),"in_%s",pli->key);
|
|
|
|
pin = ll_fetch_item(conf_comments,keybuffer);
|
|
|
|
}
|
|
|
|
|
|
|
|
if(ppre) {
|
|
|
|
fprintf(fp,"%s",ppre->value.as_string);
|
|
|
|
}
|
|
|
|
|
2006-02-21 23:19:53 +00:00
|
|
|
switch(pli->type) {
|
|
|
|
case LL_TYPE_LL:
|
|
|
|
if(sublevel) {
|
|
|
|
/* something wrong! */
|
|
|
|
DPRINTF(E_LOG,L_CONF,"LL in sublevel: %s\n",pli->key);
|
|
|
|
} else {
|
2006-03-13 06:33:58 +00:00
|
|
|
fprintf(fp,"[%s]",pli->key);
|
|
|
|
if(pin) {
|
|
|
|
fprintf(fp," #%s",pin->value.as_string);
|
|
|
|
}
|
|
|
|
fprintf(fp,"\n");
|
|
|
|
|
|
|
|
if(!_conf_write(fp, pli->value.as_ll, 1, pli->key))
|
2006-02-21 23:19:53 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
break;
|
2006-03-13 06:33:58 +00:00
|
|
|
|
2006-02-21 23:19:53 +00:00
|
|
|
case LL_TYPE_INT:
|
2006-03-13 06:33:58 +00:00
|
|
|
fprintf(fp,"%s = %d",pli->key,pli->value.as_int);
|
|
|
|
if(pin) {
|
|
|
|
fprintf(fp," #%s",pin->value.as_string);
|
|
|
|
}
|
|
|
|
fprintf(fp,"\n");
|
2006-02-21 23:19:53 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case LL_TYPE_STRING:
|
2006-03-13 06:33:58 +00:00
|
|
|
fprintf(fp,"%s = %s",pli->key,pli->value.as_string);
|
|
|
|
if(pin) {
|
|
|
|
fprintf(fp," #%s",pin->value.as_string);
|
|
|
|
}
|
|
|
|
fprintf(fp,"\n");
|
2006-02-21 23:19:53 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
pli = pli->next;
|
|
|
|
}
|
|
|
|
|
2006-03-13 06:33:58 +00:00
|
|
|
if(!sublevel) {
|
|
|
|
pin = ll_fetch_item(conf_comments,"end");
|
|
|
|
if(pin) {
|
|
|
|
fprintf(fp,"%s",pin->value.as_string);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-21 23:19:53 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-02-27 22:48:42 +00:00
|
|
|
/**
|
|
|
|
* determine if a configuration entry is actually set
|
|
|
|
*
|
|
|
|
* @param section section to test
|
|
|
|
* @key key to check
|
|
|
|
* @return TRUE if set, FALSE otherwise
|
|
|
|
*/
|
|
|
|
int conf_isset(char *section, char *key) {
|
|
|
|
int retval = FALSE;
|
2006-03-13 06:33:58 +00:00
|
|
|
|
2006-02-27 22:48:42 +00:00
|
|
|
_conf_lock();
|
|
|
|
if(_conf_fetch_item(conf_main,section,key)) {
|
|
|
|
retval = TRUE;
|
|
|
|
}
|
|
|
|
_conf_unlock();
|
2006-03-13 06:33:58 +00:00
|
|
|
|
2006-02-27 22:48:42 +00:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2006-02-21 23:19:53 +00:00
|
|
|
|