X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/bcef8d6fc5b847e912275ddad1d001a336ccdbc9..af52ec8453e492e8a366c77cb63fba1989380c9f:/clients/disorder.c diff --git a/clients/disorder.c b/clients/disorder.c index 7966dbc..6aa12c4 100644 --- a/clients/disorder.c +++ b/clients/disorder.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004-2012 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,7 +59,9 @@ #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" @@ -62,22 +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' }, + { "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); @@ -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) { @@ -190,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" @@ -307,9 +330,10 @@ 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, &nvec)) exit(EXIT_FAILURE); - for(int n = 0; n < nvec; ++n) + for(n = 0; n < nvec; ++n) xprintf("%s\n", nullcheck(utf82mb(vec[n]))); free_strings(nvec, vec); } @@ -326,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); } @@ -351,9 +376,11 @@ 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; @@ -473,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" @@ -617,10 +644,11 @@ 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, &nvec)) exit(EXIT_FAILURE); - for(int n = 0; n < nvec; ++n) + for(n = 0; n < nvec; ++n) xprintf("%s\n", nullcheck(utf82mb(vec[n]))); free_strings(nvec, vec); } @@ -633,10 +661,11 @@ 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, &nvec)) exit(EXIT_FAILURE); - for(int n = 0; n < nvec; ++n) + for(n = 0; n < nvec; ++n) xprintf("%s\n", nullcheck(utf82mb(vec[n]))); free_strings(nvec, vec); } @@ -702,8 +731,10 @@ static const struct client_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]", @@ -815,7 +846,7 @@ static const struct client_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"); @@ -849,22 +880,23 @@ int main(int argc, char **argv) { 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:", 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 'U': user = optarg; break; + case 'P': password = optarg; break; default: disorder_fatal(0, "invalid option"); } } @@ -882,11 +914,13 @@ int main(int argc, char **argv) { config->connect.af = -1; 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)