Changes from dtanner.

[moira.git] / server / mr_util.c

diff --git a/server/mr_util.c b/server/mr_util.c
index 433f1893b4037aa8064cd8ae1d58fdf9e7192659..8320877d640ae4b5b54f1c2932130dc090451234 100644 (file)
--- a/server/mr_util.c
+++ b/server/mr_util.c
@@ -17,60 +17,67 @@ RCSID("$Header$");
 
 extern char *whoami;
 
-char *requote(char *buf, char *cp, int len)
+char *requote(char *cp)
 {
-  int count = 0;
-  unsigned char c;
-  if (len <= 2)
-    return buf;
-  *buf++ = '"';
-  count++;
-  len--;
-  for (; (count < 258) && (len > 1) && (c = *cp); cp++, --len, ++count)
+  int len = 0;
+  char *out = xmalloc(4 * strlen(cp) + 3), *op = out;
+
+  *op++ = '"';
+  len++;
+  while (*cp)
     {
-      if (c == '\\' || c == '"')
-       *buf++ = '\\';
-      if (isprint(c))
-       *buf++ = c;
+      if (*cp == '\\' || *cp == '"')
+       {
+         *op++ = '\\';
+         len++;
+       }
+      if (isprint(*cp))
+       {
+         *op++ = *cp++;
+         len++;
+       }
       else
        {
-         sprintf(buf, "\\%03o", c);
-         buf = strchr(buf, '\0');
+         sprintf(op, "\\%03o", (unsigned char)*cp++);
+         op += 4;
+         len += 4;
        }
     }
-  if (len > 1)
-    {
-      *buf++ = '"';
-      count++;
-      len--;
-    }
-  if (len > 1)
-    *buf = '\0';
-  return buf;
+
+  strcpy(op, "\"");
+  len += 2;
+
+  out = realloc(out, len); /* shrinking, so can't fail */
+  return out;
 }
 
 void log_args(char *tag, int version, int argc, char **argv)
 {
-  char buf[BUFSIZ];
-  int i;
+  char *buf, **qargv;
+  int i, len;
   char *bp;
 
-  i = strlen(tag);
-  sprintf(buf, "%s[%d]: ", tag, version);
-  for (bp = buf; *bp; bp++)
-    ;
+  qargv = xmalloc(argc * sizeof(char *));
 
-  for (i = 0; i < argc && ((buf - bp) + BUFSIZ) > 2; i++)
+  for (i = len = 0; i < argc; i++)
     {
-      if (i != 0)
-       {
-         *bp++ = ',';
-         *bp++ = ' ';
-       }
-      bp = requote(bp, argv[i], (buf - bp) + BUFSIZ);
+      qargv[i] = requote(argv[i]);
+      len += strlen(qargv[i]) + 2;
     }
-  *bp = '\0';
-  com_err(whoami, 0, "%s", buf);
+
+  buf = xmalloc(len + 1);
+
+  for (i = 0, *buf = '\0'; i < argc; i++)
+    {
+      if (i)
+       strcat(buf, ", ");
+      strcat(buf, qargv[i]);
+      free(qargv[i]);
+    }
+  free(qargv);
+
+  com_err(whoami, 0, "%s[%d]: %s", tag, version, buf);
+  free(buf);
 }
 
 void mr_com_err(const char *whoami, long code, const char *fmt, va_list pvar)
@@ -141,11 +148,9 @@ char **mr_copy_args(char **argv, int argc)
   char **a;
   int i;
 
-  a = malloc(argc * sizeof(char *));
-  if (!a)
-    return a;
+  a = xmalloc(argc * sizeof(char *));
   for (i = 0; i < argc; i++)
-    a[i] = strdup(argv[i]);
+    a[i] = xstrdup(argv[i]);
   return a;
 }
 
@@ -172,3 +177,14 @@ void *xrealloc(void *ptr, size_t bytes)
   critical_alert("moirad", "Out of memory");
   exit(1);
 }
+
+char *xstrdup(char *str)
+{
+  char *buf = strdup(str);
+
+  if (buf)
+    return buf;
+
+  critical_alert("moirad", "Out of memory");
+  exit(1);
+}