X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/fdf98378d2d8c8550661f657d30ec5186ff642f1..01cef138a5fd1eae27183fc9a40bff26a127c4a4:/lib/client.c

diff --git a/lib/client.c b/lib/client.c
index e5822e9..1dac922 100644
--- a/lib/client.c
+++ b/lib/client.c
@@ -20,7 +20,7 @@
 /** @file lib/client.c
  * @brief Simple C client
  *
- * See @file lib/eclient.c for an asynchronous-capable client
+ * See @ref lib/eclient.c for an asynchronous-capable client
  * implementation.
  */
 
@@ -64,6 +64,7 @@ struct disorder_client {
   char *ident;
   char *user;
   int verbose;
+  char *last;				/* last error string */
 };
 
 /** @brief Create a new client
@@ -97,14 +98,23 @@ static int response(disorder_client *c, char **rp) {
   if(r[0] >= '0' && r[0] <= '9'
      && r[1] >= '0' && r[1] <= '9'
      && r[2] >= '0' && r[2] <= '9'
-     && r[3] == ' ')
+     && r[3] == ' ') {
+    c->last = r + 4;
     return (r[0] * 10 + r[1]) * 10 + r[2] - 111 * '0';
-  else {
+  } else {
     error(0, "invalid reply format from %s", c->ident);
     return -1;
   }
 }
 
+/** @brief Return last response string
+ * @param c Client
+ * @return Last response string (UTF-8, English) or NULL
+ */
+const char *disorder_last(disorder_client *c) {
+  return c->last;
+}
+
 /** @brief Read and partially parse a response
  * @param c Client
  * @param rp Where to store response text (or NULL) (UTF-8)
@@ -130,7 +140,7 @@ static int check_response(disorder_client *c, char **rp) {
   } else {
     if(c->verbose)
       error(0, "from %s: %s", c->ident, utf82mb(r));
-    return -1;
+    return rc;
   }
 }
 
@@ -155,6 +165,10 @@ static int disorder_simple_v(disorder_client *c,
   const char *arg;
   struct dynstr d;
 
+  if(!c->fpout) {
+    error(0, "not connected to server");
+    return -1;
+  }
   if(cmd) {
     dynstr_init(&d);
     dynstr_append_string(&d, cmd);
@@ -212,6 +226,7 @@ static int disorder_simple(disorder_client *c,
  */
 static int dequote(int rc, char **rp) {
   char **rr;
+
   if(!rc) {
     if((rr = split(*rp, 0, SPLIT_QUOTES, 0, 0)) && *rr) {
       *rp = *rr;
@@ -219,7 +234,7 @@ static int dequote(int rc, char **rp) {
     }
     error(0, "invalid reply: %s", *rp);
   }
-  return -1;
+  return rc;
 }
 
 /** @brief Generic connection routine
@@ -237,7 +252,7 @@ static int disorder_connect_generic(disorder_client *c,
 				    const char *username,
 				    const char *password,
 				    const char *cookie) {
-  int fd = -1, fd2 = -1, nrvec;
+  int fd = -1, fd2 = -1, nrvec, rc;
   unsigned char *nonce;
   size_t nl;
   const char *res;
@@ -271,43 +286,51 @@ static int disorder_connect_generic(disorder_client *c,
     goto error;
   }
   fd2 = -1;
-  if(disorder_simple(c, &r, 0, (const char *)0))
-    return -1;
+  if((rc = disorder_simple(c, &r, 0, (const char *)0)))
+    goto error_rc;
   if(!(rvec = split(r, &nrvec, SPLIT_QUOTES, 0, 0)))
-    return -1;
+    goto error;
   if(nrvec != 3) {
     error(0, "cannot parse server greeting %s", r);
-    return -1;
+    goto error;
   }
   protocol = *rvec++;
   if(strcmp(protocol, "2")) {
     error(0, "unknown protocol version: %s", protocol);
-    return -1;
+    goto error;
   }
   algorithm = *rvec++;
   challenge = *rvec++;
   if(!(nonce = unhex(challenge, &nl)))
-    return -1;
+    goto error;
   if(cookie) {
     if(!dequote(disorder_simple(c, &c->user, "cookie", cookie, (char *)0),
 		&c->user))
       return 0;				/* success */
     if(!username) {
       error(0, "cookie did not work and no username available");
-      return -1;
+      goto error;
     }
   }
   if(!(res = authhash(nonce, nl, password, algorithm))) goto error;
