%(divide): Avoid SIGFPE on integer divide of INT_MIN by -1.

[nmh] / sbr / concat.c

diff --git a/sbr/concat.c b/sbr/concat.c
index 234d17519987fc676c202ec91d2fa96eba7ee8b2..b99f0c025b7fa1c5fd8908c03f5a8b87aa495f96 100644 (file)
--- a/sbr/concat.c
+++ b/sbr/concat.c
@@ -1,6 +1,4 @@
-
-/*
- * concat.c -- concatenate a variable number (minimum of 1)
+/* 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
@@ -8,8 +6,9 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "concat.h"
+#include "h/utils.h"
 
 
 /* concat returns a non-NULL malloc'd pointer to the catenation of the
@@ -32,11 +31,11 @@ concat (const 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;