Remove `delete_user_by_uid' since it's never been used in any logs we have,

[moira.git] / server / mr_util.c

diff --git a/server/mr_util.c b/server/mr_util.c
index ca0c888d462dd5e4784b6704c5e00d4e81717363..1b5bb3378211aa12f5a529838b334c30190a1539 100644 (file)
--- a/server/mr_util.c
+++ b/server/mr_util.c
@@ -14,10 +14,10 @@ static char *rcsid_mr_util_c = "$Header$";
 
 #include <mit-copyright.h>
 #include "mr_server.h"
-
+#include <com_err.h>
 #include <ctype.h>
-#include <strings.h>
 #include <sys/types.h>
+#include <string.h>
 
 extern char *whoami;
 
@@ -30,26 +30,21 @@ requote(buf, cp, len)
        register unsigned char c;
        if (len <= 2) return buf;
        *buf++ = '"'; count++; len--;
-       for(; (count < 40) && (len > 1) && (c = *cp);
+       for(; (count < 258) && (len > 1) && (c = *cp);
            cp++, --len, ++count) {
                if (c == '\\' || c == '"') *buf++ = '\\';
                if (isprint(c)) *buf++ = c;
                else {
                        sprintf(buf, "\\%03o", c);
-                       buf = index(buf, '\0');
+                       buf = strchr(buf, '\0');
                }
        }
        if (len > 1) { *buf++ = '"'; count++; len--; }
-       if (len > 3 && count >= 40) {
-               *buf++ = '.'; count++; len--;
-               *buf++ = '.'; count++; len--;
-               *buf++ = '.'; count++; len--;
-       }
        if (len > 1) *buf = '\0';
        return buf;
 }
 
-log_args(tag, version, argc, argv)
+void log_args(tag, version, argc, argv)
        char *tag;
        int version;
        int argc;
@@ -63,24 +58,23 @@ log_args(tag, version, argc, argv)
        sprintf(buf, "%s[%d]: ", tag, version);
        for (bp = buf; *bp; bp++);
        
-       for (i = 0; i < argc && ((buf - bp) + 1024) > 2; i++) {
+       for (i = 0; i < argc && ((buf - bp) + BUFSIZ) > 2; i++) {
                if (i != 0) {
                        *bp++ = ',';
                        *bp++ = ' '; 
                }
-               bp = requote(bp, argv[i], (buf - bp) + 1024);
+               bp = requote(bp, argv[i], (buf - bp) + BUFSIZ);
        }
        *bp = '\0';
        com_err(whoami, 0, "%s", buf);
 }
        
 void mr_com_err(whoami, code, fmt, pvar)
-       char *whoami;
-       int code;
-       char *fmt;
-       caddr_t pvar;
+       const char *whoami;
+       long code;
+       const char *fmt;
+       va_list pvar;
 {
-       extern char *error_message();
        extern client *cur_client;
        
        if (whoami) {
@@ -111,7 +105,7 @@ char **argv;
     register unsigned char *p, *lastch;
 
     for (arg = argv; argc--; arg++) {
-       for (lastch = p = *arg; *p; p++) {
+       for (lastch = p = (unsigned char *) *arg; *p; p++) {
            /* If any byte in the string has the high bit set, assume
             * that it is binary and we do not want to trim it.
             * Setting p = lastch will cause us not to trim the string
@@ -128,7 +122,7 @@ char **argv;
            if (isspace(*lastch))
              *lastch = 0;
            else
-             *(++lastch) = 0;
+             if (*(++lastch)) *lastch = 0;
        }
     }
     return(0);