mhbuildsbr.c: Flip logic, moving goto to then-block; no need for else.

[nmh] / sbr / concat.c

diff --git a/sbr/concat.c b/sbr/concat.c
index 4d4e15c1fd9191d76b6674764ea74f7c69ba1e7d..b97c6e44e82ec1731b86ff286b5beedf36157c59 100644 (file)
--- a/sbr/concat.c
+++ b/sbr/concat.c
@@ -1,10 +1,6 @@
-
-/*
- * concat.c -- concatenate a variable number (minimum of 1)
+/* 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.
@@ -14,8 +10,13 @@
 #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;
@@ -29,11 +30,11 @@ concat (char *s1, ...)
 
     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;