protogen: factor out some common code.

diff --git a/lib/client-stubs.c b/lib/client-stubs.c
index cf5916ff44d6e44efed68893545b96ea91807611..b6bc8e2716cb71955c1195a62796fd8c80786dcb 100644 (file)
--- a/lib/client-stubs.c
+++ b/lib/client-stubs.c
@@ -39,31 +39,19 @@ int disorder_allfiles(disorder_client *c, const char *dir, const char *re, char
 }
 
 int disorder_confirm(disorder_client *c, const char *confirmation) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "confirm", confirmation, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "confirm", confirmation, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "confirm");
-    return -1;
-  }
   c->user = v[0];
   return 0;
 }
 
 int disorder_cookie(disorder_client *c, const char *cookie) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "cookie", cookie, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "cookie", cookie, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "cookie");
-    return -1;
-  }
   c->user = v[0];
   return 0;
 }
@@ -94,32 +82,20 @@ int disorder_enable(disorder_client *c) {
 }
 
 int disorder_enabled(disorder_client *c, int *enabledp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "enabled", (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "enabled", (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "enabled");
-    return -1;
-  }
   if(boolean("enabled", v[0], enabledp))
     return -1;
   return 0;
 }
 
 int disorder_exists(disorder_client *c, const char *track, int *existsp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "exists", track, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "exists", track, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "exists");
-    return -1;
-  }
   if(boolean("exists", v[0], existsp))
     return -1;
   return 0;
@@ -135,61 +111,37 @@ int disorder_files(disorder_client *c, const char *dir, const char *re, char ***
 }
 
 int disorder_get(disorder_client *c, const char *track, const char *pref, char **valuep) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "get", track, pref, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "get", track, pref, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "get");
-    return -1;
-  }
   *valuep = v[0];
   return 0;
 }
 
 int disorder_get_global(disorder_client *c, const char *pref, char **valuep) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "get-global", pref, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "get-global", pref, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "get-global");
-    return -1;
-  }
   *valuep = v[0];
   return 0;
 }
 
 int disorder_length(disorder_client *c, const char *track, long *lengthp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "length", track, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "length", track, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "length");
-    return -1;
-  }
   *lengthp = atol(v[0]);
   return 0;
 }
 
 int disorder_make_cookie(disorder_client *c, char **cookiep) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "make-cookie", (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "make-cookie", (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "make-cookie");
-    return -1;
-  }
   *cookiep = v[0];
   return 0;
 }
@@ -220,16 +172,10 @@ int disorder_nop(disorder_client *c) {
 }
 
 int disorder_part(disorder_client *c, const char *track, const char *context, const char *part, char **partp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "part", track, context, part, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "part", track, context, part, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "part");
-    return -1;
-  }
   *partp = v[0];
   return 0;
 }
@@ -314,16 +260,10 @@ int disorder_random_enable(disorder_client *c) {
 }
 
 int disorder_random_enabled(disorder_client *c, int *enabledp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "random-enabled", (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "random-enabled", (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "random-enabled");
-    return -1;
-  }
   if(boolean("random-enabled", v[0], enabledp))
     return -1;
   return 0;
@@ -343,16 +283,10 @@ int disorder_reconfigure(disorder_client *c) {
 }
 
 int disorder_register(disorder_client *c, const char *username, const char *password, const char *email, char **confirmationp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "register", username, password, email, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "register", username, password, email, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "register");
-    return -1;
-  }
   *confirmationp = v[0];
   return 0;
 }
@@ -370,16 +304,10 @@ int disorder_rescan(disorder_client *c) {
 }
 
 int disorder_resolve(disorder_client *c, const char *track, char **resolvedp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "resolve", track, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "resolve", track, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "resolve");
-    return -1;
-  }
   *resolvedp = v[0];
   return 0;
 }
