X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/f2620548144b356661614eba36c9de12ef31395c..HEAD:/clients/disorder.c diff --git a/clients/disorder.c b/clients/disorder.c index a246eee..6aa12c4 100644 --- a/clients/disorder.c +++ b/clients/disorder.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004-2008 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,24 +23,35 @@ #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 #include -#include -#include +#if HAVE_GCRYPT_H +# include +#endif +#if HAVE_LANGINFO_H +# include +#endif #include "configuration.h" #include "syscalls.h" #include "log.h" #include "queue.h" #include "client.h" -#include "wstat.h" +#if !_WIN32 +# include "wstat.h" +#endif #include "table.h" #include "charset.h" #include "kvp.h" @@ -48,11 +59,12 @@ #include "sink.h" #include "mem.h" #include "defs.h" -#include "authorize.h" +#if !_WIN32 +# include "authorize.h" +#endif #include "vector.h" #include "version.h" #include "dateparse.h" -#include "trackdb.h" #include "inputline.h" static disorder_client *client; @@ -63,23 +75,24 @@ static const struct option options[] = { { "config", required_argument, 0, 'c' }, { "debug", no_argument, 0, 'd' }, { "local", no_argument, 0, 'l' }, + { "user-config", required_argument, 0, 'u' }, { "no-per-user-config", no_argument, 0, 'N' }, { "help-commands", no_argument, 0, 'H' }, - { "user", required_argument, 0, 'u' }, - { "password", required_argument, 0, 'p' }, - { "wait-for-root", no_argument, 0, 'W' }, + { "user", required_argument, 0, 'U' }, + { "password", required_argument, 0, 'P' }, { 0, 0, 0, 0 } }; /* display usage message and terminate */ -static void help(void) { +static void attribute((noreturn)) help(void) { xprintf("Usage:\n" " disorder [OPTIONS] COMMAND ...\n" "Options:\n" " --help, -h Display usage message\n" " --help-commands, -H List commands\n" " --version, -V Display version number\n" - " --config PATH, -c PATH Set configuration file\n" + " --config PATH, -c PATH Set system configuration file\n" + " --user-config PATH, -u PATH Set user configuration file\n" " --local, -l Force connection to local server\n" " --debug, -d Turn on debugging\n"); xfclose(stdout); @@ -98,7 +111,9 @@ static void cf_version(char attribute((unused)) **argv) { char *v; if(disorder_version(getclient(), &v)) exit(EXIT_FAILURE); - xprintf("%s\n", nullcheck(utf82mb(v))); + v = nullcheck(utf82mb_f(v)); + xprintf("%s\n", v); + xfree(v); } static void print_queue_entry(const struct queue_entry *q) { @@ -122,7 +137,11 @@ static void print_queue_entry(const struct queue_entry *q) { if(q->scratched) xprintf(" scratched by %s\n", nullcheck(utf82mb(q->scratched))); else xprintf(" %s\n", playing_states[q->state]); +#if _WIN32 + if(q->wstat) xprintf(" %#x\n", q->wstat); +#else if(q->wstat) xprintf(" %s\n", wstat(q->wstat)); +#endif } static void cf_playing(char attribute((unused)) **argv) { @@ -136,8 +155,9 @@ static void cf_playing(char attribute((unused)) **argv) { } static void cf_play(char **argv) { + char *id; while(*argv) - if(disorder_play(getclient(), *argv++)) exit(EXIT_FAILURE); + if(disorder_play(getclient(), *argv++, &id)) exit(EXIT_FAILURE); } static void cf_remove(char **argv) { @@ -162,7 +182,8 @@ static void cf_shutdown(char attribute((unused)) **argv) { static void cf_reconfigure(char attribute((unused)) **argv) { /* Re-check configuration for server */ - if(config_read(1, NULL)) fatal(0, "cannot read configuration"); + if(config_read(1, NULL)) + disorder_fatal(0, "cannot read configuration"); if(disorder_reconfigure(getclient())) exit(EXIT_FAILURE); } @@ -172,13 +193,12 @@ static void cf_rescan(char attribute((unused)) **argv) { static void cf_somequeue(int (*fn)(disorder_client *c, struct queue_entry **qp)) { - struct queue_entry *q; + struct queue_entry *q, *qbase; - if(fn(getclient(), &q)) exit(EXIT_FAILURE); - while(q) { + if(fn(getclient(), &qbase)) exit(EXIT_FAILURE); + for(q = qbase; q; q = q->next) print_queue_entry(q); - q = q->next; - } + queue_free(qbase, 1); } static void cf_recent(char attribute((unused)) **argv) { @@ -189,6 +209,10 @@ static void cf_queue(char attribute((unused)) **argv) { cf_somequeue(disorder_queue); } +#if _WIN32 +# define nl_langinfo(whatever) "ascii" /* hack */ +#endif + static void cf_quack(char attribute((unused)) **argv) { if(!strcasecmp(nl_langinfo(CODESET), "utf-8")) { #define TL "\xE2\x95\xAD" @@ -224,16 +248,17 @@ static void cf_somelist(char **argv, int (*fn)(disorder_client *c, const char *arg, const char *re, char ***vecp, int *nvecp)) { - char **vec; + char **vec, **base; const char *re; if(argv[1]) re = xstrdup(argv[1] + 1); else re = 0; - if(fn(getclient(), argv[0], re, &vec, 0)) exit(EXIT_FAILURE); - while(*vec) - xprintf("%s\n", nullcheck(utf82mb(*vec++))); + if(fn(getclient(), argv[0], re, &base, 0)) exit(EXIT_FAILURE); + for(vec = base; *vec; ++vec) + xprintf("%s\n", nullcheck(utf82mb_f(*vec))); + xfree(base); } static int isarg_regexp(const char *s) { @@ -241,7 +266,7 @@ static int isarg_regexp(const char *s) { } static void cf_dirs(char **argv) { - cf_somelist(argv, disorder_directories); + cf_somelist(argv, disorder_dirs); } static void cf_files(char **argv) { @@ -256,7 +281,7 @@ static void cf_get(char **argv) { char *value; if(disorder_get(getclient(), argv[0], argv[1], &value)) exit(EXIT_FAILURE); - xprintf("%s\n", nullcheck(utf82mb(value))); + xprintf("%s\n", nullcheck(utf82mb_f(value))); } static void cf_length(char **argv) { @@ -275,12 +300,13 @@ static void cf_unset(char **argv) { } static void cf_prefs(char **argv) { - struct kvp *k; + struct kvp *k, *base; - if(disorder_prefs(getclient(), argv[0], &k)) exit(EXIT_FAILURE); - for(; k; k = k->next) + if(disorder_prefs(getclient(), argv[0], &base)) exit(EXIT_FAILURE); + for(k = base; k; k = k->next) xprintf("%s = %s\n", nullcheck(utf82mb(k->name)), nullcheck(utf82mb(k->value))); + kvp_free(base); } static void cf_search(char **argv) { @@ -290,6 +316,7 @@ static void cf_search(char **argv) { if(disorder_search(getclient(), *argv, &results, &nresults)) exit(EXIT_FAILURE); for(n = 0; n < nresults; ++n) xprintf("%s\n", nullcheck(utf82mb(results[n]))); + free_strings(nresults, results); } static void cf_random_disable(char attribute((unused)) **argv) { @@ -302,17 +329,20 @@ static void cf_random_enable(char attribute((unused)) **argv) { static void cf_stats(char attribute((unused)) **argv) { char **vec; + int nvec; + int n; - if(disorder_stats(getclient(), &vec, 0)) exit(EXIT_FAILURE); - while(*vec) - xprintf("%s\n", nullcheck(utf82mb(*vec++))); + if(disorder_stats(getclient(), &vec, &nvec)) exit(EXIT_FAILURE); + for(n = 0; n < nvec; ++n) + xprintf("%s\n", nullcheck(utf82mb(vec[n]))); + free_strings(nvec, vec); } 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) { @@ -320,6 +350,7 @@ static void cf_set_volume(char **argv) { } static void cf_log(char attribute((unused)) **argv) { + setvbuf(stdout, 0, _IOLBF, BUFSIZ); if(disorder_log(getclient(), sink_stdio("stdout", stdout))) exit(EXIT_FAILURE); } @@ -328,32 +359,34 @@ static void cf_move(char **argv) { int e; if((e = xstrtol(&n, argv[1], 0, 10))) - fatal(e, "cannot convert '%s'", argv[1]); + disorder_fatal(e, "cannot convert '%s'", argv[1]); if(n > INT_MAX || n < INT_MIN) - fatal(e, "%ld out of range", n); + disorder_fatal(e, "%ld out of range", n); if(disorder_move(getclient(), argv[0], (int)n)) exit(EXIT_FAILURE); } static void cf_part(char **argv) { char *s; - if(disorder_part(getclient(), &s, argv[0], argv[1], argv[2])) exit(EXIT_FAILURE); - xprintf("%s\n", nullcheck(utf82mb(s))); + if(disorder_part(getclient(), argv[0], argv[1], argv[2], &s)) exit(EXIT_FAILURE); + xprintf("%s\n", nullcheck(utf82mb_f(s))); } static int isarg_filename(const char *s) { return s[0] == '/'; } +#if !_WIN32 static void cf_authorize(char **argv) { authorize(getclient(), argv[0], argv[1]); } +#endif static void cf_resolve(char **argv) { char *track; - if(disorder_resolve(getclient(), &track, argv[0])) exit(EXIT_FAILURE); - xprintf("%s\n", nullcheck(utf82mb(track))); + if(disorder_resolve(getclient(), argv[0], &track)) exit(EXIT_FAILURE); + xprintf("%s\n", nullcheck(utf82mb_f(track))); } static void cf_pause(char attribute((unused)) **argv) { @@ -384,7 +417,7 @@ static void cf_get_global(char **argv) { char *value; if(disorder_get_global(getclient(), argv[0], &value)) exit(EXIT_FAILURE); - xprintf("%s\n", nullcheck(utf82mb(value))); + xprintf("%s\n", nullcheck(utf82mb_f(value))); } static void cf_set_global(char **argv) { @@ -408,7 +441,7 @@ static int isarg_integer(const char *s) { static void cf_new(char **argv) { char **vec; - if(disorder_new_tracks(getclient(), &vec, 0, argv[0] ? atoi(argv[0]) : 0)) + if(disorder_new_tracks(getclient(), argv[0] ? atol(argv[0]) : 0, &vec, 0)) exit(EXIT_FAILURE); while(*vec) xprintf("%s\n", nullcheck(utf82mb(*vec++))); @@ -445,7 +478,7 @@ static void cf_userinfo(char **argv) { if(disorder_userinfo(getclient(), argv[0], argv[1], &s)) exit(EXIT_FAILURE); - xprintf("%s\n", nullcheck(utf82mb(s))); + xprintf("%s\n", nullcheck(utf82mb_f(s))); } static int isarg_option(const char *arg) { @@ -467,7 +500,7 @@ static const struct option setup_guest_options[] = { { 0, 0, 0, 0 } }; -static void help_setup_guest(void) { +static void attribute((noreturn)) help_setup_guest(void) { xprintf("Usage:\n" " disorder setup-guest [OPTIONS]\n" "Options:\n" @@ -487,19 +520,25 @@ static void cf_setup_guest(char **argv) { case 'h': help_setup_guest(); case 'r': online_registration = 1; break; case 'R': online_registration = 0; break; - default: fatal(0, "invalid option"); + default: disorder_fatal(0, "invalid option"); } } if(online_registration && !config->mail_sender) - fatal(0, "you MUST set mail_sender if you want online registration"); + disorder_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); } +/** @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; }; @@ -573,31 +612,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); } @@ -608,11 +643,14 @@ static void cf_adopt(char **argv) { static void cf_playlists(char attribute((unused)) **argv) { char **vec; + int nvec; + int n; - if(disorder_playlists(getclient(), &vec, 0)) + if(disorder_playlists(getclient(), &vec, &nvec)) exit(EXIT_FAILURE); - while(*vec) - xprintf("%s\n", nullcheck(utf82mb(*vec++))); + for(n = 0; n < nvec; ++n) + xprintf("%s\n", nullcheck(utf82mb(vec[n]))); + free_strings(nvec, vec); } static void cf_playlist_del(char **argv) { @@ -622,11 +660,14 @@ static void cf_playlist_del(char **argv) { static void cf_playlist_get(char **argv) { char **vec; + int nvec; + int n; - if(disorder_playlist_get(getclient(), argv[0], &vec, 0)) + if(disorder_playlist_get(getclient(), argv[0], &vec, &nvec)) exit(EXIT_FAILURE); - while(*vec) - xprintf("%s\n", nullcheck(utf82mb(*vec++))); + for(n = 0; n < nvec; ++n) + xprintf("%s\n", nullcheck(utf82mb(vec[n]))); + free_strings(nvec, vec); } static void cf_playlist_set(char **argv) { @@ -638,7 +679,7 @@ static void cf_playlist_set(char **argv) { if(argv[1]) { // Read track list from file if(!(input = fopen(argv[1], "r"))) - fatal(errno, "opening %s", argv[1]); + disorder_fatal(errno, "opening %s", argv[1]); tag = argv[1]; } else { // Read track list from standard input @@ -652,7 +693,7 @@ static void cf_playlist_set(char **argv) { vector_append(v, l); } if(ferror(input)) - fatal(errno, "reading %s", tag); + disorder_fatal(errno, "reading %s", tag); if(input != stdin) fclose(input); if(disorder_playlist_lock(getclient(), argv[0]) @@ -661,12 +702,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" }, @@ -674,8 +731,10 @@ static const struct command { "Adopt a randomly picked track" }, { "allfiles", 1, 2, cf_allfiles, isarg_regexp, "DIR [~REGEXP]", "List all files and directories in DIR" }, +#if !_WIN32 { "authorize", 1, 2, cf_authorize, isarg_rights, "USERNAME [RIGHTS]", "Authorize user USERNAME to connect" }, +#endif { "deluser", 1, 1, cf_deluser, 0, "USERNAME", "Delete user USERNAME" }, { "dirs", 1, 2, cf_dirs, isarg_regexp, "DIR [~REGEXP]", @@ -787,7 +846,7 @@ static const struct command { "Display the server version" }, }; -static void help_commands(void) { +static void attribute((noreturn)) help_commands(void) { unsigned n, max = 0, l; xprintf("Command summary:\n"); @@ -814,81 +873,64 @@ static void help_commands(void) { exit(0); } -static void wait_for_root(void) { - const char *password; - - while(!trackdb_readable()) { - 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; - info("waiting for root user to be created..."); - sleep(1); - } - trackdb_deinit(); -} - 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(); + network_init(); /* garbage-collect PCRE's memory */ - pcre_malloc = xmalloc; - pcre_free = xfree; - if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale"); - if(!setlocale(LC_TIME, "")) fatal(errno, "error calling setlocale"); - while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:W", options, 0)) >= 0) { + regexp_setup(); + 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:dHlu:", options, 0)) >= 0) { switch(n) { case 'h': help(); case 'H': help_commands(); case 'V': version("disorder"); case 'c': configfile = optarg; break; + case 'u': userconfigfile = 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; - case 'W': wfr = 1; break; - default: fatal(0, "invalid option"); + case 'U': user = optarg; break; + case 'P': password = optarg; break; + default: disorder_fatal(0, "invalid option"); } } - if(config_read(0, NULL)) fatal(0, "cannot read configuration"); + if(config_read(0, NULL)) disorder_fatal(0, "cannot read configuration"); if(user) { - config->username = user; + xfree(config->username); + config->username = xstrdup(user); config->password = 0; } - if(password) - config->password = password; + if(password) { + xfree(config->password); + config->password = xstrdup(password); + } 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) - fatal(0, "unknown command '%s'", argv[n]); + disorder_fatal(0, "unknown command '%s'", argv[n]); if(n + commands[i].min >= argc) - fatal(0, "missing arguments to '%s'", argv[n]); + disorder_fatal(0, "missing arguments to '%s'", argv[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]); + vector_append(&args, xstrdup(argv[n])); n++; for(j = 0; j < commands[i].min; ++j) vector_append(&args, nullcheck(mb2utf8(argv[n + j]))); @@ -898,10 +940,13 @@ int main(int argc, char **argv) { vector_append(&args, nullcheck(mb2utf8(argv[n + j]))); vector_terminate(&args); commands[i].fn(args.vec + 1); + vector_clear(&args); n += j; } if(client && disorder_close(client)) exit(EXIT_FAILURE); - if(fclose(stdout) < 0) fatal(errno, "error closing stdout"); + if(fclose(stdout) < 0) disorder_fatal(errno, "error closing stdout"); + config_free(config); + xfree(client); return status; }