/*
* 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
#include <getopt.h>
#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#if HAVE_SYS_UN_H
+# include <sys/un.h>
+#endif
#include <errno.h>
#include <locale.h>
#include <time.h>
#include <stddef.h>
-#include <unistd.h>
-#include <pcre.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include <ctype.h>
-#include <gcrypt.h>
-#include <langinfo.h>
+#if HAVE_GCRYPT_H
+# include <gcrypt.h>
+#endif
+#if HAVE_LANGINFO_H
+# include <langinfo.h>
+#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"
#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;
{ "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);
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) {
}
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) {
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"
}
static void cf_dirs(char **argv) {
- cf_somelist(argv, disorder_directories);
+ cf_somelist(argv, disorder_dirs);
}
static void cf_files(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) {
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) {
}
static void cf_log(char attribute((unused)) **argv) {
+ setvbuf(stdout, 0, _IOLBF, BUFSIZ);
if(disorder_log(getclient(), sink_stdio("stdout", stdout))) 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);
+ if(disorder_part(getclient(), argv[0], argv[1], argv[2], &s)) exit(EXIT_FAILURE);
xprintf("%s\n", nullcheck(utf82mb_f(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);
+ if(disorder_resolve(getclient(), argv[0], &track)) exit(EXIT_FAILURE);
xprintf("%s\n", nullcheck(utf82mb_f(track)));
}
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++)));
{ 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"
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;
};
}
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);
}
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) {
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) {
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" },
"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]",
"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");
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();
+ network_init();
/* garbage-collect PCRE's memory */
- pcre_malloc = xmalloc;
- pcre_free = xfree;
+ 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:dHlNu:p:W", options, 0)) >= 0) {
+ 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;
+ case 'U': user = optarg; break;
+ case 'P': password = optarg; break;
default: disorder_fatal(0, "invalid option");
}
}
}
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)
~mdw / disorder / blobdiff