X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5dd6771b28c257af405d7248639ed0e3bcdce38b..8eacff500716cab8256b032c0f4dd29bc2dc16bb:/sbr/getcpy.c

diff --git a/sbr/getcpy.c b/sbr/getcpy.c
index 66332480..32c8db43 100644
--- a/sbr/getcpy.c
+++ b/sbr/getcpy.c
@@ -2,7 +2,7 @@
 /*
  * getcpy.c -- copy a string in managed memory
  *
- * THIS IS OBSOLETE.  NEED TO REPLACE ALL OCCURENCES
+ * THIS IS OBSOLETE.  NEED TO REPLACE ALL OCCURRENCES
  * OF GETCPY WITH STRDUP.  BUT THIS WILL REQUIRE
  * CHANGING PARTS OF THE CODE TO DEAL WITH NULL VALUES.
  *
@@ -14,20 +14,11 @@
 #include <h/mh.h>
 #include <h/utils.h>
 
-
-char *
-getcpy (char *str)
+/* Return malloc'd copy of str, or of "" if NULL, exit on failure. */
+char *getcpy(const char *str)
 {
-    char *cp;
-    size_t len;
+    if (str)
+        return mh_xstrdup(str);
 
-    if (str) {
-	len = strlen(str) + 1;
-	cp = mh_xmalloc (len);
-	memcpy (cp, str, len);
-    } else {
-	cp = mh_xmalloc ((size_t) 1);
-	*cp = '\0';
-    }
-    return cp;
+    return mh_xcalloc(1, 1);
 }