Bomb out with an error message if something goes wrong. Duh!

[moira.git] / server / mr_util.c

diff --git a/server/mr_util.c b/server/mr_util.c
index e5d2d8e7f63696680323f8053a34a1101396fec6..af7e266f24b6a474ab560166762189e25a6ba218 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,12 +58,12 @@ 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);
@@ -80,7 +75,6 @@ void mr_com_err(whoami, code, fmt, pvar)
        char *fmt;
        caddr_t pvar;
 {
-       extern char *error_message();
        extern client *cur_client;
        
        if (whoami) {
@@ -99,7 +93,8 @@ void mr_com_err(whoami, code, fmt, pvar)
 
 
 /* mr_trim_args: passed an argument vector, it will trim any trailing
- * spaces on the args by writing a null into the string.
+ * spaces on the args by writing a null into the string.  If an argument
+ * appears to be binary instead of ASCII, it will not be trimmed.
  */
 
 int mr_trim_args(argc, argv)
@@ -107,12 +102,22 @@ int argc;
 char **argv;
 {
     register char **arg;
-    register char *p, *lastch;
+    register unsigned char *p, *lastch;
 
     for (arg = argv; argc--; arg++) {
-       for (lastch = p = *arg; *p; p++)
-         if (!isspace(*p))
-           lastch = 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
+            * when we break out of this inner loop.
+            */
+           if (*p >= 0x80) {
+               p = lastch;
+               break;
+           }
+           if (!isspace(*p))
+             lastch = p;
+       }
        if (p != lastch) {
            if (isspace(*lastch))
              *lastch = 0;