X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/22b9fa74de8e80471a5033ea067d3b360930b91d..0ec4c5e69dc74bbe543506cd3bbd812d686fb4fd:/server/disorderd.c

diff --git a/server/disorderd.c b/server/disorderd.c
index f2ebb9a..944777a 100644
--- a/server/disorderd.c
+++ b/server/disorderd.c
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include "types.h"
 
 #include <stdio.h>
 #include <getopt.h>
@@ -54,6 +55,7 @@
 #include "mixer.h"
 #include "eventlog.h"
 #include "printf.h"
+#include "setup.h"
 
 static ev_source *ev;
 
@@ -185,12 +187,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");
-  char *newpath;
+  static char *newpath;
+  /* static or libgc collects it! */
 
   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", 
@@ -242,8 +245,12 @@ int main(int argc, char **argv) {
   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");
+  /* 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
@@ -288,7 +295,7 @@ int main(int argc, char **argv) {
   /* periodically tidy up the database */
   dbgc_after(60);
   /* periodically check the volume */
-  volumecheck_after(60);
+  volumecheck_again(0, 0, 0);
   /* set initial state */
   add_random_track();
   play(ev);