Always reports email addresses of the form username@MIT.EDU, regardless

[moira.git] / lib / mr_query.c

diff --git a/lib/mr_query.c b/lib/mr_query.c
index 16eca18e09781cf5db9851a93db4e304ff479ba3..798fbfb8824f898c0cc9a5bfbdcee092f76577a3 100644 (file)
--- a/lib/mr_query.c
+++ b/lib/mr_query.c
@@ -1,22 +1,22 @@
-/*
- *     $Source$
- *     $Author$
- *     $Header$
+/* $Id$
+ *
+ * Perform a Moira query
+ *
+ * Copyright (C) 1987-1998 by the Massachusetts Institute of Technology
+ * For copying and distribution information, please see the file
+ * <mit-copyright.h>.
  *
- *     Copyright (C) 1987 by the Massachusetts Institute of Technology
- *     For copying and distribution information, please see the file
- *     <mit-copyright.h>.
- * 
  */
 
-#ifndef lint
-static char *rcsid_sms_query_c = "$Header$";
-#endif
-
 #include <mit-copyright.h>
+#include <moira.h>
 #include "mr_private.h"
-#include <string.h>
+
+#include <errno.h>
 #include <stdlib.h>
+#include <string.h>
+
+RCSID("$Header$");
 
 /*
  * This routine is the primary external interface to the mr library.
@@ -26,82 +26,48 @@ static char *rcsid_sms_query_c = "$Header$";
  */
 static int level = 0;
 
-int mr_query(name, argc, argv, callproc, callarg)
-    char *name;                /* Query name */
-    int argc;          /* Arg count */
-    char **argv;               /* Args */
-    int (*callproc)(); /* Callback procedure */
-    char *callarg;             /* Callback argument */
+int mr_query(char *name, int argc, char **argv,
+            int (*callproc)(int, char **, void *), void *callarg)
 {
-    register char **nargv = (char **)malloc(sizeof(char *) * (argc+1));
-    register int status = 0;
-    nargv[0] = name;
-    memcpy((char *)(nargv+1), (char *)argv, sizeof(char *) * argc);
-    status = mr_query_internal(argc+1, nargv, callproc, callarg);
-    free(nargv);
-    return status;
-}
-/*
- * This routine makes an MR query.
- *
- * argv[0] is the query name.
- * argv[1..argc-1] are the query arguments.
- *
- * callproc is called once for each returned value, with arguments
- * argc, argv, and callarg.
- * If it returns a non-zero value, further calls to it are not done, and
- * all future data from the server is ignored (there should be some
- * way to send it a quench..)
- */
+  int status, stopcallbacks = 0;
+  mr_params params, reply;
 
-int mr_query_internal(argc, argv, callproc, callarg)
-    int argc;          /* Arg count */
-    char **argv;               /* Args */
-    int (*callproc)(); /* Callback procedure */
-    char *callarg;             /* Callback argument */
-{
-    int status;
-    mr_params params_st;
-    register mr_params *params = NULL;
-    mr_params *reply = NULL;
-    int stopcallbacks = 0;
-
-    if (level) return MR_QUERY_NOT_REENTRANT;
-    
-    CHECK_CONNECTED;
-    level++;
+  CHECK_CONNECTED;
+  if (level)
+    return MR_QUERY_NOT_REENTRANT;
 
-    params = &params_st; 
-    params->mr_version_no = sending_version_no;
-    params->mr_procno = MR_QUERY;
-    params->mr_argc = argc;
-    params->mr_argl = NULL;
-    params->mr_argv = argv;
-       
-    if ((status = mr_do_call(params, &reply)))
-       goto punt;
+  params.u.mr_procno = MR_QUERY;
+  params.mr_argc = argc + 1;
+  params.mr_argl = NULL;
+  params.mr_argv = malloc(sizeof(char *) * (argc + 1));
+  if (!params.mr_argv)
+    return ENOMEM;
+  params.mr_argv[0] = name;
+  memcpy(params.mr_argv + 1, argv, sizeof(char *) * argc);
 
-    while ((status = reply->mr_status) == MR_MORE_DATA) {
-       if (!stopcallbacks) 
-           stopcallbacks =
-               (*callproc)(reply->mr_argc, reply->mr_argv, callarg);
-       mr_destroy_reply(reply);
-       reply = NULL;
+  level++;
+  if ((status = mr_do_call(&params, &reply)))
+    goto punt;
 
-       initialize_operation(_mr_recv_op, mr_start_recv, &reply,
-                            (int (*)())NULL);
-       queue_operation(_mr_conn, CON_INPUT, _mr_recv_op);
+  while ((status = reply.u.mr_status) == MR_MORE_DATA)
+    {
+      if (callproc && !stopcallbacks)
+       stopcallbacks = (*callproc)(reply.mr_argc, reply.mr_argv, callarg);
+      mr_destroy_reply(reply);
 
-       mr_complete_operation(_mr_recv_op);
-       if (OP_STATUS(_mr_recv_op) != OP_COMPLETE) {
-           mr_disconnect();
-           status = MR_ABORTED;
-           goto punt_1;
+      if (mr_receive(_mr_conn, &reply) != MR_SUCCESS)
+       {
+         mr_disconnect();
+         status = MR_ABORTED;
+         goto punt_1;
        }
-    }  
+    }
+
 punt:
-    mr_destroy_reply(reply);
+  mr_destroy_reply(reply);
 punt_1:
-    level--;
-    return status;
+  level--;
+  free(params.mr_argv);
+
+  return status;
 }