X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6c42153ad9362cc676ea66563bf400d7511b3b68..9322ba2854211794c27fae9468768b80b767c211:/sbr/concat.c

diff --git a/sbr/concat.c b/sbr/concat.c
index a338835b..afe48206 100644
--- a/sbr/concat.c
+++ b/sbr/concat.c
@@ -3,18 +3,22 @@
  * concat.c -- concatenate a variable number (minimum of 1)
  *             of strings in managed memory
  *
- * $Id$
- *
  * 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>
 
 
+/* concat returns a non-NULL malloc'd pointer to the catenation of the
+ * argument strings less their NUL terminators other than the last.  The
+ * arguments are terminated by a NULL.
+ *
+ * Example:  concat("abc", "def", "", "g", NULL) returns "abcdefg". */
 char *
-concat (char *s1, ...)
+concat (const char *s1, ...)
 {
     char *cp, *dp, *sp;
     size_t len;
@@ -26,14 +30,13 @@ concat (char *s1, ...)
 	len += strlen (cp);
     va_end(list);
 
-    if (!(dp = sp = malloc(len)))
-	adios (NULL, "unable to allocate string storage");
+    dp = sp = mh_xmalloc(len);
 
-    sp = copy(s1, sp);
+    sp = stpcpy(sp, s1);
 
     va_start(list, s1); 
     while ((cp = va_arg (list, char *)))
-	sp = copy(cp, sp);
+	sp = stpcpy(sp, cp);
     va_end(list);
 
     return dp;