X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/eff6238fcaa690773dc292816fa47b8767efa00c..c12575c6cea802f894df6ca8b04c1b3656496592:/lib/client-stubs.c

diff --git a/lib/client-stubs.c b/lib/client-stubs.c
index 92dd3e2..310505a 100644
--- a/lib/client-stubs.c
+++ b/lib/client-stubs.c
@@ -22,132 +22,228 @@
  */
 
 int disorder_adopt(disorder_client *c, const char *id) {
-  return disorder_simple(c, 0, "adopt", id, (char *)0);
+  return disorder_simple(c, NULL, "adopt", id, (char *)NULL);
 }
 
 int disorder_adduser(disorder_client *c, const char *user, const char *password, const char *rights) {
-  return disorder_simple(c, 0, "adduser", user, password, rights, (char *)0);
+  return disorder_simple(c, NULL, "adduser", user, password, rights, (char *)NULL);
 }
 
 int disorder_allfiles(disorder_client *c, const char *dir, const char *re, char ***filesp, int *nfilesp) {
-  return disorder_simple_list(c, filesp, nfilesp, "allfiles", dir, re, (char *)0);
+  int rc = disorder_simple(c, NULL, "allfiles", dir, re, (char *)NULL);
+  if(rc)
+    return rc;
+  if(readlist(c, filesp, nfilesp))
+    return -1;
+  return 0;
 }
 
 int disorder_confirm(disorder_client *c, const char *confirmation) {
-  char *u;
-  int rc;
-  if((rc = disorder_simple(c, &u, "confirm", confirmation, (char *)0)))
+  char **v, *r;
+  int nv;
+  int rc = disorder_simple(c, &r, "confirm", confirmation, (char *)NULL);
+  if(rc)
     return rc;
-  c->user = u;
+  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 *u;
-  int rc;
-  if((rc = disorder_simple(c, &u, "cookie", cookie, (char *)0)))
+  char **v, *r;
+  int nv;
+  int rc = disorder_simple(c, &r, "cookie", cookie, (char *)NULL);
+  if(rc)
     return rc;
-  c->user = u;
+  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;
 }
 
 int disorder_deluser(disorder_client *c, const char *user) {
-  return disorder_simple(c, 0, "deluser", user, (char *)0);
+  return disorder_simple(c, NULL, "deluser", user, (char *)NULL);
 }
 
 int disorder_dirs(disorder_client *c, const char *dir, const char *re, char ***filesp, int *nfilesp) {
-  return disorder_simple_list(c, filesp, nfilesp, "dirs", dir, re, (char *)0);
+  int rc = disorder_simple(c, NULL, "dirs", dir, re, (char *)NULL);
+  if(rc)
+    return rc;
+  if(readlist(c, filesp, nfilesp))
+    return -1;
+  return 0;
 }
 
 int disorder_disable(disorder_client *c) {
-  return disorder_simple(c, 0, "disable", (char *)0);
+  return disorder_simple(c, NULL, "disable", (char *)NULL);
 }
 
 int disorder_edituser(disorder_client *c, const char *username, const char *property, const char *value) {
-  return disorder_simple(c, 0, "edituser", username, property, value, (char *)0);
+  return disorder_simple(c, NULL, "edituser", username, property, value, (char *)NULL);
 }
 
 int disorder_enable(disorder_client *c) {
-  return disorder_simple(c, 0, "enable", (char *)0);
+  return disorder_simple(c, NULL, "enable", (char *)NULL);
 }
 
 int disorder_enabled(disorder_client *c, int *enabledp) {
-  char *v;
-  int rc;
-  if((rc = disorder_simple(c, &v, "enabled", (char *)0)))
+  char **v, *r;
+  int nv;
+  int rc = disorder_simple(c, &r, "enabled", (char *)NULL);
+  if(rc)
     return rc;
-  return boolean("enabled", v, enabledp);
+  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;
-  int rc;
-  if((rc = disorder_simple(c, &v, "exists", track, (char *)0)))
+  char **v, *r;
+  int nv;
+  int rc = disorder_simple(c, &r, "exists", track, (char *)NULL);
+  if(rc)
     return rc;
-  return boolean("exists", v, existsp);
+  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;
 }
 
 int disorder_files(disorder_client *c, const char *dir, const char *re, char ***filesp, int *nfilesp) {
-  return disorder_simple_list(c, filesp, nfilesp, "files", dir, re, (char *)0);
+  int rc = disorder_simple(c, NULL, "files", dir, re, (char *)NULL);
+  if(rc)
+    return rc;
+  if(readlist(c, filesp, nfilesp))
+    return -1;
+  return 0;
 }
 
 int disorder_get(disorder_client *c, const char *track, const char *pref, char **valuep) {
-  return dequote(disorder_simple(c, valuep, "get", track, pref, (char *)0), valuep);
+  char **v, *r;
+  int nv;
+  int rc = disorder_simple(c, &r, "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) {
-  return dequote(disorder_simple(c, valuep, "get-global", pref, (char *)0), valuep);
+  char **v, *r;
+  int nv;
+  int rc = disorder_simple(c, &r, "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;
-  int rc;
-
-  if((rc = disorder_simple(c, &v, "length", track, (char *)0)))
+  char **v, *r;
+  int nv;
+  int rc = disorder_simple(c, &r, "length", track, (char *)NULL);
+  if(rc)
     return rc;
-  *lengthp = atol(v);
-  xfree(v);
+  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) {
-  return dequote(disorder_simple(c, cookiep, "make-cookie", (char *)0), cookiep);
+  char **v, *r;
+  int nv;
+  int rc = disorder_simple(c, &r, "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;
 }
 
 int disorder_move(disorder_client *c, const char *track, long delta) {
   char buf_delta[16];
   byte_snprintf(buf_delta, sizeof buf_delta, "%ld", delta);
-  return disorder_simple(c, 0, "move", track, buf_delta, (char *)0);
+  return disorder_simple(c, NULL, "move", track, buf_delta, (char *)NULL);
 }
 
 int disorder_moveafter(disorder_client *c, const char *target, char **ids, int nids) {
-  return disorder_simple(c, 0, "moveafter", target, disorder_list, ids, nids, (char *)0);
+  return disorder_simple(c, NULL, "moveafter", target, disorder_list, ids, nids, (char *)NULL);
 }
 
 int disorder_new_tracks(disorder_client *c, long max, char ***tracksp, int *ntracksp) {
   char buf_max[16];
   byte_snprintf(buf_max, sizeof buf_max, "%ld", max);
-  return disorder_simple_list(c, tracksp, ntracksp, "new", buf_max, (char *)0);
+  int rc = disorder_simple(c, NULL, "new", buf_max, (char *)NULL);
+  if(rc)
+    return rc;
+  if(readlist(c, tracksp, ntracksp))
+    return -1;
+  return 0;
 }
 
 int disorder_nop(disorder_client *c) {
-  return disorder_simple(c, 0, "nop", (char *)0);
+  return disorder_simple(c, NULL, "nop", (char *)NULL);
 }
 
 int disorder_part(disorder_client *c, const char *track, const char *context, const char *part, char **partp) {
-  return dequote(disorder_simple(c, partp, "part", track, context, part, (char *)0), partp);
+  char **v, *r;
+  int nv;
+  int rc = disorder_simple(c, &r, "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;
 }
 
 int disorder_pause(disorder_client *c) {
-  return disorder_simple(c, 0, "pause", (char *)0);
+  return disorder_simple(c, NULL, "pause", (char *)NULL);
 }
 
 int disorder_play(disorder_client *c, const char *track, char **idp) {
-  return dequote(disorder_simple(c, idp, "play", track, (char *)0), idp);
+  return disorder_simple(c, idp, "play", track, (char *)NULL);
 }
 
 int disorder_playafter(disorder_client *c, const char *target, char **tracks, int ntracks) {
-  return disorder_simple(c, 0, "playafter", target, disorder_list, tracks, ntracks, (char *)0);
+  return disorder_simple(c, NULL, "playafter", target, disorder_list, tracks, ntracks, (char *)NULL);
 }
 
 int disorder_playing(disorder_client *c, struct queue_entry **playingp) {
@@ -155,154 +251,291 @@ int disorder_playing(disorder_client *c, struct queue_entry **playingp) {
 }
 
 int disorder_playlist_delete(disorder_client *c, const char *playlist) {
-  return disorder_simple(c, 0, "playlist-delete", playlist, (char *)0);
+  return disorder_simple(c, NULL, "playlist-delete", playlist, (char *)NULL);
 }
 
 int disorder_playlist_get(disorder_client *c, const char *playlist, char ***tracksp, int *ntracksp) {
-  return disorder_simple_list(c, tracksp, ntracksp, "playlist-get", playlist, (char *)0);
+  int rc = disorder_simple(c, NULL, "playlist-get", playlist, (char *)NULL);
+  if(rc)
+    return rc;
+  if(readlist(c, tracksp, ntracksp))
+    return -1;
+  return 0;
 }
 
 int disorder_playlist_get_share(disorder_client *c, const char *playlist, char **sharep) {
-  return dequote(disorder_simple(c, sharep, "playlist-get-share", playlist, (char *)0), sharep);
+  return disorder_simple(c, sharep, "playlist-get-share", playlist, (char *)NULL);
 }
 
 int disorder_playlist_lock(disorder_client *c, const char *playlist) {
-  return disorder_simple(c, 0, "playlist-lock", playlist, (char *)0);
+  return disorder_simple(c, NULL, "playlist-lock", playlist, (char *)NULL);
 }
 
 int disorder_playlist_set(disorder_client *c, const char *playlist, char **tracks, int ntracks) {
-  return disorder_simple(c, 0, "playlist-set", playlist, disorder_body, tracks, ntracks, (char *)0);
+  return disorder_simple(c, NULL, "playlist-set", playlist, disorder_body, tracks, ntracks, (char *)NULL);
 }
 
 int disorder_playlist_set_share(disorder_client *c, const char *playlist, const char *share) {
-  return disorder_simple(c, 0, "playlist-set-share", playlist, share, (char *)0);
+  return disorder_simple(c, NULL, "playlist-set-share", playlist, share, (char *)NULL);
 }
 
 int disorder_playlist_unlock(disorder_client *c) {
-  return disorder_simple(c, 0, "playlist-unlock", (char *)0);
+  return disorder_simple(c, NULL, "playlist-unlock", (char *)NULL);
 }
 
 int disorder_playlists(disorder_client *c, char ***playlistsp, int *nplaylistsp) {
-  return disorder_simple_list(c, playlistsp, nplaylistsp, "playlists", (char *)0);
+  int rc = disorder_simple(c, NULL, "playlists", (char *)NULL);
+  if(rc)
+    return rc;
+  if(readlist(c, playlistsp, nplaylistsp))
+    return -1;
+  return 0;
 }
 
 int disorder_prefs(disorder_client *c, const char *track, struct kvp **prefsp) {
-  return pairlist(c, prefsp, "prefs", track, (char *)0);
+  return pairlist(c, prefsp, "prefs", track, (char *)NULL);
 }
 
 int disorder_queue(disorder_client *c, struct queue_entry **queuep) {
-  return somequeue(c, "queue", queuep);
+  int rc = disorder_simple(c, NULL, "queue", (char *)NULL);
+  if(rc)
+    return rc;
+  if(readqueue(c, queuep))
+    return -1;
+  return 0;
 }
 
 int disorder_random_disable(disorder_client *c) {
-  return disorder_simple(c, 0, "random-disable", (char *)0);
+  return disorder_simple(c, NULL, "random-disable", (char *)NULL);
 }
 
 int disorder_random_enable(disorder_client *c) {
-  return disorder_simple(c, 0, "random-enable", (char *)0);
+  return disorder_simple(c, NULL, "random-enable", (char *)NULL);
 }
 
 int disorder_random_enabled(disorder_client *c, int *enabledp) {
-  char *v;
-  int rc;
-  if((rc = disorder_simple(c, &v, "random-enabled", (char *)0)))
+  char **v, *r;
+  int nv;
+  int rc = disorder_simple(c, &r, "random-enabled", (char *)NULL);
+  if(rc)
     return rc;
-  return boolean("random-enabled", v, enabledp);
+  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;
 }
 
 int disorder_recent(disorder_client *c, struct queue_entry **recentp) {
-  return somequeue(c, "recent", recentp);
+  int rc = disorder_simple(c, NULL, "recent", (char *)NULL);
+  if(rc)
+    return rc;
+  if(readqueue(c, recentp))
+    return -1;
+  return 0;
 }
 
 int disorder_reconfigure(disorder_client *c) {
-  return disorder_simple(c, 0, "reconfigure", (char *)0);
+  return disorder_simple(c, NULL, "reconfigure", (char *)NULL);
 }
 
 int disorder_register(disorder_client *c, const char *username, const char *password, const char *email, char **confirmationp) {
-  return dequote(disorder_simple(c, confirmationp, "register", username, password, email, (char *)0), confirmationp);
+  char **v, *r;
+  int nv;
+  int rc = disorder_simple(c, &r, "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;
 }
 
 int disorder_reminder(disorder_client *c, const char *username) {
-  return disorder_simple(c, 0, "reminder", username, (char *)0);
+  return disorder_simple(c, NULL, "reminder", username, (char *)NULL);
 }
 
 int disorder_remove(disorder_client *c, const char *id) {
-  return disorder_simple(c, 0, "remove", id, (char *)0);
+  return disorder_simple(c, NULL, "remove", id, (char *)NULL);
 }
 
 int disorder_rescan(disorder_client *c) {
-  return disorder_simple(c, 0, "rescan", (char *)0);
+  return disorder_simple(c, NULL, "rescan", (char *)NULL);
 }
 
 int disorder_resolve(disorder_client *c, const char *track, char **resolvedp) {
-  return dequote(disorder_simple(c, resolvedp, "resolve", track, (char *)0), resolvedp);
+  char **v, *r;
+  int nv;
+  int rc = disorder_simple(c, &r, "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;
 }
 
 int disorder_resume(disorder_client *c) {
-  return disorder_simple(c, 0, "resume", (char *)0);
+  return disorder_simple(c, NULL, "resume", (char *)NULL);
 }
 
 int disorder_revoke(disorder_client *c) {
-  return disorder_simple(c, 0, "revoke", (char *)0);
+  return disorder_simple(c, NULL, "revoke", (char *)NULL);
+}
+
+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);
+  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;
 }
 
 int disorder_scratch(disorder_client *c, const char *id) {
-  return disorder_simple(c, 0, "scratch", id, (char *)0);
+  return disorder_simple(c, NULL, "scratch", id, (char *)NULL);
 }
 
 int disorder_schedule_del(disorder_client *c, const char *event) {
-  return disorder_simple(c, 0, "schedule-del", event, (char *)0);
+  return disorder_simple(c, NULL, "schedule-del", event, (char *)NULL);
 }
 
 int disorder_schedule_get(disorder_client *c, const char *id, struct kvp **actiondatap) {
-  return pairlist(c, actiondatap, "schedule-get", id, (char *)0);
+  return pairlist(c, actiondatap, "schedule-get", id, (char *)NULL);
 }
 
 int disorder_schedule_list(disorder_client *c, char ***idsp, int *nidsp) {
-  return disorder_simple_list(c, idsp, nidsp, "schedule-list", (char *)0);
+  int rc = disorder_simple(c, NULL, "schedule-list", (char *)NULL);
+  if(rc)
+    return rc;
+  if(readlist(c, idsp, nidsp))
+    return -1;
+  return 0;
 }
 
 int disorder_search(disorder_client *c, const char *terms, char ***tracksp, int *ntracksp) {
-  return disorder_simple_list(c, tracksp, ntracksp, "search", terms, (char *)0);
+  int rc = disorder_simple(c, NULL, "search", terms, (char *)NULL);
+  if(rc)
+    return rc;
+  if(readlist(c, tracksp, ntracksp))
+    return -1;
+  return 0;
 }
 
 int disorder_set(disorder_client *c, const char *track, const char *pref, const char *value) {
-  return disorder_simple(c, 0, "set", track, pref, value, (char *)0);
+  return disorder_simple(c, NULL, "set", track, pref, value, (char *)NULL);
 }
 
 int disorder_set_global(disorder_client *c, const char *pref, const char *value) {
-  return disorder_simple(c, 0, "set-global", pref, value, (char *)0);
+  return disorder_simple(c, NULL, "set-global", pref, value, (char *)NULL);
 }
 
 int disorder_shutdown(disorder_client *c) {
-  return disorder_simple(c, 0, "shutdown", (char *)0);
+  return disorder_simple(c, NULL, "shutdown", (char *)NULL);
 }
 
 int disorder_stats(disorder_client *c, char ***statsp, int *nstatsp) {
-  return disorder_simple_list(c, statsp, nstatsp, "stats", (char *)0);
+  int rc = disorder_simple(c, NULL, "stats", (char *)NULL);
+  if(rc)
+    return rc;
+  if(readlist(c, statsp, nstatsp))
+    return -1;
+  return 0;
 }
 
 int disorder_tags(disorder_client *c, char ***tagsp, int *ntagsp) {
-  return disorder_simple_list(c, tagsp, ntagsp, "tags", (char *)0);
+  int rc = disorder_simple(c, NULL, "tags", (char *)NULL);
+  if(rc)
+    return rc;
+  if(readlist(c, tagsp, ntagsp))
+    return -1;
+  return 0;
 }
 
 int disorder_unset(disorder_client *c, const char *track, const char *pref) {
-  return disorder_simple(c, 0, "unset", track, pref, (char *)0);
+  return disorder_simple(c, NULL, "unset", track, pref, (char *)NULL);
 }
 
 int disorder_unset_global(disorder_client *c, const char *pref) {
-  return disorder_simple(c, 0, "unset-global", pref, (char *)0);
+  return disorder_simple(c, NULL, "unset-global", pref, (char *)NULL);
 }
 
 int disorder_userinfo(disorder_client *c, const char *username, const char *property, char **valuep) {
-  return dequote(disorder_simple(c, valuep, "userinfo", username, property, (char *)0), valuep);
+  char **v, *r;
+  int nv;
+  int rc = disorder_simple(c, &r, "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;
 }
 
 int disorder_users(disorder_client *c, char ***usersp, int *nusersp) {
-  return disorder_simple_list(c, usersp, nusersp, "users", (char *)0);
+  int rc = disorder_simple(c, NULL, "users", (char *)NULL);
+  if(rc)
+    return rc;
+  if(readlist(c, usersp, nusersp))
+    return -1;
+  return 0;
 }
 
 int disorder_version(disorder_client *c, char **versionp) {
-  return dequote(disorder_simple(c, versionp, "version", (char *)0), versionp);
+  char **v, *r;
+  int nv;
+  int rc = disorder_simple(c, &r, "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;
+}
+
+int disorder_set_volume(disorder_client *c, long left, long right) {
+  char buf_left[16];
+  byte_snprintf(buf_left, sizeof buf_left, "%ld", left);
+  char buf_right[16];
+  byte_snprintf(buf_right, sizeof buf_right, "%ld", right);
+  return disorder_simple(c, NULL, "volume", buf_left, buf_right, (char *)NULL);
+}
+
+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);
+  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;
 }