bug #18630, #18631, #18632, #18634: various patches from Craig Leres

[mmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 2a7a1cc..64df443 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -12,9 +12,16 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <stdlib.h>
+#include <fcntl.h>
 #include <errno.h>
 
 /*
+ * We allocate space for messages (msgs array)
+ * this number of elements at a time.
+ */
+#define MAXMSGS 256
+
+/*
  * Safely call malloc
  */
 void *
@@ -141,3 +148,56 @@ void create_folder(char *folder, int autocreate, void (*done_callback)())
             adios (NULL, "unable to create folder %s", folder);
     }
 }
+
+/*
+ * num_digits
+ *      Return the number of digits in a nonnegative integer.
+ */
+int
+num_digits (int n)
+{
+    int ndigits = 0;
+
+    /* Sanity check */
+    if (n < 0)
+        adios (NULL, "oops, num_digits called with negative value");
+
+    if (n == 0)
+        return 1;
+
+    while (n) {
+        n /= 10;
+        ndigits++;
+    }
+
+    return ndigits;
+}
+
+/*
+ * 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.
+ */
+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));
+       msgs->msgs[msgs->size++] = cp;
+}
+
+/* Open a form or components file */
+int
+open_form(char **form, char *def)
+{
+       int in;
+       if (*form) {
+               if ((in = open (etcpath (*form), O_RDONLY)) == NOTOK)
+                       adios (*form, "unable to open form file");
+       } else {
+               if ((in = open (etcpath (def), O_RDONLY)) == NOTOK)
+                       adios (def, "unable to open default components file");
+               *form = def;
+       }
+       return in;
+}