X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/05b3f1f69c02a260bb8315dcedd60d35daf1875c..dccba97280ab05682de4a7d0f030e6eb533a2b75:/clients/disorder.c

diff --git a/clients/disorder.c b/clients/disorder.c
index 949eacf..dc86a65 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"
@@ -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"
@@ -364,9 +373,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;
@@ -717,8 +728,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]",
@@ -864,11 +877,9 @@ 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) {