Use LEN() on string constants instead of strlen().

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 4a460762bd035695e4abf5974b4721b4a56ff817..7306170952591eefc98f2ea019919d999930db1f 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -25,62 +25,75 @@ extern char *mhdocdir;
  */
 #define MAXMSGS 256
 
  */
 #define MAXMSGS 256
 

-/*
- * Safely call malloc
- */
-void *
-mh_xmalloc(size_t size)
+/* Call malloc(3), exiting on NULL return. */
+void *mh_xmalloc(size_t size)

 {
 {

-    void *memory;
+    void *p;

 
     if (size == 0)
 
     if (size == 0)

-        adios(NULL, "Tried to malloc 0 bytes");
+        size = 1; /* Some mallocs don't like 0. */
+    p = malloc(size);
+    if (!p)
+        adios(NULL, "malloc failed, size wanted: %zu", size);

 
 

-    memory = malloc(size);
-    if (!memory)
-        adios(NULL, "Malloc failed");
-
-    return memory;
+    return p;

 }
 
 }
 

-/*
- * Safely call realloc
- */
-void *
-mh_xrealloc(void *ptr, size_t size)
+/* Call realloc(3), exiting on NULL return. */
+void *mh_xrealloc(void *ptr, size_t size)

 {
 {

-    void *memory;
+    void *new;

 
 

-    /* Some non-POSIX realloc()s don't cope with realloc(NULL,sz) */
+    /* Copy POSIX behaviour, coping with non-POSIX systems. */
+    if (size == 0) {
+        if (ptr) {
+            free(ptr);
+        }
+        return mh_xmalloc(1); /* Get a unique pointer. */
+    }

     if (!ptr)
         return mh_xmalloc(size);
 
     if (!ptr)
         return mh_xmalloc(size);
 

-    if (size == 0)
-        adios(NULL, "Tried to realloc 0 bytes");
+    new = realloc(ptr, size);
+    if (!new)
+        adios(NULL, "realloc failed, size wanted: %zu", size);

 
 

-    memory = realloc(ptr, size);
-    if (!memory)
-        adios(NULL, "Realloc failed");
+    return new;
+}
+
+/* Call calloc(3), exiting on NULL return. */
+void *mh_xcalloc(size_t nelem, size_t elsize)
+{
+    void *p;
+
+    if (!nelem || !elsize)
+        return mh_xmalloc(1); /* Get a unique pointer. */

 
 

-    return memory;
+    p = calloc(nelem, elsize);
+    if (!p)
+        adios(NULL, "calloc failed, size wanted: %zu * %zu", nelem, elsize);
+
+    return p;

 }
 
 }
 

-/*
- * Safely call calloc
- */
-void *
-mh_xcalloc(size_t nmemb, size_t size)
+/* Duplicate a NUL-terminated string, exit on failure. */
+char *mh_xstrdup(const char *src)

 {
 {

-    void *memory;
+    size_t n;
+    char *dest;

 
 

-    if (nmemb == 0  ||  size == 0)
-        adios(NULL, "Tried to calloc 0 bytes");
+    n = strlen(src) + 1; /* Ignore possibility of overflow. */
+    dest = mh_xmalloc(n);
+    memcpy(dest, src, n);

 
 

-    if ((memory = calloc(nmemb, size))) {
-        return memory;
-    } else {
-        adios(NULL, "calloc failed");
-    }
+    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. */

 }
 
 /*
 }
 
 /*


@@ -90,7 +103,7 @@ mh_xcalloc(size_t nmemb, size_t size)
 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)) {


@@ -347,6 +360,27 @@ nmh_strcasestr (const char *s1, const char *s2) {
 }
 
 
 }
 
 

+/* EndsWithC returns true if non-NULL string s ends with a c before the
+ * terminating NUL. */
+bool EndsWithC(char *s, int c)
+{
+    return *s && s[strlen(s) - 1] == c;
+}
+
+
+/* TrimSuffixC deletes c from the end of non-NULL string s if it's
+ * present, shortening s by 1.  Only one instance of c is removed. */
+void TrimSuffixC(char *s, int c)
+{
+    if (!*s)
+        return;
+
+    s += strlen(s) - 1;
+    if (*s == c)
+        *s = '\0';
+}
+
+

 int
 nmh_init(const char *argv0, int read_context) {
     if (! setlocale(LC_ALL, "")) {
 int
 nmh_init(const char *argv0, int read_context) {
     if (! setlocale(LC_ALL, "")) {


@@ -410,7 +444,7 @@ nmh_init(const char *argv0, int read_context) {
     } else {
         int status = context_foil(NULL);
         if (status != OK) {
     } else {
         int status = context_foil(NULL);
         if (status != OK) {

-            advise("", "failed to create minimal profile/conext");
+            advise("", "failed to create minimal profile/context");

         }
         return status;
     }
         }
         return status;
     }