Command line printer manipulation client, and build goo.

[moira.git] / lib / mr_ops.c

diff --git a/lib/mr_ops.c b/lib/mr_ops.c
index 4c2519c8f51b1f4ac923663b6bf0bbdc2edf67f9..50d2194cda2c85b49189e083cd670718a95a5086 100644 (file)
--- a/lib/mr_ops.c
+++ b/lib/mr_ops.c
@@ -1,4 +1,4 @@
-/* $Id $
+/* $Id$
  *
  * This routine is part of the client library.  It handles
  * the protocol operations: invoking an update and getting the
@@ -13,6 +13,9 @@
 #include <moira.h>
 #include "mr_private.h"
 
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 RCSID("$Header$");
@@ -22,20 +25,16 @@ RCSID("$Header$");
 int mr_do_update(void)
 {
   int status;
-  mr_params param_st;
-  struct mr_params *params = NULL;
-  struct mr_params *reply = NULL;
+  mr_params params, reply;
 
   CHECK_CONNECTED;
-  params = &param_st;
-  params->mr_version_no = sending_version_no;
-  params->mr_procno = MR_DO_UPDATE;
-  params->mr_argc = 0;
-  params->mr_argl = NULL;
-  params->mr_argv = NULL;
+  params.u.mr_procno = MR_DO_UPDATE;
+  params.mr_argc = 0;
+  params.mr_argl = NULL;
+  params.mr_argv = NULL;
 
-  if ((status = mr_do_call(params, &reply)) == 0)
-    status = reply->mr_status;
+  if ((status = mr_do_call(&params, &reply)) == MR_SUCCESS)
+    status = reply.u.mr_status;
 
   mr_destroy_reply(reply);
 
@@ -50,49 +49,73 @@ int mr_do_update(void)
 int mr_motd(char **motd)
 {
   int status;
-  mr_params param_st;
-  struct mr_params *params = NULL;
-  struct mr_params *reply = NULL;
-  static char buffer[1024];
+  mr_params params, reply;
+  static char *buffer = NULL;
 
   *motd = NULL;
   CHECK_CONNECTED;
-  params = &param_st;
-  params->mr_version_no = sending_version_no;
-  params->mr_procno = MR_MOTD;
-  params->mr_argc = 0;
-  params->mr_argl = NULL;
-  params->mr_argv = NULL;
-
-  if ((status = mr_do_call(params, &reply)))
+  params.u.mr_procno = MR_MOTD;
+  params.mr_argc = 0;
+  params.mr_argl = NULL;
+  params.mr_argv = NULL;
+
+  if ((status = mr_do_call(&params, &reply)))
     goto punt;
 
-  while ((status = reply->mr_status) == MR_MORE_DATA)
+  while ((status = reply.u.mr_status) == MR_MORE_DATA)
     {
-      if (reply->mr_argc > 0)
+      if (reply.mr_argc > 0)
        {
-         strncpy(buffer, reply->mr_argv[0], sizeof(buffer));
+         buffer = realloc(buffer, reply.mr_argl[0] + 1);
+         if (!buffer)
+           {
+             mr_disconnect();
+             return ENOMEM;
+           }
+         strcpy(buffer, reply.mr_argv[0]);
          *motd = buffer;
        }
       mr_destroy_reply(reply);
-      reply = NULL;
-
-      initialize_operation(_mr_recv_op, mr_start_recv, &reply, NULL);
-      queue_operation(_mr_conn, CON_INPUT, _mr_recv_op);
-
-      complete_operation(_mr_recv_op);
-      if (OP_STATUS(_mr_recv_op) != OP_COMPLETE)
+      if (mr_receive(_mr_conn, &reply) != MR_SUCCESS)
        {
          mr_disconnect();
-         status = MR_ABORTED;
-         return status;
+         return MR_ABORTED;
        }
     }
 punt:
   mr_destroy_reply(reply);
-  /* for backwards compatability */
-  if (status == MR_UNKNOWN_PROC)
-    return 0;
-  else
-    return status;
+
+  return status;
+}
+
+/* Exchange query version info with the server. */
+
+int mr_version(int version)
+{
+  int status;
+  mr_params params, reply;
+  char vbuf[10], *arg;
+
+  CHECK_CONNECTED;
+
+  sprintf(vbuf, "%d", version);
+  arg = strdup(vbuf);
+  params.u.mr_procno = MR_SETVERSION;
+  params.mr_argc = 1;
+  params.mr_argl = NULL;
+  params.mr_argv = &arg;
+
+  status = mr_do_call(&params, &reply);
+  free(arg);
+
+  if (status == MR_SUCCESS)
+    {
+      status = reply.u.mr_status;
+
+      if (status == MR_VERSION_LOW && getenv("MOIRA_LOW_VERSION_WARNING"))
+       fprintf(stderr, "Warning: This client is out of date.\n");
+    }
+  mr_destroy_reply(reply);
+
+  return status;
 }