X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/c473dda17daab74e3b7cb05be4b75770a0af4058..refs/heads/qvalidate:/server/mr_scall.c

diff --git a/server/mr_scall.c b/server/mr_scall.c
index db9e9784..9a72909c 100644
--- a/server/mr_scall.c
+++ b/server/mr_scall.c
@@ -17,23 +17,26 @@ static char *rcsid_sms_scall_c = "$Header$";
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
+#include <fcntl.h>
+#include <string.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include <krb.h>
 #include <errno.h>
-#include "query.h"
 #include "mr_server.h"
+#include "query.h"
 extern char buf1[];
 extern int nclients;
 extern char *whoami;
-extern char *malloc();
 extern int errno;
 
 extern void clist_delete(), do_auth(), do_shutdown();
 void do_call();
-extern int ingres_errno, mr_errcode;
+extern int dbms_errno, mr_errcode;
 static int row_count;
 
 /* Put this in a variable so that we can patch it if necessary */
-int max_row_count = 2048;
+int max_row_count = 4096;
 
 /*
  * Welcome to the (finite state) machine (highest level).
@@ -100,7 +103,6 @@ do_call(cl)
 	client *cl;
 {
 	int pn;
-	extern int ingres_errno;
 	cl->reply.mr_argc = 0;
 	cl->reply.mr_status = 0;
 	cl->reply.mr_version_no = cl->args->mr_version_no;
@@ -125,7 +127,7 @@ do_call(cl)
 	}
 
 	/* make sure this gets cleared before every operation */
-	ingres_errno = 0;
+	dbms_errno = 0;
 
 	switch(pn) {
 	case MR_NOOP:
@@ -187,7 +189,7 @@ retr_callback(argc, argv, p_cp)
 	register int i;
 
 	if (row_count++ >= max_row_count) {
-	    ingres_errno = mr_errcode = MR_NO_MEM;
+	    dbms_errno = mr_errcode = MR_NO_MEM;
 	    return;
 	}
 
@@ -218,7 +220,7 @@ retr_callback(argc, argv, p_cp)
 	for (i = 0; i < argc; i++) {
 		register int len = strlen(argv[i]) + 1;
 		nargv[i] = malloc(len);
-		bcopy(argv[i], nargv[i], len);
+		memcpy(nargv[i], argv[i], len);
 	}
 	arg_tmp->mr_flattened = (char *)NULL;
 	arg_tmp->mr_argl = (int *)NULL;
@@ -245,9 +247,7 @@ list_users(callbk, callarg)
 	char buf1[30];
 	int i;
 	extern client **clients;
-	extern char *inet_ntoa();
 	char *cp;
-	char *index();
 	char *ctime();
 
 	for (i = 0; i < nclients; i++) {
@@ -260,7 +260,7 @@ list_users(callbk, callarg)
 		argv[2] = buf;
 		sprintf(buf, "port %d", ntohs(cl->haddr.sin_port));
 		argv[3] = ctime(&cl->last_time_used);
-		cp = index(argv[3], '\n');
+		cp = strchr(argv[3], '\n');
 		if (cp) *cp = '\0';
 		argv[4] = buf1;
 		sprintf(buf1, "[#%d]", cl->id);
@@ -355,8 +355,6 @@ trigger_dcm(dummy0, dummy1, cl)
 	pid = vfork();
 	switch (pid) {
 	case 0:
-	    	for (dummy0 = getdtablesize() - 1; dummy0 > 2; dummy0--)
-		  close(dummy0);
 		execl(prog, "startdcm", 0);
 		exit(1);