X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/cca89d7ce589d10a226c6dfa212e36cbcad25fd2..cd1d988313c718929bfffe0936a7123eac27c7d5:/clients/disorder.c

diff --git a/clients/disorder.c b/clients/disorder.c
index 36af9f5..c7672fb 100644
--- a/clients/disorder.c
+++ b/clients/disorder.c
@@ -36,9 +36,6 @@
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#if HAVE_PCRE_H
-# include <pcre.h>
-#endif
 #include <ctype.h>
 #if HAVE_GCRYPT_H
 # include <gcrypt.h>
@@ -52,7 +49,9 @@
 #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"
@@ -60,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"
@@ -76,13 +77,13 @@ static const struct option options[] = {
   { "local", no_argument, 0, 'l' },
   { "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"
@@ -134,7 +135,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) {
@@ -202,6 +207,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"
@@ -319,9 +328,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);
 }
@@ -338,6 +348,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);
 }
 
@@ -363,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;
@@ -485,7 +498,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"
@@ -629,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);
 }
@@ -645,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);
 }
@@ -714,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]",
@@ -827,7 +844,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");
@@ -861,14 +878,12 @@ int main(int argc, char **argv) {
   const char *user = 0, *password = 0;
 
   mem_init();
-#if HAVE_PCRE_H
+  network_init();
   /* garbage-collect PCRE's memory */
-  pcre_malloc = xmalloc;
-  pcre_free = xfree;
-#endif
+  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:dHl", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
     case 'H': help_commands();
@@ -877,8 +892,8 @@ int main(int argc, char **argv) {
     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");
     }
   }