X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Futils.c;h=7c4ddcf26e46fe4256c0d39e1835958b4ffa27d9;hb=6b7218e1ae606329bf2e45b08e2e46cb9f0fc998;hp=2a7a1ccfb150ac67826d8b23abb0a953711f6209;hpb=08aa8c17c3241bb5c6a997ed2e01e25a4d0089ce;p=mmh

diff --git a/sbr/utils.c b/sbr/utils.c
index 2a7a1cc..7c4ddcf 100644
--- 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 *
@@ -40,6 +47,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");
 
@@ -114,11 +125,34 @@ add (char *s2, char *s1)
 }
 
 /*
+ * folder_exists
+ *      Check to see if a folder exists.
+ */
+int folder_exists(char *folder)
+{
+    struct stat st;
+    int exists = 0;
+
+    if (stat (folder, &st) == -1) {
+        /* The folder either doesn't exist, or we hit an error.  Either way
+         * return a failure.
+         */
+        exists = 0;
+    } else {
+        /* We can see a folder with the right name */
+        exists = 1;
+    }
+
+    return exists;
+}
+
+
+/*
  * create_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;
@@ -141,3 +175,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;
+}