Windows support for command line client

[disorder] / clients / disorder.c

diff --git a/clients/disorder.c b/clients/disorder.c
index 36af9f5eed5cbf44c019e7962a74ad6cbc5203bf..7bc2f27f838542bced4f627f0da763ae5e702f02 100644 (file)
--- a/clients/disorder.c
+++ b/clients/disorder.c
@@ -52,7 +52,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 +62,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 +138,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 +210,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 +331,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);
 }
@@ -363,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;
@@ -629,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);
 }
@@ -645,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);
 }
@@ -714,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]",
@@ -861,6 +880,7 @@ int main(int argc, char **argv) {
   const char *user = 0, *password = 0;
 
   mem_init();
+  network_init();
 #if HAVE_PCRE_H
   /* garbage-collect PCRE's memory */
   pcre_malloc = xmalloc;