-  if(disorder_simple(c, 0, "user", username, res, (char *)0))
-    return -1;
+  if((rc = disorder_simple(c, 0, "user", username, res, (char *)0)))
+    goto error_rc;
   c->user = xstrdup(username);
   return 0;
 error:
-  if(c->fpin) fclose(c->fpin);
-  if(c->fpout) fclose(c->fpout);
+  rc = -1;
+error_rc:
+  if(c->fpin) {
+    fclose(c->fpin);
+    c->fpin = 0;
+  }
+  if(c->fpout) {
+    fclose(c->fpout);
+    c->fpout = 0;
+  }
   if(fd2 != -1) close(fd2);
   if(fd != -1) close(fd);
-  return -1;
+  return rc;
 }
 
 /** @brief Connect a client with a specified username and password
@@ -510,9 +533,10 @@ static void client_error(const char *msg,
 int disorder_playing(disorder_client *c, struct queue_entry **qp) {
   char *r;
   struct queue_entry *q;
+  int rc;
 
-  if(disorder_simple(c, &r, "playing", (char *)0))
-    return -1;
+  if((rc = disorder_simple(c, &r, "playing", (char *)0)))
+    return rc;
   if(r) {
     q = xmalloc(sizeof *q);
     if(queue_unmarshall(q, r, client_error, 0))
@@ -527,9 +551,10 @@ static int disorder_somequeue(disorder_client *c,
 			      const char *cmd, struct queue_entry **qp) {
   struct queue_entry *qh, **qt = &qh, *q;
   char *l;
+  int rc;
 
-  if(disorder_simple(c, 0, cmd, (char *)0))
-    return -1;
+  if((rc = disorder_simple(c, 0, cmd, (char *)0)))
+    return rc;
   while(inputline(c->ident, c->fpin, &l, '\n') >= 0) {
     if(!strcmp(l, ".")) {
       *qt = 0;
@@ -714,7 +739,7 @@ static void pref_error_handler(const char *msg,
   error(0, "error handling 'prefs' reply: %s", msg);
 }
 
-/** @param Get all preferences for a trcak
+/** @brief Get all preferences for a trcak
  * @param c Client
  * @param track Track name
  * @param kp Where to store linked list of preferences
@@ -722,11 +747,11 @@ static void pref_error_handler(const char *msg,
  */
 int disorder_prefs(disorder_client *c, const char *track, struct kvp **kp) {
   char **vec, **pvec;
-  int nvec, npvec, n;
+  int nvec, npvec, n, rc;
   struct kvp *k;
 
-  if(disorder_simple_list(c, &vec, &nvec, "prefs", track, (char *)0))
-    return -1;
+  if((rc = disorder_simple_list(c, &vec, &nvec, "prefs", track, (char *)0)))
+    return rc;
   for(n = 0; n < nvec; ++n) {
     if(!(pvec = split(vec[n], &npvec, SPLIT_QUOTES, pref_error_handler, 0)))
       return -1;
@@ -768,8 +793,10 @@ static int boolean(const char *cmd, const char *value,
  */
 int disorder_exists(disorder_client *c, const char *track, int *existsp) {
   char *v;
+  int rc;
 
-  if(disorder_simple(c, &v, "exists", track, (char *)0)) return -1;
+  if((rc = disorder_simple(c, &v, "exists", track, (char *)0)))
+    return rc;
   return boolean("exists", v, existsp);
 }
 
@@ -780,8 +807,10 @@ int disorder_exists(disorder_client *c, const char *track, int *existsp) {
  */
 int disorder_enabled(disorder_client *c, int *enabledp) {
   char *v;
+  int rc;
 
-  if(disorder_simple(c, &v, "enabled", (char *)0)) return -1;
+  if((rc = disorder_simple(c, &v, "enabled", (char *)0)))
+    return rc;
   return boolean("enabled", v, enabledp);
 }
 
@@ -796,8 +825,10 @@ int disorder_enabled(disorder_client *c, int *enabledp) {
 int disorder_length(disorder_client *c, const char *track,
 		    long *valuep) {
   char *value;
+  int rc;
 
-  if(disorder_simple(c, &value, "length", track, (char *)0)) return -1;
+  if((rc = disorder_simple(c, &value, "length", track, (char *)0)))
+    return rc;
   *valuep = atol(value);
   return 0;
 }
@@ -832,13 +863,15 @@ int disorder_random_disable(disorder_client *c) {
 
 /** @brief Test whether random play is enabled
  * @param c Client
- * @param existsp Where to store result (non-0 iff enabled)
+ * @param enabledp Where to store result (non-0 iff enabled)
  * @return 0 on success, non-0 on error
  */
 int disorder_random_enabled(disorder_client *c, int *enabledp) {
   char *v;
+  int rc;
 
-  if(disorder_simple(c, &v, "random-enabled", (char *)0)) return -1;
+  if((rc = disorder_simple(c, &v, "random-enabled", (char *)0)))
+    return rc;
   return boolean("random-enabled", v, enabledp);
 }
 
@@ -865,8 +898,7 @@ int disorder_set_volume(disorder_client *c, int left, int right) {
   if(byte_asprintf(&ls, "%d", left) < 0
      || byte_asprintf(&rs, "%d", right) < 0)
     return -1;
-  if(disorder_simple(c, 0, "volume", ls, rs, (char *)0)) return -1;
-  return 0;
+  return disorder_simple(c, 0, "volume", ls, rs, (char *)0);
 }
 
 /** @brief Get volume
@@ -877,8 +909,10 @@ int disorder_set_volume(disorder_client *c, int left, int right) {
  */
 int disorder_get_volume(disorder_client *c, int *left, int *right) {
   char *r;
+  int rc;
 
-  if(disorder_simple(c, &r, "volume", (char *)0)) return -1;
+  if((rc = disorder_simple(c, &r, "volume", (char *)0)))
+    return rc;
   if(sscanf(r, "%d %d", left, right) != 2) {
     error(0, "error parsing response to 'volume': '%s'", r);
     return -1;
@@ -893,8 +927,10 @@ int disorder_get_volume(disorder_client *c, int *left, int *right) {
  */
 int disorder_log(disorder_client *c, struct sink *s) {
   char *l;
+  int rc;
     
-  if(disorder_simple(c, 0, "log", (char *)0)) return -1;
+  if((rc = disorder_simple(c, 0, "log", (char *)0)))
+    return rc;
   while(inputline(c->ident, c->fpin, &l, '\n') >= 0 && strcmp(l, "."))
     if(sink_printf(s, "%s\n", l) < 0) return -1;
   if(ferror(c->fpin) || feof(c->fpin)) return -1;
@@ -917,7 +953,7 @@ int disorder_part(disorder_client *c, char **partp,
 
 /** @brief Resolve aliases
  * @param c Client
- * @param trackkp Where to store canonical name (UTF-8)
+ * @param trackp Where to store canonical name (UTF-8)
  * @param track Track name (UTF-8)
  * @return 0 on success, non-0 on error
  */
@@ -1086,7 +1122,6 @@ int disorder_edituser(disorder_client *c, const char *user,
  * @param user Username
  * @param password Password
  * @param email Email address (UTF-8)
- * @param rights Initial rights or NULL to use default
  * @param confirmp Where to store confirmation string
  * @return 0 on success, non-0 on error
  */
@@ -1117,6 +1152,14 @@ int disorder_make_cookie(disorder_client *c, char **cookiep) {
 		 cookiep);
 }
 
+/** @brief Revoke the cookie used by this session
+ * @param c Client
+ * @return 0 on success, non-0 on error
+ */
+int disorder_revoke(disorder_client *c) {
+  return disorder_simple(c, 0, "revoke", (char *)0);
+}
+
 /*
 Local Variables:
 c-basic-offset:2