X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/b78b8ee1aaf32d6df2405c014c9a86fc263b6290..a05e4467dee55248f2135dcb532b4729154d69c5:/clients/disorder.c diff --git a/clients/disorder.c b/clients/disorder.c index 7134e7b..7ee9865 100644 --- a/clients/disorder.c +++ b/clients/disorder.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 @@ -61,6 +61,8 @@ static const struct option options[] = { { "version", no_argument, 0, 'V' }, { "config", required_argument, 0, 'c' }, { "debug", no_argument, 0, 'd' }, + { "local", no_argument, 0, 'l' }, + { "no-per-user-config", no_argument, 0, 'N' }, { "help-commands", no_argument, 0, 'H' }, { 0, 0, 0, 0 } }; @@ -74,6 +76,7 @@ static void help(void) { " --help-commands, -H List commands\n" " --version, -V Display version number\n" " --config PATH, -c PATH Set configuration file\n" + " --local, -l Force connection to local server\n" " --debug, -d Turn on debugging\n"); xfclose(stdout); exit(0); @@ -81,7 +84,7 @@ static void help(void) { /* display version number and terminate */ static void version(void) { - xprintf("disorder version %s\n", disorder_version_string); + xprintf("%s", disorder_version_string); xfclose(stdout); exit(0); } @@ -531,7 +534,7 @@ static void help_commands(void) { } int main(int argc, char **argv) { - int n, i, j; + int n, i, j, local = 0; disorder_client *c = 0; int status = 0; struct vector args; @@ -541,17 +544,21 @@ int main(int argc, char **argv) { pcre_malloc = xmalloc; pcre_free = xfree; if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale"); - while((n = getopt_long(argc, argv, "hVc:dHL", options, 0)) >= 0) { + while((n = getopt_long(argc, argv, "hVc:dHlN", options, 0)) >= 0) { switch(n) { case 'h': help(); case 'H': help_commands(); case 'V': version(); case 'c': configfile = optarg; break; case 'd': debugging = 1; break; + case 'l': local = 1; break; + case 'N': config_per_user = 0; break; default: fatal(0, "invalid option"); } } if(config_read(0)) fatal(0, "cannot read configuration"); + if(local) + config->connect.n = 0; if(!(c = disorder_new(1))) exit(EXIT_FAILURE); if(disorder_connect(c)) exit(EXIT_FAILURE); n = optind;