server/*.c: Don't try reading per-user configuration.

[disorder] / server / dump.c

diff --git a/server/dump.c b/server/dump.c
index a28387c7103963d022085c1d63d86fb6fbb3e148..d59eb6a5cc8b47687486eaa328a17b7736060cb6 100644 (file)
--- a/server/dump.c
+++ b/server/dump.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
 /*
  * This file is part of DisOrder.

- * Copyright (C) 2004, 2005, 2007, 2008, 2011 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007-2011 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


@@ -40,7 +40,7 @@ static const struct option options[] = {
 };
 
 /* display usage message and terminate */
 };
 
 /* display usage message and terminate */

-static void help(void) {
+static void attribute((noreturn)) help(void) {

   xprintf("Usage:\n"
          "  disorder-dump [OPTIONS] --dump|--undump PATH\n"
          "  disorder-dump [OPTIONS] --recompute-aliases\n"
   xprintf("Usage:\n"
          "  disorder-dump [OPTIONS] --dump|--undump PATH\n"
          "  disorder-dump [OPTIONS] --recompute-aliases\n"


@@ -377,6 +377,8 @@ int main(int argc, char **argv) {
   FILE *fp;
 
   mem_init();
   FILE *fp;
 
   mem_init();

+  if(!setlocale(LC_CTYPE, ""))
+    disorder_error(errno, "error calling setlocale");

   while((n = getopt_long(argc, argv, "hVc:dDurRaPR", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
   while((n = getopt_long(argc, argv, "hVc:dDurRaPR", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();


@@ -406,6 +408,7 @@ int main(int argc, char **argv) {
       disorder_fatal(0, "specify only a dump file name");
     path = argv[optind];
   }
       disorder_fatal(0, "specify only a dump file name");
     path = argv[optind];
   }

+  config_per_user = 0;

   if(config_read(0, NULL))
     disorder_fatal(0, "cannot read configuration");
   if(dump) {
   if(config_read(0, NULL))
     disorder_fatal(0, "cannot read configuration");
   if(dump) {