~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include configure and compiler details in version output
[disorder]
/
server
/
disorderd.c
diff --git
a/server/disorderd.c
b/server/disorderd.c
index
4a3915a
..
ba18c23
100644
(file)
--- a/
server/disorderd.c
+++ b/
server/disorderd.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2004, 2005, 2006 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2006
, 2007
Richard Kettlewell
*
* 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
*
* 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
@@
-19,6
+19,7
@@
*/
#include <config.h>
*/
#include <config.h>
+#include "types.h"
#include <stdio.h>
#include <getopt.h>
#include <stdio.h>
#include <getopt.h>
@@
-54,6
+55,7
@@
#include "mixer.h"
#include "eventlog.h"
#include "printf.h"
#include "mixer.h"
#include "eventlog.h"
#include "printf.h"
+#include "setup.h"
static ev_source *ev;
static ev_source *ev;
@@
-69,7
+71,7
@@
static const struct option options[] = {
{ "foreground", no_argument, 0, 'f' },
{ "log", required_argument, 0, 'l' },
{ "pidfile", required_argument, 0, 'P' },
{ "foreground", no_argument, 0, 'f' },
{ "log", required_argument, 0, 'l' },
{ "pidfile", required_argument, 0, 'P' },
- { "
no-initial-rescan", no_argument, 0, 'N
' },
+ { "
wide-open", no_argument, 0, 'w
' },
{ "syslog", no_argument, 0, 's' },
{ 0, 0, 0, 0 }
};
{ "syslog", no_argument, 0, 's' },
{ 0, 0, 0, 0 }
};
@@
-92,7
+94,7
@@
static void help(void) {
/* display version number and terminate */
static void version(void) {
/* display version number and terminate */
static void version(void) {
- xprintf("
disorderd version %s\n
", disorder_version_string);
+ xprintf("
%s
", disorder_version_string);
xfclose(stdout);
exit(0);
}
xfclose(stdout);
exit(0);
}
@@
-184,12
+186,13
@@
static void volumecheck_after(long offset) {
/* We fix the path to include the bindir and sbindir we were installed into */
static void fix_path(void) {
char *path = getenv("PATH");
/* We fix the path to include the bindir and sbindir we were installed into */
static void fix_path(void) {
char *path = getenv("PATH");
- char *newpath;
+ static char *newpath;
+ /* static or libgc collects it! */
if(!path)
error(0, "PATH is not set at all!");
if(!path)
error(0, "PATH is not set at all!");
- if(*finkbindir)
+ if(*finkbindir
&& strcmp(finkbindir, "/")
)
/* We appear to be a finkized mac; include fink on the path in case the
* tools we need are there. */
byte_xasprintf(&newpath, "PATH=%s:%s:%s:%s",
/* We appear to be a finkized mac; include fink on the path in case the
* tools we need are there. */
byte_xasprintf(&newpath, "PATH=%s:%s:%s:%s",
@@
-203,7
+206,6
@@
static void fix_path(void) {
int main(int argc, char **argv) {
int n, background = 1, logsyslog = 0;
const char *pidfile = 0;
int main(int argc, char **argv) {
int n, background = 1, logsyslog = 0;
const char *pidfile = 0;
- int initial_rescan = 1;
set_progname(argv);
mem_init();
set_progname(argv);
mem_init();
@@
-219,8
+221,8
@@
int main(int argc, char **argv) {
case 'd': debugging = 1; break;
case 'f': background = 0; break;
case 'P': pidfile = optarg; break;
case 'd': debugging = 1; break;
case 'f': background = 0; break;
case 'P': pidfile = optarg; break;
- case 'N': initial_rescan = 0; break;
case 's': logsyslog = 1; break;
case 's': logsyslog = 1; break;
+ case 'w': wideopen = 1; break;
default: fatal(0, "invalid option");
}
}
default: fatal(0, "invalid option");
}
}
@@
-240,8
+242,12
@@
int main(int argc, char **argv) {
ev = ev_new();
if(ev_child_setup(ev)) fatal(0, "ev_child_setup failed");
/* read config */
ev = ev_new();
if(ev_child_setup(ev)) fatal(0, "ev_child_setup failed");
/* read config */
- if(config_read())
+ if(config_read(
1
))
fatal(0, "cannot read configuration");
fatal(0, "cannot read configuration");
+ /* make sure the home directory exists and has suitable permissions */
+ make_home();
+ /* create the default login */
+ make_root_login();
/* Start the speaker process (as root! - so it can choose its nice value) */
speaker_setup(ev);
/* set server nice value _after_ starting the speaker, so that they
/* Start the speaker process (as root! - so it can choose its nice value) */
speaker_setup(ev);
/* set server nice value _after_ starting the speaker, so that they
@@
-255,8
+261,8
@@
int main(int argc, char **argv) {
if(config->lock) {
const char *lockfile;
int lockfd;
if(config->lock) {
const char *lockfile;
int lockfd;
- struct flock lock;
-
+
struct flock lock;
+
lockfile = config_get_file("lock");
if((lockfd = open(lockfile, O_RDWR|O_CREAT, 0600)) < 0)
fatal(errno, "error opening %s", lockfile);
lockfile = config_get_file("lock");
if((lockfd = open(lockfile, O_RDWR|O_CREAT, 0600)) < 0)
fatal(errno, "error opening %s", lockfile);
@@
-279,14
+285,17
@@
int main(int argc, char **argv) {
if(ev_signal(ev, SIGTERM, handle_sigterm, 0)) fatal(0, "ev_signal failed");
/* ignore SIGPIPE */
signal(SIGPIPE, SIG_IGN);
if(ev_signal(ev, SIGTERM, handle_sigterm, 0)) fatal(0, "ev_signal failed");
/* ignore SIGPIPE */
signal(SIGPIPE, SIG_IGN);
- /* start a rescan straight away */
- if(initial_rescan)
- trackdb_rescan(ev);
+ /* start a rescan straight away if this is a new installation */
+ if(!trackdb_existing_database) {
+ trackdb_rescan(0/*ev*/);
+ /* No ev -> the rescan will block. Since we called reconfigure() already
+ * any clients will also be forced to block. */
+ }
rescan_after(86400);
/* periodically tidy up the database */
dbgc_after(60);
/* periodically check the volume */
rescan_after(86400);
/* periodically tidy up the database */
dbgc_after(60);
/* periodically check the volume */
- volumecheck_a
fter(6
0);
+ volumecheck_a
gain(0, 0,
0);
/* set initial state */
add_random_track();
play(ev);
/* set initial state */
add_random_track();
play(ev);