MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove config file conversion code

This commit is contained in:
Julien BLACHE 2009-04-18 17:22:12 +02:00
parent 8e4b2db99e
commit 362db5003b
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.c
View File

@ -535,7 +535,6 @@ int main(int argc, char *argv[]) {
int force_non_root=0; int force_non_root=0;
int skip_initial=1; int skip_initial=1;
int kill_server=0; int kill_server=0;
int convert_conf=0;
char *db_type,*db_parms,*web_root,*runas, *tmp; char *db_type,*db_parms,*web_root,*runas, *tmp;
char **mp3_dir_array; char **mp3_dir_array;
char *servername; char *servername;
@ -560,7 +559,7 @@ int main(int argc, char *argv[]) {
err_setlevel(2); err_setlevel(2);
config.foreground=0; config.foreground=0;
while((option=getopt(argc,argv,"D:d:c:P:frysiuvb:Vk")) != -1) { while((option=getopt(argc,argv,"D:d:c:P:frysiub:Vk")) != -1) {
switch(option) { switch(option) {
case 'b': case 'b':
ffid=optarg; ffid=optarg;
@ -603,10 +602,6 @@ int main(int argc, char *argv[]) {
force_non_root=1; force_non_root=1;
break; break;
case 'v':
convert_conf=1;
break;
case 'k': case 'k':
kill_server=1; kill_server=1;
break; break;
@ -623,7 +618,7 @@ int main(int argc, char *argv[]) {
} }
} }
if((getuid()) && (!force_non_root) && (!convert_conf)) { if((getuid()) && (!force_non_root)) {
fprintf(stderr,"You are not root. This is almost certainly wrong. " fprintf(stderr,"You are not root. This is almost certainly wrong. "
"If you are\nsure you want to do this, use the -y " "If you are\nsure you want to do this, use the -y "
"command-line switch\n"); "command-line switch\n");
@ -657,15 +652,6 @@ int main(int argc, char *argv[]) {
if(debuglevel) /* was specified, should override the config file */ if(debuglevel) /* was specified, should override the config file */
err_setlevel(debuglevel); err_setlevel(debuglevel);
if(convert_conf) {
fprintf(stderr,"Converting config file...\n");
if(CONF_E_SUCCESS != conf_write()) {
fprintf(stderr,"Error writing config file.\n");
exit(EXIT_FAILURE);
}
exit(EXIT_SUCCESS);
}
DPRINTF(E_LOG,L_MAIN,"Firefly Version %s: Starting with debuglevel %d\n", DPRINTF(E_LOG,L_MAIN,"Firefly Version %s: Starting with debuglevel %d\n",
VERSION,err_getlevel()); VERSION,err_getlevel());