X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/feb046ca47916a986f323ac72c5cf76c94ea02f7..d9c88cd101a63778a85dfd55a01a3af0db2465c9:/sbr/getcpy.c?ds=sidebyside

diff --git a/sbr/getcpy.c b/sbr/getcpy.c
index 846d33a9..42779e02 100644
--- a/sbr/getcpy.c
+++ b/sbr/getcpy.c
@@ -1,8 +1,6 @@
-
-/*
- * getcpy.c -- copy a string in managed memory
+/* 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.
  *
@@ -11,23 +9,16 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
-
+#include "h/mh.h"
+#include "getcpy.h"
+#include "h/utils.h"
 
+/* Return malloc'd copy of str, or of "" if NULL, exit on failure. */
 char *
-getcpy (const char *str)
+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);
 }