X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/eb5dc014179415a0e5476e986519ac96c36221f9..eabdb9b95f23dcb79cbdde96f1544f430acddb8b:/clients/disorder.c

diff --git a/clients/disorder.c b/clients/disorder.c
index 215ec0c..caeac18 100644
--- a/clients/disorder.c
+++ b/clients/disorder.c
@@ -53,8 +53,9 @@
 #include "defs.h"
 #include "authorize.h"
 #include "vector.h"
+#include "version.h"
 
-static int auto_reconfigure;
+static disorder_client *client;
 
 static const struct option options[] = {
   { "help", no_argument, 0, 'h' },
@@ -84,18 +85,18 @@ static void help(void) {
   exit(0);
 }
 
-/* display version number and terminate */
-static void version(void) {
-  xprintf("%s", disorder_version_string);
-  xfclose(stdout);
-  exit(0);
+static disorder_client *getclient(void) {
+  if(!client) {
+    if(!(client = disorder_new(1))) exit(EXIT_FAILURE);
+    if(disorder_connect(client)) exit(EXIT_FAILURE);
+  }
+  return client;
 }
 
-static void cf_version(disorder_client *c,
-		       char attribute((unused)) **argv) {
+static void cf_version(char attribute((unused)) **argv) {
   char *v;
 
-  if(disorder_version(c, &v)) exit(EXIT_FAILURE);
+  if(disorder_version(getclient(), &v)) exit(EXIT_FAILURE);
   xprintf("%s\n", nullcheck(utf82mb(v)));
 }
 
@@ -114,78 +115,71 @@ static void print_queue_entry(const struct queue_entry *q) {
   if(q->wstat) xprintf("  %s\n", wstat(q->wstat));
 }
 
-static void cf_playing(disorder_client *c,
-		       char attribute((unused)) **argv) {
+static void cf_playing(char attribute((unused)) **argv) {
   struct queue_entry *q;
 
-  if(disorder_playing(c, &q)) exit(EXIT_FAILURE);
+  if(disorder_playing(getclient(), &q)) exit(EXIT_FAILURE);
   if(q)
     print_queue_entry(q);
   else
     xprintf("nothing\n");
 }
 
-static void cf_play(disorder_client *c, char **argv) {
+static void cf_play(char **argv) {
   while(*argv)
-    if(disorder_play(c, *argv++)) exit(EXIT_FAILURE);
+    if(disorder_play(getclient(), *argv++)) exit(EXIT_FAILURE);
 }
 
-static void cf_remove(disorder_client *c, char **argv) {
-  if(disorder_remove(c, argv[0])) exit(EXIT_FAILURE);
+static void cf_remove(char **argv) {
+  if(disorder_remove(getclient(), argv[0])) exit(EXIT_FAILURE);
 }
 
-static void cf_disable(disorder_client *c,
-		       char attribute((unused)) **argv) {
-  if(disorder_disable(c)) exit(EXIT_FAILURE);
+static void cf_disable(char attribute((unused)) **argv) {
+  if(disorder_disable(getclient())) exit(EXIT_FAILURE);
 }
 
-static void cf_enable(disorder_client *c, char attribute((unused)) **argv) {
-  if(disorder_enable(c)) exit(EXIT_FAILURE);
+static void cf_enable(char attribute((unused)) **argv) {
+  if(disorder_enable(getclient())) exit(EXIT_FAILURE);
 }
 
-static void cf_scratch(disorder_client *c,
-		       char **argv) {
-  if(disorder_scratch(c, argv[0])) exit(EXIT_FAILURE);
+static void cf_scratch(char **argv) {
+  if(disorder_scratch(getclient(), argv[0])) exit(EXIT_FAILURE);
 }
 
-static void cf_shutdown(disorder_client *c,
-			char attribute((unused)) **argv) {
-  if(disorder_shutdown(c)) exit(EXIT_FAILURE);
+static void cf_shutdown(char attribute((unused)) **argv) {
+  if(disorder_shutdown(getclient())) exit(EXIT_FAILURE);
 }
 
-static void cf_reconfigure(disorder_client *c,
-			   char attribute((unused)) **argv) {
+static void cf_reconfigure(char attribute((unused)) **argv) {
   /* Re-check configuration for server */
   if(config_read(1)) fatal(0, "cannot read configuration");
-  if(disorder_reconfigure(c)) exit(EXIT_FAILURE);
+  if(disorder_reconfigure(getclient())) exit(EXIT_FAILURE);
 }
 
-static void cf_rescan(disorder_client *c, char attribute((unused)) **argv) {
-  if(disorder_rescan(c)) exit(EXIT_FAILURE);
+static void cf_rescan(char attribute((unused)) **argv) {
+  if(disorder_rescan(getclient())) exit(EXIT_FAILURE);
 }
 
-static void cf_somequeue(disorder_client *c,
-			 int (*fn)(disorder_client *c,
+static void cf_somequeue(int (*fn)(disorder_client *c,
 				   struct queue_entry **qp)) {
   struct queue_entry *q;
 
-  if(fn(c, &q)) exit(EXIT_FAILURE);
+  if(fn(getclient(), &q)) exit(EXIT_FAILURE);
   while(q) {
     print_queue_entry(q);
     q = q->next;
   }
 }
 
-static void cf_recent(disorder_client *c, char attribute((unused)) **argv) {
-  cf_somequeue(c, disorder_recent);
+static void cf_recent(char attribute((unused)) **argv) {
+  cf_somequeue(disorder_recent);
 }
 
-static void cf_queue(disorder_client *c, char attribute((unused)) **argv) {
-  cf_somequeue(c, disorder_queue);
+static void cf_queue(char attribute((unused)) **argv) {
+  cf_somequeue(disorder_queue);
 }
 
-static void cf_quack(disorder_client attribute((unused)) *c,
-		     char attribute((unused)) **argv) {
+static void cf_quack(char attribute((unused)) **argv) {
   xprintf("\n"
 	  " .------------------.\n"
 	  " | Naath is a babe! |\n"
@@ -197,7 +191,7 @@ static void cf_quack(disorder_client attribute((unused)) *c,
 	  "\n");
 }
 
-static void cf_somelist(disorder_client *c, char **argv,
+static void cf_somelist(char **argv,
 			int (*fn)(disorder_client *c,
 				  const char *arg, const char *re,
 				  char ***vecp, int *nvecp)) {
@@ -208,7 +202,7 @@ static void cf_somelist(disorder_client *c, char **argv,
     re = xstrdup(argv[1] + 1);
   else
     re = 0;
-  if(fn(c, argv[0], re, &vec, 0)) exit(EXIT_FAILURE);
+  if(fn(getclient(), argv[0], re, &vec, 0)) exit(EXIT_FAILURE);
   while(*vec)
     xprintf("%s\n", nullcheck(utf82mb(*vec++)));
 }
@@ -217,103 +211,90 @@ static int isarg_regexp(const char *s) {
   return s[0] == '~';
 }
 
-static void cf_dirs(disorder_client *c,
-		    char **argv) {
-  cf_somelist(c, argv, disorder_directories);
+static void cf_dirs(char **argv) {
+  cf_somelist(argv, disorder_directories);
 }
 
-static void cf_files(disorder_client *c, char **argv) {
-  cf_somelist(c, argv, disorder_files);
+static void cf_files(char **argv) {
+  cf_somelist(argv, disorder_files);
 }
 
-static void cf_allfiles(disorder_client *c, char **argv) {
-  cf_somelist(c, argv, disorder_allfiles);
+static void cf_allfiles(char **argv) {
+  cf_somelist(argv, disorder_allfiles);
 }
 
-static void cf_get(disorder_client *c, char **argv) {
+static void cf_get(char **argv) {
   char *value;
 
-  if(disorder_get(c, argv[0], argv[1], &value)) exit(EXIT_FAILURE);
+  if(disorder_get(getclient(), argv[0], argv[1], &value)) exit(EXIT_FAILURE);
   xprintf("%s\n", nullcheck(utf82mb(value)));
 }
 
-static void cf_length(disorder_client *c, char **argv) {
+static void cf_length(char **argv) {
   long length;
 
-  if(disorder_length(c, argv[0], &length)) exit(EXIT_FAILURE);
+  if(disorder_length(getclient(), argv[0], &length)) exit(EXIT_FAILURE);
   xprintf("%ld\n", length);
 }
 
-static void cf_set(disorder_client *c, char **argv) {
-  if(disorder_set(c, argv[0], argv[1], argv[2])) exit(EXIT_FAILURE);
+static void cf_set(char **argv) {
+  if(disorder_set(getclient(), argv[0], argv[1], argv[2])) exit(EXIT_FAILURE);
 }
 
-static void cf_unset(disorder_client *c, char **argv) {
-  if(disorder_unset(c, argv[0], argv[1])) exit(EXIT_FAILURE);
+static void cf_unset(char **argv) {
+  if(disorder_unset(getclient(), argv[0], argv[1])) exit(EXIT_FAILURE);
 }
 
-static void cf_prefs(disorder_client *c, char **argv) {
+static void cf_prefs(char **argv) {
   struct kvp *k;
 
-  if(disorder_prefs(c, argv[0], &k)) exit(EXIT_FAILURE);
+  if(disorder_prefs(getclient(), argv[0], &k)) exit(EXIT_FAILURE);
   for(; k; k = k->next)
     xprintf("%s = %s\n",
 	    nullcheck(utf82mb(k->name)), nullcheck(utf82mb(k->value)));
 }
 
-static void cf_search(disorder_client *c, char **argv) {
+static void cf_search(char **argv) {
   char **results;
   int nresults, n;
 
-  if(disorder_search(c, *argv, &results, &nresults)) exit(EXIT_FAILURE);
+  if(disorder_search(getclient(), *argv, &results, &nresults)) exit(EXIT_FAILURE);
   for(n = 0; n < nresults; ++n)
     xprintf("%s\n", nullcheck(utf82mb(results[n])));
 }
 
-static void cf_random_disable(disorder_client *c,
-			      char attribute((unused)) **argv) {
-  if(disorder_random_disable(c)) exit(EXIT_FAILURE);
+static void cf_random_disable(char attribute((unused)) **argv) {
+  if(disorder_random_disable(getclient())) exit(EXIT_FAILURE);
 }
 
-static void cf_random_enable(disorder_client *c,
-			     char attribute((unused)) **argv) {
-  if(disorder_random_enable(c)) exit(EXIT_FAILURE);
+static void cf_random_enable(char attribute((unused)) **argv) {
+  if(disorder_random_enable(getclient())) exit(EXIT_FAILURE);
 }
 
-static void cf_stats(disorder_client *c,
-		     char attribute((unused)) **argv) {
+static void cf_stats(char attribute((unused)) **argv) {
   char **vec;
 
-  if(disorder_stats(c, &vec, 0)) exit(EXIT_FAILURE);
+  if(disorder_stats(getclient(), &vec, 0)) exit(EXIT_FAILURE);
   while(*vec)
       xprintf("%s\n", nullcheck(utf82mb(*vec++)));
 }
 
-static void cf_get_volume(disorder_client *c,
-			  char attribute((unused)) **argv) {
+static void cf_get_volume(char attribute((unused)) **argv) {
   int l, r;
 
-  if(disorder_get_volume(c, &l, &r)) exit(EXIT_FAILURE);
+  if(disorder_get_volume(getclient(), &l, &r)) exit(EXIT_FAILURE);
   xprintf("%d %d\n", l, r);
 }
 
-static void cf_set_volume(disorder_client *c,
-			  char **argv) {
-  if(disorder_set_volume(c, atoi(argv[0]), atoi(argv[1]))) exit(EXIT_FAILURE);
+static void cf_set_volume(char **argv) {
+  if(disorder_set_volume(getclient(), atoi(argv[0]), atoi(argv[1]))) exit(EXIT_FAILURE);
 }
 
-static void cf_become(disorder_client *c,
-		      char **argv) {
-  if(disorder_become(c, argv[0])) exit(EXIT_FAILURE);
+static void cf_log(char attribute((unused)) **argv) {
+  if(disorder_log(getclient(), sink_stdio("stdout", stdout))) exit(EXIT_FAILURE);
 }
 
-static void cf_log(disorder_client *c,
-		   char attribute((unused)) **argv) {
-  if(disorder_log(c, sink_stdio("stdout", stdout))) exit(EXIT_FAILURE);
-}
-
-static void cf_move(disorder_client *c,
-		   char **argv) {
+static void cf_move(char **argv) {
   long n;
   int e;
   
@@ -321,14 +302,13 @@ static void cf_move(disorder_client *c,
     fatal(e, "cannot convert '%s'", argv[1]);
   if(n > INT_MAX || n < INT_MIN)
     fatal(e, "%ld out of range", n);
-  if(disorder_move(c, argv[0], (int)n)) exit(EXIT_FAILURE);
+  if(disorder_move(getclient(), argv[0], (int)n)) exit(EXIT_FAILURE);
 }
 
-static void cf_part(disorder_client *c,
-		    char **argv) {
+static void cf_part(char **argv) {
   char *s;
 
-  if(disorder_part(c, &s, argv[0], argv[1], argv[2])) exit(EXIT_FAILURE);
+  if(disorder_part(getclient(), &s, argv[0], argv[1], argv[2])) exit(EXIT_FAILURE);
   xprintf("%s\n", nullcheck(utf82mb(s)));
 }
 
@@ -336,61 +316,54 @@ static int isarg_filename(const char *s) {
   return s[0] == '/';
 }
 
-static void cf_authorize(disorder_client *c,
-			 char **argv) {
-  if(!authorize(c, argv[0]))
-    auto_reconfigure = 1;
+static void cf_authorize(char **argv) {
+  authorize(getclient(), argv[0], argv[1]);
 }
 
-static void cf_resolve(disorder_client *c,
-		       char **argv) {
+static void cf_resolve(char **argv) {
   char *track;
 
-  if(disorder_resolve(c, &track, argv[0])) exit(EXIT_FAILURE);
+  if(disorder_resolve(getclient(), &track, argv[0])) exit(EXIT_FAILURE);
   xprintf("%s\n", nullcheck(utf82mb(track)));
 }
 
-static void cf_pause(disorder_client *c,
-			char attribute((unused)) **argv) {
-  if(disorder_pause(c)) exit(EXIT_FAILURE);
+static void cf_pause(char attribute((unused)) **argv) {
+  if(disorder_pause(getclient())) exit(EXIT_FAILURE);
 }
 
-static void cf_resume(disorder_client *c,
-			char attribute((unused)) **argv) {
-  if(disorder_resume(c)) exit(EXIT_FAILURE);
+static void cf_resume(char attribute((unused)) **argv) {
+  if(disorder_resume(getclient())) exit(EXIT_FAILURE);
 }
 
-static void cf_tags(disorder_client *c,
-		     char attribute((unused)) **argv) {
+static void cf_tags(char attribute((unused)) **argv) {
   char **vec;
 
-  if(disorder_tags(c, &vec, 0)) exit(EXIT_FAILURE);
+  if(disorder_tags(getclient(), &vec, 0)) exit(EXIT_FAILURE);
   while(*vec)
       xprintf("%s\n", nullcheck(utf82mb(*vec++)));
 }
 
-static void cf_users(disorder_client *c,
-		     char attribute((unused)) **argv) {
+static void cf_users(char attribute((unused)) **argv) {
   char **vec;
 
-  if(disorder_users(c, &vec, 0)) exit(EXIT_FAILURE);
+  if(disorder_users(getclient(), &vec, 0)) exit(EXIT_FAILURE);
   while(*vec)
     xprintf("%s\n", nullcheck(utf82mb(*vec++)));
 }
 
-static void cf_get_global(disorder_client *c, char **argv) {
+static void cf_get_global(char **argv) {
   char *value;
 
-  if(disorder_get_global(c, argv[0], &value)) exit(EXIT_FAILURE);
+  if(disorder_get_global(getclient(), argv[0], &value)) exit(EXIT_FAILURE);
   xprintf("%s\n", nullcheck(utf82mb(value)));
 }
 
-static void cf_set_global(disorder_client *c, char **argv) {
-  if(disorder_set_global(c, argv[0], argv[1])) exit(EXIT_FAILURE);
+static void cf_set_global(char **argv) {
+  if(disorder_set_global(getclient(), argv[0], argv[1])) exit(EXIT_FAILURE);
 }
 
-static void cf_unset_global(disorder_client *c, char **argv) {
-  if(disorder_unset_global(c, argv[0])) exit(EXIT_FAILURE);
+static void cf_unset_global(char **argv) {
+  if(disorder_unset_global(getclient(), argv[0])) exit(EXIT_FAILURE);
 }
 
 static int isarg_integer(const char *s) {
@@ -403,60 +376,120 @@ static int isarg_integer(const char *s) {
   return 1;
 }
 
-static void cf_new(disorder_client *c,
-		   char **argv) {
+static void cf_new(char **argv) {
   char **vec;
 
-  if(disorder_new_tracks(c, &vec, 0, argv[0] ? atoi(argv[0]) : 0))
+  if(disorder_new_tracks(getclient(), &vec, 0, argv[0] ? atoi(argv[0]) : 0))
     exit(EXIT_FAILURE);
   while(*vec)
     xprintf("%s\n", nullcheck(utf82mb(*vec++)));
 }
 
-static void cf_rtp_address(disorder_client *c,
-			   char attribute((unused)) **argv) {
+static void cf_rtp_address(char attribute((unused)) **argv) {
   char *address, *port;
 
-  if(disorder_rtp_address(c, &address, &port)) exit(EXIT_FAILURE);
+  if(disorder_rtp_address(getclient(), &address, &port)) exit(EXIT_FAILURE);
   xprintf("address: %s\nport: %s\n", address, port);
 }
 
-static void cf_adduser(disorder_client *c,
-		       char **argv) {
-  if(disorder_adduser(c, argv[0], argv[1]))
+static int isarg_rights(const char *arg) {
+  return strchr(arg, ',') || !parse_rights(arg, 0, 0);
+}
+
+static void cf_adduser(char **argv) {
+  if(disorder_adduser(getclient(), argv[0], argv[1], argv[2]))
     exit(EXIT_FAILURE);
 }
 
-static void cf_edituser(disorder_client *c,
-			char **argv) {
-  if(disorder_edituser(c, argv[0], argv[1], argv[2]))
+static void cf_deluser(char **argv) {
+  if(disorder_deluser(getclient(), argv[0]))
     exit(EXIT_FAILURE);
 }
 
-/* TODO: userinfo */
+static void cf_edituser(char **argv) {
+  if(disorder_edituser(getclient(), argv[0], argv[1], argv[2]))
+    exit(EXIT_FAILURE);
+}
+
+static void cf_userinfo(char **argv) {
+  char *s;
+
+  if(disorder_userinfo(getclient(), argv[0], argv[1], &s))
+    exit(EXIT_FAILURE);
+  xprintf("%s\n", nullcheck(utf82mb(s)));
+}
+
+static int isarg_option(const char *arg) {
+  return arg[0] == '-';
+}
+
+static int argvlen(char **argv) {
+  char **start = argv;
+  
+  while(*argv)
+    ++argv;
+  return argv - start;
+}
+
+static const struct option setup_guest_options[] = {
+  { "help", no_argument, 0, 'h' },
+  { "online-registration", no_argument, 0, 'r' },
+  { "no-online-registration", no_argument, 0, 'R' },
+  { 0, 0, 0, 0 }
+};
+
+static void help_setup_guest(void) {
+  xprintf("Usage:\n"
+	  "  disorder setup-guest [OPTIONS]\n"
+	  "Options:\n"
+	  "  --help, -h                Display usage message\n"
+	  "  --online-registration     Enable online registration (default)\n"
+	  "  --no-online-registration  Disable online registration\n");
+  xfclose(stdout);
+  exit(0);
+}
+
+static void cf_setup_guest(char **argv) {
+  int n, online_registration = 1;
+  
+  while((n = getopt_long(argvlen(argv) + 1, argv - 1,
+			 "hrR", setup_guest_options, 0)) >= 0) {
+    switch(n) {
+    case 'h': help_setup_guest();
+    case 'r': online_registration = 1; break;
+    case 'R': online_registration = 0; break;
+    default: fatal(0, "invalid option");
+    }
+  }
+  if(online_registration && !config->mail_sender)
+    fatal(0, "you MUST set mail_sender if you want online registration");
+  if(disorder_adduser(getclient(), "guest", "",
+		      online_registration ? "read,register" : "read"))
+    exit(EXIT_FAILURE);
+}
 
 static const struct command {
   const char *name;
   int min, max;
-  void (*fn)(disorder_client *c, char **);
+  void (*fn)(char **);
   int (*isarg)(const char *);
   const char *argstr, *desc;
 } commands[] = {
-  { "adduser",        2, 2, cf_adduser, 0, "USER PASSWORD",
+  { "adduser",        2, 3, cf_adduser, isarg_rights, "USER PASSWORD [RIGHTS]",
                       "Create a new user" },
   { "allfiles",       1, 2, cf_allfiles, isarg_regexp, "DIR [~REGEXP]",
                       "List all files and directories in DIR" },
-  { "authorize",      1, 1, cf_authorize, 0, "USER",
+  { "authorize",      1, 2, cf_authorize, isarg_rights, "USER [RIGHTS]",
                       "Authorize USER to connect to the server" },
-  { "become",         1, 1, cf_become, 0, "USER",
-                      "Become user USER" },
+  { "deluser",        1, 1, cf_deluser, 0, "USER",
+                      "Delete a user" },
   { "dirs",           1, 2, cf_dirs, isarg_regexp, "DIR [~REGEXP]",
                       "List directories in DIR" },
   { "disable",        0, 0, cf_disable, 0, "",
                       "Disable play" },
   { "disable-random", 0, 0, cf_random_disable, 0, "",
                       "Disable random play" },
-  { "edituser",       3, 3, cf_edituser, 0, "USER KEY VALUE",
+  { "edituser",       3, 3, cf_edituser, 0, "USER PROPERTY VALUE",
                       "Set a property of a user" },
   { "enable",         0, 0, cf_enable, 0, "",
                       "Enable play" },
@@ -521,6 +554,8 @@ static const struct command {
                       "Set a global preference value" },
   { "set-volume",     2, 2, cf_set_volume, 0, "LEFT RIGHT",
                       "Set the volume" },
+  { "setup-guest",    0, INT_MAX, cf_setup_guest, isarg_option, "[OPTIONS]",
+                      "Create the guest login" },
   { "shutdown",       0, 0, cf_shutdown, 0, "",
                       "Shut down the daemon" },
   { "stats",          0, 0, cf_stats, 0, "",
@@ -531,6 +566,8 @@ static const struct command {
                       "Unset a preference" },
   { "unset-global",   1, 1, cf_unset_global, 0, "NAME",
                       "Unset a global preference" },
+  { "userinfo",       2, 2, cf_userinfo, 0, "USER PROPERTY",
+                      "Get a property of as user" },
   { "users",          0, 0, cf_users, 0, "",
                       "List all users" },
   { "version",        0, 0, cf_version, 0, "",
@@ -566,7 +603,6 @@ static void help_commands(void) {
 
 int main(int argc, char **argv) {
   int n, i, j, local = 0;
-  disorder_client *c = 0;
   int status = 0;
   struct vector args;
   const char *user = 0, *password = 0;
@@ -576,11 +612,11 @@ int main(int argc, char **argv) {
   pcre_malloc = xmalloc;
   pcre_free = xfree;
   if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
-  while((n = getopt_long(argc, argv, "hVc:dHlNu:p:", options, 0)) >= 0) {
+  while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
     case 'H': help_commands();
-    case 'V': version();
+    case 'V': version("disorder");
     case 'c': configfile = optarg; break;
     case 'd': debugging = 1; break;
     case 'l': local = 1; break;
@@ -599,17 +635,19 @@ int main(int argc, char **argv) {
     config->password = password;
   if(local)
     config->connect.n = 0;
-  if(!(c = disorder_new(1))) exit(EXIT_FAILURE);
-  if(disorder_connect(c)) exit(EXIT_FAILURE);
   n = optind;
+  optind = 1;				/* for subsequent getopt calls */
   /* accumulate command args */
   while(n < argc) {
     if((i = TABLE_FIND(commands, struct command, name, argv[n])) < 0)
       fatal(0, "unknown command '%s'", argv[n]);
     if(n + commands[i].min >= argc)
       fatal(0, "missing arguments to '%s'", argv[n]);
-    n++;
     vector_init(&args);
+    /* Include the command name in the args, but at element -1, for
+     * the benefit of subcommand getopt calls */
+    vector_append(&args, argv[n]);
+    n++;
     for(j = 0; j < commands[i].min; ++j)
       vector_append(&args, nullcheck(mb2utf8(argv[n + j])));
     for(; j < commands[i].max
@@ -617,14 +655,10 @@ int main(int argc, char **argv) {
 	  && commands[i].isarg(argv[n + j]); ++j)
       vector_append(&args, nullcheck(mb2utf8(argv[n + j])));
     vector_terminate(&args);
-    commands[i].fn(c, args.vec);
+    commands[i].fn(args.vec + 1);
     n += j;
   }
-  if(auto_reconfigure) {
-    assert(c != 0);
-    if(disorder_reconfigure(c)) exit(EXIT_FAILURE);
-  }
-  if(c && disorder_close(c)) exit(EXIT_FAILURE);
+  if(client && disorder_close(client)) exit(EXIT_FAILURE);
   if(fclose(stdout) < 0) fatal(errno, "error closing stdout");
   return status;
 }