X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Futils.c;h=a279a327d16f70cf6b60e3500419d77362c4af97;hb=7fd676d57355fd26c1127a79d9ba805973928316;hp=87d368dde46d81b3ae7463741894d188e84837a9;hpb=7edb0cbc236244d996d1e2ae1d58d0e9f7d98062;p=mmh

diff --git a/sbr/utils.c b/sbr/utils.c
index 87d368d..a279a32 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -2,8 +2,6 @@
 /*
  * utils.c -- various utility routines
  *
- * $Id$
- *
  * This code is Copyright (c) 2006, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -47,6 +45,10 @@ mh_xrealloc(void *ptr, size_t size)
 {
     void *memory;
 
+    /* Some non-POSIX realloc()s don't cope with realloc(NULL,sz) */
+    if (!ptr)
+        return mh_xmalloc(size);
+
     if (size == 0)
         adios(NULL, "Tried to realloc 0bytes");
 
@@ -121,6 +123,19 @@ add (char *s2, char *s1)
 }
 
 /*
+ * addlist
+ *	Append an item to a comma separated list
+ */
+char *
+addlist (char *list, char *item)
+{
+    if (list)
+    	list = add (", ", list);
+
+    return add (item, list);
+}
+
+/*
  * folder_exists
  *      Check to see if a folder exists.
  */
@@ -148,7 +163,7 @@ int folder_exists(char *folder)
  *      Check to see if a folder exists, if not, prompt the user to create
  *      it.
  */
-void create_folder(char *folder, int autocreate, void (*done_callback)())
+void create_folder(char *folder, int autocreate, void (*done_callback)(int))
 {
     struct stat st;
     extern int errno;
@@ -198,14 +213,16 @@ num_digits (int n)
 
 /*
  * Append a message arg to an array of them, resizing it if necessary.
- * The function is written to suit the arg parsing code it was extracted
- * from, and will probably be changed when the other code is cleaned up.
+ * Really a simple vector-of-(char *) maintenance routine.
  */
 void
 app_msgarg(struct msgs_array *msgs, char *cp)
 {
-	if(msgs->size >= msgs->max)
-		msgs->msgs = mh_xrealloc(msgs->msgs, (msgs->max+=MAXMSGS)*sizeof(*msgs->msgs));
+	if(msgs->size >= msgs->max) {
+		msgs->max += MAXMSGS;
+		msgs->msgs = mh_xrealloc(msgs->msgs,
+			msgs->max * sizeof(*msgs->msgs));
+	}
 	msgs->msgs[msgs->size++] = cp;
 }