X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/6961095b797229842e1465ff3670625d11e95167..c7e016d34b8f0429c0cd9e5366625fdf83776297:/clients/disorder.c diff --git a/clients/disorder.c b/clients/disorder.c index b401c62..a96a059 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,24 +23,36 @@ #include #include -#include -#include +#if HAVE_SYS_SOCKET_H +# include +#endif +#if HAVE_SYS_UN_H +# include +#endif #include #include #include #include -#include +#if HAVE_UNISTD_H +# include +#endif #include #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 +60,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; @@ -67,7 +80,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 } }; @@ -124,7 +136,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) { @@ -192,6 +208,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" @@ -309,9 +329,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); } @@ -353,9 +374,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; @@ -619,10 +642,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); } @@ -635,10 +659,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); } @@ -704,8 +729,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]", @@ -844,39 +871,20 @@ 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(); + network_init(); /* garbage-collect PCRE's memory */ pcre_malloc = xmalloc; pcre_free = xfree; 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(); @@ -887,7 +895,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"); } } @@ -903,15 +910,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)