MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-07-16 12:21:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Drop version number on startup

Browse Source
This commit is contained in:
Ron Pedde 2006-11-11 21:47:43 +00:00
parent 792fa16f1e
commit d90fd30a9b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.c
View File

@ -130,7 +130,7 @@ void txt_add(char *txtrecord, char *fmt, ...) {
va_start(ap, fmt); va_start(ap, fmt);
vsnprintf(buff, sizeof(buff), fmt, ap); vsnprintf(buff, sizeof(buff), fmt, ap);
va_end(ap); va_end(ap);
len = (int)strlen(buff); len = (int)strlen(buff);
if(len + strlen(txtrecord) > 255) { if(len + strlen(txtrecord) > 255) {
DPRINTF(E_FATAL,L_MAIN,"dns-sd text string too long. Try a shorter " DPRINTF(E_FATAL,L_MAIN,"dns-sd text string too long. Try a shorter "
@ -345,7 +345,7 @@ int main(int argc, char *argv[]) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if(debuglevel) /* was specified, should override the config file */ if(debuglevel) /* was specified, should override the config file */
err_setlevel(debuglevel); err_setlevel(debuglevel);
@ -358,9 +358,10 @@ int main(int argc, char *argv[]) {
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
DPRINTF(E_LOG,L_MAIN,"Starting with debuglevel %d\n",err_getlevel()); DPRINTF(E_LOG,L_MAIN,"Firefly Version %s: Starting with debuglevel %d\n",
VERSION,err_getlevel());
/* load plugins before we drop privs? Maybe... let the /* load plugins before we drop privs? Maybe... let the
* plugins do stuff they might need to */ * plugins do stuff they might need to */
plugin_init(); plugin_init();
if((plugindir=conf_alloc_string("plugins","plugin_dir",NULL)) != NULL) { if((plugindir=conf_alloc_string("plugins","plugin_dir",NULL)) != NULL) {
@ -484,7 +485,7 @@ int main(int argc, char *argv[]) {
txt_add(txtrecord,"Version=196610"); /* iTunes 6.0.4 */ txt_add(txtrecord,"Version=196610"); /* iTunes 6.0.4 */
tmp = conf_alloc_string("general","password",NULL); tmp = conf_alloc_string("general","password",NULL);
if(tmp && (strlen(tmp)==0)) tmp=NULL; if(tmp && (strlen(tmp)==0)) tmp=NULL;
txt_add(txtrecord,"Password=%s",tmp ? "true" : "false"); txt_add(txtrecord,"Password=%s",tmp ? "true" : "false");
if(tmp) free(tmp); if(tmp) free(tmp);
@ -495,14 +496,14 @@ int main(int argc, char *argv[]) {
} else { } else {
txt_add(txtrecord,"ffid=%08x",rand()); txt_add(txtrecord,"ffid=%08x",rand());
} }
DPRINTF(E_LOG,L_MAIN|L_REND,"Registering rendezvous names\n"); DPRINTF(E_LOG,L_MAIN|L_REND,"Registering rendezvous names\n");
iface = conf_alloc_string("general","interface",""); iface = conf_alloc_string("general","interface","");
rend_register(servername,"_http._tcp",ws_config.port,iface,txtrecord); rend_register(servername,"_http._tcp",ws_config.port,iface,txtrecord);
plugin_rend_register(servername,ws_config.port,iface,txtrecord); plugin_rend_register(servername,ws_config.port,iface,txtrecord);
free(servername); free(servername);
free(iface); free(iface);
} }
@ -539,7 +540,7 @@ int main(int argc, char *argv[]) {
start_time=(int) time(NULL); start_time=(int) time(NULL);
DPRINTF(E_LOG,L_MAIN|L_DB|L_SCAN,"Rescanning database\n"); DPRINTF(E_LOG,L_MAIN|L_DB|L_SCAN,"Rescanning database\n");
if(conf_get_array("general","mp3_dir",&mp3_dir_array)) { if(conf_get_array("general","mp3_dir",&mp3_dir_array)) {
if(config.full_reload) { if(config.full_reload) {
config.full_reload=0; config.full_reload=0;