Command line printer manipulation client, and build goo.

[moira.git] / lib / mr_access.c

diff --git a/lib/mr_access.c b/lib/mr_access.c
index a6a24f9b2321530f4f94be4edfa24cdd1fbabc7e..ac70e3e79149dc1bab626c31b3ee48d0a786f4b2 100644 (file)
--- a/lib/mr_access.c
+++ b/lib/mr_access.c
@@ -1,62 +1,46 @@
-/*
- *     $Source$
- *     $Author$
- *     $Header$
+/* $Id$
+ *
+ * Check access to a Moira query
  *
- *     Copyright (C) 1987, 1990 by the Massachusetts Institute of Technology
- *     For copying and distribution information, please see the file
- *     <mit-copyright.h>.
+ * Copyright (C) 1987-1998 by the Massachusetts Institute of Technology
+ * For copying and distribution information, please see the file
+ * <mit-copyright.h>.
  */
 
-#ifndef lint
-static char *rcsid_sms_access_c = "$Header$";
-#endif lint
-
 #include <mit-copyright.h>
+#include <moira.h>
 #include "mr_private.h"
 
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+RCSID("$Header$");
+
 /*
  * Check access to a named query.
  */
-int mr_access(name, argc, argv)
-    char *name;                        /* Query name */
-    int argc;                  /* Arg count */
-    char **argv;               /* Args */
-{
-    register char **nargv = (char **)malloc(sizeof(char *) * (argc+1));
-    register int status = 0;
-    nargv[0] = name;
-    bcopy((char *)argv, (char *)(nargv+1), sizeof(char *) * argc);
-    status = mr_access_internal(argc+1, nargv);
-    free(nargv);
-    return status;
-}
-/*
- * Check access to a named query, where the query name is argv[0]
- * and the arguments are the rest of argv[].
- */
-int mr_access_internal(argc, argv)
-    int argc;                  /* Arg count */
-    char **argv;               /* Args */
+int mr_access(char *name, int argc, char **argv)
 {
-    int status;
-    mr_params params_st;
-    register mr_params *params = NULL;
-    mr_params *reply = NULL;
-    
-    CHECK_CONNECTED;
-
-    params = &params_st;
-    params->mr_version_no = sending_version_no;
-    params->mr_procno = MR_ACCESS;
-    params->mr_argc = argc;
-    params->mr_argl = NULL;
-    params->mr_argv = argv;
-       
-    if ((status = mr_do_call(params, &reply)) == 0)
-       status = reply->mr_status;
-
-    mr_destroy_reply(reply);
-
-    return status;
+  mr_params params, reply;
+  int status;
+
+  CHECK_CONNECTED;
+
+  params.u.mr_procno = MR_ACCESS;
+  params.mr_argc = argc + 1;
+  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);
+  params.mr_argl = NULL;
+
+  if ((status = mr_do_call(&params, &reply)) == MR_SUCCESS)
+    status = reply.u.mr_status;
+
+  mr_destroy_reply(reply);
+  free(params.mr_argv);
+
+  return status;
 }