X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/ff75e16ea3fc8406f49fc8aa1f00407bb0391368..92db088e5b292c1180a090ed369b9851e933e610:/clients/disorder.c diff --git a/clients/disorder.c b/clients/disorder.c index 6d2c823..36af9f5 100644 --- a/clients/disorder.c +++ b/clients/disorder.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004-2009 Richard Kettlewell + * Copyright (C) 2004-2013 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 @@ -23,17 +23,29 @@ #include #include -#include -#include +#if HAVE_SYS_SOCKET_H +# include +#endif +#if HAVE_SYS_UN_H +# include +#endif #include #include #include #include -#include -#include +#if HAVE_UNISTD_H +# include +#endif +#if HAVE_PCRE_H +# include +#endif #include -#include -#include +#if HAVE_GCRYPT_H +# include +#endif +#if HAVE_LANGINFO_H +# include +#endif #include "configuration.h" #include "syscalls.h" @@ -52,7 +64,6 @@ #include "vector.h" #include "version.h" #include "dateparse.h" -#include "trackdb.h" #include "inputline.h" static disorder_client *client; @@ -67,7 +78,6 @@ static const struct option options[] = { { "help-commands", no_argument, 0, 'H' }, { "user", required_argument, 0, 'u' }, { "password", required_argument, 0, 'p' }, - { "wait-for-root", no_argument, 0, 'W' }, { 0, 0, 0, 0 } }; @@ -317,10 +327,10 @@ static void cf_stats(char attribute((unused)) **argv) { } static void cf_get_volume(char attribute((unused)) **argv) { - int l, r; + long l, r; if(disorder_get_volume(getclient(), &l, &r)) exit(EXIT_FAILURE); - xprintf("%d %d\n", l, r); + xprintf("%ld %ld\n", l, r); } static void cf_set_volume(char **argv) { @@ -505,9 +515,15 @@ static void cf_setup_guest(char **argv) { exit(EXIT_FAILURE); } +/** @brief A scheduled event read from the server */ struct scheduled_event { + /** @brief When event should occur */ time_t when; + + /** @brief Details of action */ struct kvp *actiondata; + + /** @brief Event ID */ char *id; }; @@ -581,31 +597,27 @@ static void cf_schedule_del(char **argv) { } static void cf_schedule_play(char **argv) { - if(disorder_schedule_add(getclient(), - dateparse(argv[0]), - argv[1], - "play", - argv[2])) + if(disorder_schedule_add_play(getclient(), + dateparse(argv[0]), + argv[1], + 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])) + if(disorder_schedule_add_set_global(getclient(), + dateparse(argv[0]), + argv[1], + 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)) + if(disorder_schedule_add_unset_global(getclient(), + dateparse(argv[0]), + argv[1], + argv[2])) exit(EXIT_FAILURE); } @@ -673,12 +685,28 @@ static void cf_playlist_set(char **argv) { exit(EXIT_FAILURE); } -static const struct command { +/** @brief Command-line client's definition of a command */ +static const struct client_command { + /** @brief Command name */ const char *name; - int min, max; + + /** @brief Minimum number of argument */ + int min; + + /** @brief Maximum number of argument */ + int max; + + /** @brief Pointer to function implementing command */ void (*fn)(char **); + + /** @brief Function to recognize a valid argument, or NULL */ int (*isarg)(const char *); - const char *argstr, *desc; + + /** @brief Summary of arguments */ + const char *argstr; + + /** @brief Description */ + const char *desc; } commands[] = { { "adduser", 2, 3, cf_adduser, isarg_rights, "USERNAME PASSWORD [RIGHTS]", "Create a new user" }, @@ -826,39 +854,21 @@ static void help_commands(void) { exit(0); } -static void wait_for_root(void) { - const char *password; - - while(!trackdb_readable()) { - disorder_info("waiting for trackdb..."); - sleep(1); - } - trackdb_init(TRACKDB_NO_RECOVER|TRACKDB_NO_UPGRADE); - for(;;) { - trackdb_open(TRACKDB_READ_ONLY); - password = trackdb_get_password("root"); - trackdb_close(); - if(password) - break; - disorder_info("waiting for root user to be created..."); - sleep(1); - } - trackdb_deinit(NULL); -} - int main(int argc, char **argv) { - int n, i, j, local = 0, wfr = 0; + int n, i, j, local = 0; int status = 0; struct vector args; const char *user = 0, *password = 0; mem_init(); +#if HAVE_PCRE_H /* garbage-collect PCRE's memory */ pcre_malloc = xmalloc; pcre_free = xfree; +#endif if(!setlocale(LC_CTYPE, "")) disorder_fatal(errno, "error calling setlocale"); if(!setlocale(LC_TIME, "")) disorder_fatal(errno, "error calling setlocale"); - while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:W", options, 0)) >= 0) { + while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:", options, 0)) >= 0) { switch(n) { case 'h': help(); case 'H': help_commands(); @@ -869,7 +879,6 @@ int main(int argc, char **argv) { case 'N': config_per_user = 0; break; case 'u': user = optarg; break; case 'p': password = optarg; break; - case 'W': wfr = 1; break; default: disorder_fatal(0, "invalid option"); } } @@ -885,15 +894,15 @@ int main(int argc, char **argv) { } if(local) config->connect.af = -1; - if(wfr) - wait_for_root(); n = optind; optind = 1; /* for subsequent getopt calls */ +#if HAVE_GCRYPT_H /* gcrypt initialization */ if(!gcry_check_version(NULL)) disorder_fatal(0, "gcry_check_version failed"); gcry_control(GCRYCTL_INIT_SECMEM, 0); gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); +#endif /* accumulate command args */ while(n < argc) { if((i = TABLE_FIND(commands, name, argv[n])) < 0)