X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/fe8f85186e9a2b9ffa7ebb157ab91a39df39941f..0e464e60978139f24c27ad22bd2a89329a06697c:/clients/disorder.c diff --git a/clients/disorder.c b/clients/disorder.c index 0ce20aa..0dd71c7 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-2008 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 @@ -35,6 +35,7 @@ #include #include #include +#include #include "configuration.h" #include "syscalls.h" @@ -52,15 +53,21 @@ #include "defs.h" #include "authorize.h" #include "vector.h" +#include "version.h" +#include "dateparse.h" -static int auto_reconfigure; +static disorder_client *client; static const struct option options[] = { { "help", no_argument, 0, 'h' }, { "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' }, + { "user", required_argument, 0, 'u' }, + { "password", required_argument, 0, 'p' }, { 0, 0, 0, 0 } }; @@ -73,23 +80,24 @@ 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); } -/* display version number and terminate */ -static void version(void) { - xprintf("disorder version %s\n", disorder_version_string); - xfclose(stdout); - exit(0); +static disorder_client *getclient(void) { + if(!client) { + if(!(client = disorder_new(1))) exit(EXIT_FAILURE); + if(disorder_connect(client)) exit(EXIT_FAILURE); + } + return client; } -static void cf_version(disorder_client *c, - char attribute((unused)) **argv) { +static void cf_version(char attribute((unused)) **argv) { char *v; - if(disorder_version(c, &v)) exit(EXIT_FAILURE); + if(disorder_version(getclient(), &v)) exit(EXIT_FAILURE); xprintf("%s\n", nullcheck(utf82mb(v))); } @@ -108,76 +116,71 @@ static void print_queue_entry(const struct queue_entry *q) { if(q->wstat) xprintf(" %s\n", wstat(q->wstat)); } -static void cf_playing(disorder_client *c, - char attribute((unused)) **argv) { +static void cf_playing(char attribute((unused)) **argv) { struct queue_entry *q; - if(disorder_playing(c, &q)) exit(EXIT_FAILURE); + if(disorder_playing(getclient(), &q)) exit(EXIT_FAILURE); if(q) print_queue_entry(q); else xprintf("nothing\n"); } -static void cf_play(disorder_client *c, char **argv) { +static void cf_play(char **argv) { while(*argv) - if(disorder_play(c, *argv++)) exit(EXIT_FAILURE); + if(disorder_play(getclient(), *argv++)) exit(EXIT_FAILURE); } -static void cf_remove(disorder_client *c, char **argv) { - if(disorder_remove(c, argv[0])) exit(EXIT_FAILURE); +static void cf_remove(char **argv) { + if(disorder_remove(getclient(), argv[0])) exit(EXIT_FAILURE); } -static void cf_disable(disorder_client *c, - char attribute((unused)) **argv) { - if(disorder_disable(c)) exit(EXIT_FAILURE); +static void cf_disable(char attribute((unused)) **argv) { + if(disorder_disable(getclient())) exit(EXIT_FAILURE); } -static void cf_enable(disorder_client *c, char attribute((unused)) **argv) { - if(disorder_enable(c)) exit(EXIT_FAILURE); +static void cf_enable(char attribute((unused)) **argv) { + if(disorder_enable(getclient())) exit(EXIT_FAILURE); } -static void cf_scratch(disorder_client *c, - char **argv) { - if(disorder_scratch(c, argv[0])) exit(EXIT_FAILURE); +static void cf_scratch(char **argv) { + if(disorder_scratch(getclient(), argv[0])) exit(EXIT_FAILURE); } -static void cf_shutdown(disorder_client *c, - char attribute((unused)) **argv) { - if(disorder_shutdown(c)) exit(EXIT_FAILURE); +static void cf_shutdown(char attribute((unused)) **argv) { + if(disorder_shutdown(getclient())) exit(EXIT_FAILURE); } -static void cf_reconfigure(disorder_client *c, - char attribute((unused)) **argv) { - if(disorder_reconfigure(c)) exit(EXIT_FAILURE); +static void cf_reconfigure(char attribute((unused)) **argv) { + /* Re-check configuration for server */ + if(config_read(1)) fatal(0, "cannot read configuration"); + if(disorder_reconfigure(getclient())) exit(EXIT_FAILURE); } -static void cf_rescan(disorder_client *c, char attribute((unused)) **argv) { - if(disorder_rescan(c)) exit(EXIT_FAILURE); +static void cf_rescan(char attribute((unused)) **argv) { + if(disorder_rescan(getclient())) exit(EXIT_FAILURE); } -static void cf_somequeue(disorder_client *c, - int (*fn)(disorder_client *c, +static void cf_somequeue(int (*fn)(disorder_client *c, struct queue_entry **qp)) { struct queue_entry *q; - if(fn(c, &q)) exit(EXIT_FAILURE); + if(fn(getclient(), &q)) exit(EXIT_FAILURE); while(q) { print_queue_entry(q); q = q->next; } } -static void cf_recent(disorder_client *c, char attribute((unused)) **argv) { - cf_somequeue(c, disorder_recent); +static void cf_recent(char attribute((unused)) **argv) { + cf_somequeue(disorder_recent); } -static void cf_queue(disorder_client *c, char attribute((unused)) **argv) { - cf_somequeue(c, disorder_queue); +static void cf_queue(char attribute((unused)) **argv) { + cf_somequeue(disorder_queue); } -static void cf_quack(disorder_client attribute((unused)) *c, - char attribute((unused)) **argv) { +static void cf_quack(char attribute((unused)) **argv) { xprintf("\n" " .------------------.\n" " | Naath is a babe! |\n" @@ -189,7 +192,7 @@ static void cf_quack(disorder_client attribute((unused)) *c, "\n"); } -static void cf_somelist(disorder_client *c, char **argv, +static void cf_somelist(char **argv, int (*fn)(disorder_client *c, const char *arg, const char *re, char ***vecp, int *nvecp)) { @@ -200,7 +203,7 @@ static void cf_somelist(disorder_client *c, char **argv, re = xstrdup(argv[1] + 1); else re = 0; - if(fn(c, argv[0], re, &vec, 0)) exit(EXIT_FAILURE); + if(fn(getclient(), argv[0], re, &vec, 0)) exit(EXIT_FAILURE); while(*vec) xprintf("%s\n", nullcheck(utf82mb(*vec++))); } @@ -209,103 +212,90 @@ static int isarg_regexp(const char *s) { return s[0] == '~'; } -static void cf_dirs(disorder_client *c, - char **argv) { - cf_somelist(c, argv, disorder_directories); +static void cf_dirs(char **argv) { + cf_somelist(argv, disorder_directories); } -static void cf_files(disorder_client *c, char **argv) { - cf_somelist(c, argv, disorder_files); +static void cf_files(char **argv) { + cf_somelist(argv, disorder_files); } -static void cf_allfiles(disorder_client *c, char **argv) { - cf_somelist(c, argv, disorder_allfiles); +static void cf_allfiles(char **argv) { + cf_somelist(argv, disorder_allfiles); } -static void cf_get(disorder_client *c, char **argv) { +static void cf_get(char **argv) { char *value; - if(disorder_get(c, argv[0], argv[1], &value)) exit(EXIT_FAILURE); + if(disorder_get(getclient(), argv[0], argv[1], &value)) exit(EXIT_FAILURE); xprintf("%s\n", nullcheck(utf82mb(value))); } -static void cf_length(disorder_client *c, char **argv) { +static void cf_length(char **argv) { long length; - if(disorder_length(c, argv[0], &length)) exit(EXIT_FAILURE); + if(disorder_length(getclient(), argv[0], &length)) exit(EXIT_FAILURE); xprintf("%ld\n", length); } -static void cf_set(disorder_client *c, char **argv) { - if(disorder_set(c, argv[0], argv[1], argv[2])) exit(EXIT_FAILURE); +static void cf_set(char **argv) { + if(disorder_set(getclient(), argv[0], argv[1], argv[2])) exit(EXIT_FAILURE); } -static void cf_unset(disorder_client *c, char **argv) { - if(disorder_unset(c, argv[0], argv[1])) exit(EXIT_FAILURE); +static void cf_unset(char **argv) { + if(disorder_unset(getclient(), argv[0], argv[1])) exit(EXIT_FAILURE); } -static void cf_prefs(disorder_client *c, char **argv) { +static void cf_prefs(char **argv) { struct kvp *k; - if(disorder_prefs(c, argv[0], &k)) exit(EXIT_FAILURE); + if(disorder_prefs(getclient(), argv[0], &k)) exit(EXIT_FAILURE); for(; k; k = k->next) xprintf("%s = %s\n", nullcheck(utf82mb(k->name)), nullcheck(utf82mb(k->value))); } -static void cf_search(disorder_client *c, char **argv) { +static void cf_search(char **argv) { char **results; int nresults, n; - if(disorder_search(c, *argv, &results, &nresults)) exit(EXIT_FAILURE); + if(disorder_search(getclient(), *argv, &results, &nresults)) exit(EXIT_FAILURE); for(n = 0; n < nresults; ++n) xprintf("%s\n", nullcheck(utf82mb(results[n]))); } -static void cf_random_disable(disorder_client *c, - char attribute((unused)) **argv) { - if(disorder_random_disable(c)) exit(EXIT_FAILURE); +static void cf_random_disable(char attribute((unused)) **argv) { + if(disorder_random_disable(getclient())) exit(EXIT_FAILURE); } -static void cf_random_enable(disorder_client *c, - char attribute((unused)) **argv) { - if(disorder_random_enable(c)) exit(EXIT_FAILURE); +static void cf_random_enable(char attribute((unused)) **argv) { + if(disorder_random_enable(getclient())) exit(EXIT_FAILURE); } -static void cf_stats(disorder_client *c, - char attribute((unused)) **argv) { +static void cf_stats(char attribute((unused)) **argv) { char **vec; - if(disorder_stats(c, &vec, 0)) exit(EXIT_FAILURE); + if(disorder_stats(getclient(), &vec, 0)) exit(EXIT_FAILURE); while(*vec) xprintf("%s\n", nullcheck(utf82mb(*vec++))); } -static void cf_get_volume(disorder_client *c, - char attribute((unused)) **argv) { +static void cf_get_volume(char attribute((unused)) **argv) { int l, r; - if(disorder_get_volume(c, &l, &r)) exit(EXIT_FAILURE); + if(disorder_get_volume(getclient(), &l, &r)) exit(EXIT_FAILURE); xprintf("%d %d\n", l, r); } -static void cf_set_volume(disorder_client *c, - char **argv) { - if(disorder_set_volume(c, atoi(argv[0]), atoi(argv[1]))) exit(EXIT_FAILURE); -} - -static void cf_become(disorder_client *c, - char **argv) { - if(disorder_become(c, argv[0])) exit(EXIT_FAILURE); +static void cf_set_volume(char **argv) { + if(disorder_set_volume(getclient(), atoi(argv[0]), atoi(argv[1]))) exit(EXIT_FAILURE); } -static void cf_log(disorder_client *c, - char attribute((unused)) **argv) { - if(disorder_log(c, sink_stdio("stdout", stdout))) exit(EXIT_FAILURE); +static void cf_log(char attribute((unused)) **argv) { + if(disorder_log(getclient(), sink_stdio("stdout", stdout))) exit(EXIT_FAILURE); } -static void cf_move(disorder_client *c, - char **argv) { +static void cf_move(char **argv) { long n; int e; @@ -313,14 +303,13 @@ static void cf_move(disorder_client *c, fatal(e, "cannot convert '%s'", argv[1]); if(n > INT_MAX || n < INT_MIN) fatal(e, "%ld out of range", n); - if(disorder_move(c, argv[0], (int)n)) exit(EXIT_FAILURE); + if(disorder_move(getclient(), argv[0], (int)n)) exit(EXIT_FAILURE); } -static void cf_part(disorder_client *c, - char **argv) { +static void cf_part(char **argv) { char *s; - if(disorder_part(c, &s, argv[0], argv[1], argv[2])) exit(EXIT_FAILURE); + if(disorder_part(getclient(), &s, argv[0], argv[1], argv[2])) exit(EXIT_FAILURE); xprintf("%s\n", nullcheck(utf82mb(s))); } @@ -328,73 +317,285 @@ static int isarg_filename(const char *s) { return s[0] == '/'; } -static void cf_authorize(disorder_client attribute((unused)) *c, - char **argv) { - if(!authorize(argv[0])) - auto_reconfigure = 1; +static void cf_authorize(char **argv) { + authorize(getclient(), argv[0], argv[1]); } -static void cf_resolve(disorder_client *c, - char **argv) { +static void cf_resolve(char **argv) { char *track; - if(disorder_resolve(c, &track, argv[0])) exit(EXIT_FAILURE); + if(disorder_resolve(getclient(), &track, argv[0])) exit(EXIT_FAILURE); xprintf("%s\n", nullcheck(utf82mb(track))); } -static void cf_pause(disorder_client *c, - char attribute((unused)) **argv) { - if(disorder_pause(c)) exit(EXIT_FAILURE); +static void cf_pause(char attribute((unused)) **argv) { + if(disorder_pause(getclient())) exit(EXIT_FAILURE); } -static void cf_resume(disorder_client *c, - char attribute((unused)) **argv) { - if(disorder_resume(c)) exit(EXIT_FAILURE); +static void cf_resume(char attribute((unused)) **argv) { + if(disorder_resume(getclient())) exit(EXIT_FAILURE); } -static void cf_tags(disorder_client *c, - char attribute((unused)) **argv) { +static void cf_tags(char attribute((unused)) **argv) { char **vec; - if(disorder_tags(c, &vec, 0)) exit(EXIT_FAILURE); + if(disorder_tags(getclient(), &vec, 0)) exit(EXIT_FAILURE); while(*vec) xprintf("%s\n", nullcheck(utf82mb(*vec++))); } -static void cf_get_global(disorder_client *c, char **argv) { +static void cf_users(char attribute((unused)) **argv) { + char **vec; + + if(disorder_users(getclient(), &vec, 0)) exit(EXIT_FAILURE); + while(*vec) + xprintf("%s\n", nullcheck(utf82mb(*vec++))); +} + +static void cf_get_global(char **argv) { char *value; - if(disorder_get_global(c, argv[0], &value)) exit(EXIT_FAILURE); + if(disorder_get_global(getclient(), argv[0], &value)) exit(EXIT_FAILURE); xprintf("%s\n", nullcheck(utf82mb(value))); } -static void cf_set_global(disorder_client *c, char **argv) { - if(disorder_set_global(c, argv[0], argv[1])) exit(EXIT_FAILURE); +static void cf_set_global(char **argv) { + if(disorder_set_global(getclient(), argv[0], argv[1])) exit(EXIT_FAILURE); +} + +static void cf_unset_global(char **argv) { + if(disorder_unset_global(getclient(), argv[0])) exit(EXIT_FAILURE); +} + +static int isarg_integer(const char *s) { + if(!*s) return 0; + while(*s) { + if(!isdigit((unsigned char)*s)) + return 0; + ++s; + } + return 1; +} + +static void cf_new(char **argv) { + char **vec; + + if(disorder_new_tracks(getclient(), &vec, 0, argv[0] ? atoi(argv[0]) : 0)) + exit(EXIT_FAILURE); + while(*vec) + xprintf("%s\n", nullcheck(utf82mb(*vec++))); +} + +static void cf_rtp_address(char attribute((unused)) **argv) { + char *address, *port; + + if(disorder_rtp_address(getclient(), &address, &port)) exit(EXIT_FAILURE); + xprintf("address: %s\nport: %s\n", address, port); +} + +static int isarg_rights(const char *arg) { + return strchr(arg, ',') || !parse_rights(arg, 0, 0); +} + +static void cf_adduser(char **argv) { + if(disorder_adduser(getclient(), argv[0], argv[1], argv[2])) + exit(EXIT_FAILURE); +} + +static void cf_deluser(char **argv) { + if(disorder_deluser(getclient(), argv[0])) + exit(EXIT_FAILURE); +} + +static void cf_edituser(char **argv) { + if(disorder_edituser(getclient(), argv[0], argv[1], argv[2])) + exit(EXIT_FAILURE); +} + +static void cf_userinfo(char **argv) { + char *s; + + if(disorder_userinfo(getclient(), argv[0], argv[1], &s)) + exit(EXIT_FAILURE); + xprintf("%s\n", nullcheck(utf82mb(s))); +} + +static int isarg_option(const char *arg) { + return arg[0] == '-'; +} + +static int argvlen(char **argv) { + char **start = argv; + + while(*argv) + ++argv; + return argv - start; +} + +static const struct option setup_guest_options[] = { + { "help", no_argument, 0, 'h' }, + { "online-registration", no_argument, 0, 'r' }, + { "no-online-registration", no_argument, 0, 'R' }, + { 0, 0, 0, 0 } +}; + +static void help_setup_guest(void) { + xprintf("Usage:\n" + " disorder setup-guest [OPTIONS]\n" + "Options:\n" + " --help, -h Display usage message\n" + " --online-registration Enable online registration (default)\n" + " --no-online-registration Disable online registration\n"); + xfclose(stdout); + exit(0); } -static void cf_unset_global(disorder_client *c, char **argv) { - if(disorder_unset_global(c, argv[0])) exit(EXIT_FAILURE); +static void cf_setup_guest(char **argv) { + int n, online_registration = 1; + + while((n = getopt_long(argvlen(argv) + 1, argv - 1, + "hrR", setup_guest_options, 0)) >= 0) { + switch(n) { + case 'h': help_setup_guest(); + case 'r': online_registration = 1; break; + case 'R': online_registration = 0; break; + default: fatal(0, "invalid option"); + } + } + if(online_registration && !config->mail_sender) + fatal(0, "you MUST set mail_sender if you want online registration"); + if(disorder_adduser(getclient(), "guest", "", + online_registration ? "read,register" : "read")) + exit(EXIT_FAILURE); +} + +struct scheduled_event { + time_t when; + struct kvp *actiondata; + char *id; +}; + +static int compare_event(const void *av, const void *bv) { + struct scheduled_event *a = (void *)av, *b = (void *)bv; + + /* Primary sort key is the trigger time */ + if(a->when < b->when) + return -1; + else if(a->when > b->when) + return 1; + /* For events that go off at the same time just sort by ID */ + return strcmp(a->id, b->id); +} + +static void cf_schedule_list(char attribute((unused)) **argv) { + char **ids; + int nids, n; + struct scheduled_event *events; + char tb[128]; + const char *action, *key, *value, *priority; + int prichar; + + /* Get all known events */ + if(disorder_schedule_list(getclient(), &ids, &nids)) + exit(EXIT_FAILURE); + events = xcalloc(nids, sizeof *events); + for(n = 0; n < nids; ++n) { + events[n].id = ids[n]; + if(disorder_schedule_get(getclient(), ids[n], &events[n].actiondata)) + exit(EXIT_FAILURE); + events[n].when = atoll(kvp_get(events[n].actiondata, "when")); + } + /* Sort by trigger time */ + qsort(events, nids, sizeof *events, compare_event); + /* Display them */ + for(n = 0; n < nids; ++n) { + strftime(tb, sizeof tb, "%Y-%m-%d %H:%M:%S %Z", localtime(&events[n].when)); + action = kvp_get(events[n].actiondata, "action"); + priority = kvp_get(events[n].actiondata, "priority"); + if(!strcmp(priority, "junk")) + prichar = 'J'; + else if(!strcmp(priority, "normal")) + prichar = 'N'; + else + prichar = '?'; + xprintf("%11s %-25s %c %-8s %s", + events[n].id, tb, prichar, kvp_get(events[n].actiondata, "who"), + action); + if(!strcmp(action, "play")) + xprintf(" %s", + nullcheck(utf82mb(kvp_get(events[n].actiondata, "track")))); + else if(!strcmp(action, "set-global")) { + key = kvp_get(events[n].actiondata, "key"); + value = kvp_get(events[n].actiondata, "value"); + if(value) + xprintf(" %s=%s", + nullcheck(utf82mb(key)), + nullcheck(utf82mb(value))); + else + xprintf(" %s unset", + nullcheck(utf82mb(key))); + } + xprintf("\n"); + } +} + +static void cf_schedule_del(char **argv) { + if(disorder_schedule_del(getclient(), argv[0])) + exit(EXIT_FAILURE); +} + +static void cf_schedule_play(char **argv) { + if(disorder_schedule_add(getclient(), + dateparse(argv[0]), + argv[1], + "play", + argv[2])) + exit(EXIT_FAILURE); +} + +static void cf_schedule_set_global(char **argv) { + if(disorder_schedule_add(getclient(), + dateparse(argv[0]), + argv[1], + "set-global", + argv[2], + argv[3])) + exit(EXIT_FAILURE); +} + +static void cf_schedule_unset_global(char **argv) { + if(disorder_schedule_add(getclient(), + dateparse(argv[0]), + argv[1], + "set-global", + argv[2], + (char *)0)) + exit(EXIT_FAILURE); } static const struct command { const char *name; int min, max; - void (*fn)(disorder_client *c, char **); + void (*fn)(char **); int (*isarg)(const char *); const char *argstr, *desc; } commands[] = { + { "adduser", 2, 3, cf_adduser, isarg_rights, "USERNAME PASSWORD [RIGHTS]", + "Create a new user" }, { "allfiles", 1, 2, cf_allfiles, isarg_regexp, "DIR [~REGEXP]", "List all files and directories in DIR" }, - { "authorize", 1, 1, cf_authorize, 0, "USER", - "Authorize USER to connect to the server" }, - { "become", 1, 1, cf_become, 0, "USER", - "Become user USER" }, + { "authorize", 1, 2, cf_authorize, isarg_rights, "USERNAME [RIGHTS]", + "Authorize user USERNAME to connect" }, + { "deluser", 1, 1, cf_deluser, 0, "USERNAME", + "Delete user USERNAME" }, { "dirs", 1, 2, cf_dirs, isarg_regexp, "DIR [~REGEXP]", "List directories in DIR" }, { "disable", 0, 0, cf_disable, 0, "", "Disable play" }, { "disable-random", 0, 0, cf_random_disable, 0, "", "Disable random play" }, + { "edituser", 3, 3, cf_edituser, 0, "USERNAME PROPERTY VALUE", + "Set a property of user USERNAME" }, { "enable", 0, 0, cf_enable, 0, "", "Enable play" }, { "enable-random", 0, 0, cf_random_enable, 0, "", @@ -413,6 +614,8 @@ static const struct command { "Copy event log to stdout" }, { "move", 2, 2, cf_move, 0, "TRACK DELTA", "Move a track in the queue" }, + { "new", 0, 1, cf_new, isarg_integer, "[MAX]", + "Get the most recently added MAX tracks" }, { "part", 3, 3, cf_part, 0, "TRACK CONTEXT PART", "Find a track name part" }, { "pause", 0, 0, cf_pause, 0, "", @@ -442,6 +645,18 @@ static const struct command { "Resolve alias for TRACK" }, { "resume", 0, 0, cf_resume, 0, "", "Resume after a pause" }, + { "rtp-address", 0, 0, cf_rtp_address, 0, "", + "Report server's broadcast address" }, + { "schedule-del", 1, 1, cf_schedule_del, 0, "EVENT", + "Delete a scheduled event" }, + { "schedule-list", 0, 0, cf_schedule_list, 0, "", + "List scheduled events" }, + { "schedule-play", 3, 3, cf_schedule_play, 0, "WHEN PRI TRACK", + "Play TRACK later" }, + { "schedule-set-global", 4, 4, cf_schedule_set_global, 0, "WHEN PRI NAME VAL", + "Set a global preference later" }, + { "schedule-unset-global", 3, 3, cf_schedule_unset_global, 0, "WHEN PRI NAME", + "Unset a global preference later" }, { "scratch", 0, 0, cf_scratch, 0, "", "Scratch the currently playing track" }, { "scratch-id", 1, 1, cf_scratch, 0, "ID", @@ -454,6 +669,8 @@ static const struct command { "Set a global preference value" }, { "set-volume", 2, 2, cf_set_volume, 0, "LEFT RIGHT", "Set the volume" }, + { "setup-guest", 0, INT_MAX, cf_setup_guest, isarg_option, "[OPTIONS]", + "Create the guest login" }, { "shutdown", 0, 0, cf_shutdown, 0, "", "Shut down the daemon" }, { "stats", 0, 0, cf_stats, 0, "", @@ -464,6 +681,10 @@ static const struct command { "Unset a preference" }, { "unset-global", 1, 1, cf_unset_global, 0, "NAME", "Unset a global preference" }, + { "userinfo", 2, 2, cf_userinfo, 0, "USERNAME PROPERTY", + "Get a property of a user" }, + { "users", 0, 0, cf_users, 0, "", + "List all users" }, { "version", 0, 0, cf_version, 0, "", "Display the server version" }, }; @@ -496,40 +717,53 @@ static void help_commands(void) { } int main(int argc, char **argv) { - int n, i, j; - disorder_client *c = 0; - const char *s; + int n, i, j, local = 0; int status = 0; struct vector args; + const char *user = 0, *password = 0; mem_init(); /* garbage-collect PCRE's memory */ 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) { + if(!setlocale(LC_TIME, "")) fatal(errno, "error calling setlocale"); + while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:", options, 0)) >= 0) { switch(n) { case 'h': help(); case 'H': help_commands(); - case 'V': version(); + case 'V': version("disorder"); case 'c': configfile = optarg; break; case 'd': debugging = 1; break; + case 'l': local = 1; break; + case 'N': config_per_user = 0; break; + case 'u': user = optarg; break; + case 'p': password = optarg; break; default: fatal(0, "invalid option"); } } - if(config_read()) fatal(0, "cannot read configuration"); - if(!(c = disorder_new(1))) exit(EXIT_FAILURE); - s = config_get_file("socket"); - if(disorder_connect(c)) exit(EXIT_FAILURE); + if(config_read(0)) fatal(0, "cannot read configuration"); + if(user) { + config->username = user; + config->password = 0; + } + if(password) + config->password = password; + if(local) + config->connect.n = 0; n = optind; + optind = 1; /* for subsequent getopt calls */ /* accumulate command args */ while(n < argc) { if((i = TABLE_FIND(commands, struct command, name, argv[n])) < 0) fatal(0, "unknown command '%s'", argv[n]); if(n + commands[i].min >= argc) fatal(0, "missing arguments to '%s'", argv[n]); - n++; vector_init(&args); + /* Include the command name in the args, but at element -1, for + * the benefit of subcommand getopt calls */ + vector_append(&args, argv[n]); + n++; for(j = 0; j < commands[i].min; ++j) vector_append(&args, nullcheck(mb2utf8(argv[n + j]))); for(; j < commands[i].max @@ -537,14 +771,10 @@ int main(int argc, char **argv) { && commands[i].isarg(argv[n + j]); ++j) vector_append(&args, nullcheck(mb2utf8(argv[n + j]))); vector_terminate(&args); - commands[i].fn(c, args.vec); + commands[i].fn(args.vec + 1); n += j; } - if(auto_reconfigure) { - assert(c != 0); - if(disorder_reconfigure(c)) exit(EXIT_FAILURE); - } - if(c && disorder_close(c)) exit(EXIT_FAILURE); + if(client && disorder_close(client)) exit(EXIT_FAILURE); if(fclose(stdout) < 0) fatal(errno, "error closing stdout"); return status; }