MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-20 18:54:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

working toward comment preservation

Browse Source
This commit is contained in:
Ron Pedde 2006-03-12 21:25:29 +00:00
parent 0cbc4a22d6
commit d5bfeba7da
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/conf.c
View File

@ -51,7 +51,7 @@ static LL_HANDLE conf_main=NULL;
static char *conf_main_file = NULL; static char *conf_main_file = NULL;
static pthread_mutex_t conf_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t conf_mutex = PTHREAD_MUTEX_INITIALIZER;
#define conf_LINEBUFFER 128 #define CONF_LINEBUFFER 128
#define CONF_T_INT 0 #define CONF_T_INT 0
#define CONF_T_STRING 1 #define CONF_T_STRING 1
@ -229,12 +229,14 @@ int _conf_verify(LL_HANDLE pll) {
int conf_read(char *file) { int conf_read(char *file) {
FILE *fin; FILE *fin;
int err; int err;
LL_HANDLE pllnew, plltemp, pllcurrent; LL_HANDLE pllnew, plltemp, pllcurrent, pllcomment;
char linebuffer[conf_LINEBUFFER+1]; char linebuffer[CONF_LINEBUFFER+1];
char *comment, *term, *value, *delim; char *comment, *term, *value, *delim;
char *running_comment=NULL;
int compat_mode=1; int compat_mode=1;
int line=0; int line=0;
if(conf_main_file) { if(conf_main_file) {
conf_close(); conf_close();
} }
@ -252,19 +254,21 @@ int conf_read(char *file) {
return CONF_E_UNKNOWN; return CONF_E_UNKNOWN;
} }
ll_create(&pllcomment); /* don't care if we lose comments */
comment = NULL;
pllcurrent=NULL; pllcurrent=NULL;
/* got what will be the root of the config tree, now start walking through /* got what will be the root of the config tree, now start walking through
* the input file, populating the tree * the input file, populating the tree
*/ */
while(fgets(linebuffer,conf_LINEBUFFER,fin)) { while(fgets(linebuffer,CONF_LINEBUFFER,fin)) {
line++; line++;
linebuffer[conf_LINEBUFFER] = '\0'; linebuffer[CONF_LINEBUFFER] = '\0';
comment=strchr(linebuffer,'#'); comment=strchr(linebuffer,'#');
if(comment) { if(comment) {
/* we should really preserve these in another tree*/
*comment = '\0'; *comment = '\0';
comment++;
} }
while(strlen(linebuffer) && (strchr("\n\r ",linebuffer[strlen(linebuffer)-1]))) while(strlen(linebuffer) && (strchr("\n\r ",linebuffer[strlen(linebuffer)-1])))

5
src/tabs.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
XX=' '
echo "Searching for ${XX}."
egrep "${XX}" *.[ch]