@@ -393,16 +321,10 @@ int disorder_revoke(disorder_client *c) {
 }
 
 int disorder_rtp_address(disorder_client *c, char **addressp, char **portp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "rtp-address", (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 2, "rtp-address", (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 2) {
-    disorder_error(0, "malformed reply to %s", "rtp-address");
-    return -1;
-  }
   *addressp = v[0];
   *portp = v[1];
   return 0;
@@ -495,16 +417,10 @@ int disorder_unset_global(disorder_client *c, const char *pref) {
 }
 
 int disorder_userinfo(disorder_client *c, const char *username, const char *property, char **valuep) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "userinfo", username, property, (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "userinfo", username, property, (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "userinfo");
-    return -1;
-  }
   *valuep = v[0];
   return 0;
 }
@@ -519,16 +435,10 @@ int disorder_users(disorder_client *c, char ***usersp, int *nusersp) {
 }
 
 int disorder_version(disorder_client *c, char **versionp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "version", (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 1, "version", (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 1) {
-    disorder_error(0, "malformed reply to %s", "version");
-    return -1;
-  }
   *versionp = v[0];
   return 0;
 }
@@ -542,16 +452,10 @@ int disorder_set_volume(disorder_client *c, long left, long right) {
 }
 
 int disorder_get_volume(disorder_client *c, long *leftp, long *rightp) {
-  char **v, *r;
-  int nv;
-  int rc = disorder_simple(c, &r, "volume", (char *)NULL);
+  char **v;
+  int nv, rc = disorder_simple_split(c, &v, &nv, 2, "volume", (char *)NULL);
   if(rc)
     return rc;
-  v = split(r, &nv, SPLIT_QUOTES, 0, 0);
-  if(nv != 2) {
-    disorder_error(0, "malformed reply to %s", "volume");
-    return -1;
-  }
   *leftp = atol(v[0]);
   *rightp = atol(v[1]);
   return 0;

diff --git a/lib/client.c b/lib/client.c
index 0fdb8bee09a4ec6176703378c7218efa71c929ac..9f350d8e3614900c7bff428f40b06752774e0cfa 100644 (file)
--- a/lib/client.c
+++ b/lib/client.c
@@ -285,6 +285,59 @@ static int disorder_simple(disorder_client *c,
   return ret;
 }
 
+/** @brief Issue a command and split the response
+ * @param c Client
+ * @param vecp Where to store results
+ * @param nvecp Where to store count of results
+ * @param expected Expected count (or -1 to not check)
+ * @param cmd Command
+ * @return 0 on success, non-0 on error
+ *
+ * The remaining arguments are command arguments, terminated by (char
+ * *)0.  They should be in UTF-8.
+ *
+ * 5xx responses count as errors.
+ *
+ * @p rp will NOT be filled in for xx9 responses (where it is just
+ * commentary for a command where it would normally be meaningful).
+ *
+ * NB that the response will NOT be converted to the local encoding
+ * nor will quotes be stripped.  See dequote().
+ */
+static int disorder_simple_split(disorder_client *c,
+                                char ***vecp,
+                                int *nvecp,
+                                int expected,
+                                const char *cmd, ...) {
+  va_list ap;
+  int ret;
+  char *r;
+  char **vec;
+  int nvec;
+
+  va_start(ap, cmd);
+  ret = disorder_simple_v(c, &r, cmd, ap);
+  va_end(ap);
+  if(!ret) {
+    vec = split(r, &nvec, SPLIT_QUOTES, 0, 0);
+    xfree(r);
+    if(expected < 0 || nvec == expected) {
+      *vecp = vec;
+      *nvecp = nvec;
+    } else {
+      disorder_error(0, "malformed reply to %s", cmd);
+      c->last = "malformed reply";
+      ret = -1;
+      free_strings(nvec, vec);
+    }
+  }
+  if(ret) {
+    *vecp = NULL;
+    *nvecp = 0;
+  }
+  return ret;
+}
+
 /** @brief Dequote a result string
  * @param rc 0 on success, non-0 on error
  * @param rp Where result string is stored (UTF-8)

diff --git a/scripts/protocol b/scripts/protocol
index 13c9f3ccf7ba007cb74251bf83aa0c49afdd26a1..39b7dd5c7e48430bd9cf940f01ab1739c09fb6fb 100755 (executable)
--- a/scripts/protocol
+++ b/scripts/protocol
@@ -262,7 +262,7 @@ sub simple {
                   "(char *)NULL"),
              ");\n");
     } else {
-        my $split = 0;
+        my $expected = 0;
         for(my $n = 0; $n < scalar @$returns; ++$n) {
             my $return = $returns->[$n];
             my $type = $return->[0];
@@ -272,32 +272,36 @@ sub simple {
                or $type eq 'integer'
                or $type eq 'time'
                or $type eq 'user') {
-                $split = 1;
+               ++$expected;
             }
         }
-        if($split) {
-            push(@c, "  char **v, *r;\n",
-                 "  int nv;\n");
-        }
-        push(@c, 
-             "  int rc = disorder_simple(",
-             join(", ",
-                  "c",
-                  $split ? "&r" : "NULL",
-                  "\"$cmd\"",
-                  @cargs,
-                  "(char *)NULL"),
-             ");\n",
-             "  if(rc)\n",
-             "    return rc;\n");
-        if($split) {
-            push(@c,
-                 "  v = split(r, &nv, SPLIT_QUOTES, 0, 0);\n",
-                 "  if(nv != ", scalar @$returns, ") {\n",
-                 "    disorder_error(0, \"malformed reply to %s\", \"$cmd\");\n",
-                 "    return -1;\n",
-                 "  }\n");
-        }
+        if($expected) {
+            push(@c, "  char **v;\n",
+                "  int nv, rc = disorder_simple_split(",
+                join(", ",
+                     "c",
+                     "&v",
+                     "&nv",
+                     $expected,
+                     "\"$cmd\"",
+                     @cargs,
+                     "(char *)NULL"),
+                ");\n",
+                "  if(rc)\n",
+                "    return rc;\n");
+        } else {
+           push(@c,
+                "  int rc = disorder_simple(",
+                join(", ",
+                     "c",
+                     "NULL",
+                     "\"$cmd\"",
+                     @cargs,
+                     "(char *)NULL"),
+                ");\n",
+                "  if(rc)\n",
+                "    return rc;\n");
+       }
         for(my $n = 0; $n < scalar @$returns; ++$n) {
             my $return = $returns->[$n];
             my $type = $return->[0];