X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fconcat.c;h=9efe73180d894870b7e14e606b1950a0f7da0c39;hp=939a484f4579fc5ef2f0c4f209126e5f8e2b60df;hb=88b2142594d5ea1e8385dae5eca81eed1018c555;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b

diff --git a/sbr/concat.c b/sbr/concat.c
index 939a484..9efe731 100644
--- a/sbr/concat.c
+++ b/sbr/concat.c
@@ -1,36 +1,49 @@
-
 /*
- * concat.c -- concatenate a variable number (minimum of 1)
- *             of strings in managed memory
- *
- * $Id$
- */
+** concat.c -- concatenate a variable number (minimum of 1)
+**             of strings in managed memory
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
+#include <h/utils.h>
+#include <stdarg.h>
+
+
+static char *
+copy(char *from, char *to)
+{
+        while ((*to = *from)) {
+                to++;
+                from++;
+        }
+        return (to);
+}
 
 
 char *
-concat (char *s1, ...)
+concat(char *s1, ...)
 {
-    char *cp, *dp, *sp;
-    size_t len;
-    va_list list;
+	char *cp, *dp, *sp;
+	size_t len;
+	va_list list;
 
-    len = strlen (s1) + 1;
-    va_start(list, s1); 
-    while ((cp = va_arg(list, char *)))
-	len += strlen (cp);
-    va_end(list);
+	len = strlen(s1) + 1;
+	va_start(list, s1);
+	while ((cp = va_arg(list, char *)))
+		len += strlen(cp);
+	va_end(list);
 
-    if (!(dp = sp = malloc(len)))
-	adios (NULL, "unable to allocate string storage");
+	dp = sp = mh_xcalloc(len, sizeof(char));
 
-    sp = copy(s1, sp);
+	sp = copy(s1, sp);
 
-    va_start(list, s1); 
-    while ((cp = va_arg (list, char *)))
-	sp = copy(cp, sp);
-    va_end(list);
+	va_start(list, s1);
+	while ((cp = va_arg(list, char *)))
+		sp = copy(cp, sp);
+	va_end(list);
 
-    return dp;
+	return dp;
 }