Replace getcpy() with mh_xstrdup() where the string isn't NULL.

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 0766809d9df06c92e361ff96af0884df911f8d81..c9769fb0b909303789d855e6000ccfea9ae8d938 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -76,6 +76,26 @@ void *mh_xcalloc(size_t nelem, size_t elsize)
     return p;
 }
 
     return p;
 }
 

+/* Duplicate a NUL-terminated string, exit on failure. */
+char *mh_xstrdup(const char *src)
+{
+    size_t n;
+    char *dest;
+
+    n = strlen(src) + 1; /* Ignore possibility of overflow. */
+    dest = mh_xmalloc(n);
+    memcpy(dest, src, n);
+
+    return dest;
+}
+
+/* Call free(3), if ptr isn't NULL. */
+void mh_xfree(void *ptr)
+{
+    if (ptr)
+        free(ptr); /* Some very old platforms can't cope with NULL. */
+}
+

 /*
  * Return the present working directory, if the current directory does not
  * exist, or is too long, make / the pwd.
 /*
  * Return the present working directory, if the current directory does not
  * exist, or is too long, make / the pwd.


@@ -83,7 +103,7 @@ void *mh_xcalloc(size_t nelem, size_t elsize)
 char *
 pwd(void)
 {
 char *
 pwd(void)
 {

-    register char *cp;
+    char *cp;

     static char curwd[PATH_MAX];
 
     if (!getcwd (curwd, PATH_MAX)) {
     static char curwd[PATH_MAX];
 
     if (!getcwd (curwd, PATH_MAX)) {