disobedience/disobedience.c: Stop telling `getopt' to accept `-H' and `-C'.

[disorder] / server / rescan.c

diff --git a/server/rescan.c b/server/rescan.c
index bd163b4b148726bf7afbb9e7bfa3f8be946dd3cb..b89a0a6350a4aef85997414662195ee1c388f382 100644 (file)
--- a/server/rescan.c
+++ b/server/rescan.c
@@ -39,7 +39,7 @@ static const struct option options[] = {
 };
 
 /* display usage message and terminate */
-static void help(void) {
+static void attribute((noreturn)) help(void) {
   xprintf("Usage:\n"
          "  disorder-rescan [OPTIONS] [PATH...]\n"
          "Options:\n"
@@ -402,6 +402,7 @@ int main(int argc, char **argv) {
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }
+  config_per_user = 0;
   if(config_read(0, NULL)) disorder_fatal(0, "cannot read configuration");
   xnice(config->nice_rescan);
   sa.sa_handler = signal_handler;