X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=sbr%2Futils.c;h=7c4ddcf26e46fe4256c0d39e1835958b4ffa27d9;hb=0aef47ae5c03e1d9e3f225efe5ae362e7cf5ee35;hp=8aba5b6ad63036e45e6cfbc0bd69e47fe2c937eb;hpb=174d375bb4b9bcaa0c3f28c422216f68703494a8;p=mmh

diff --git a/sbr/utils.c b/sbr/utils.c
index 8aba5b6..7c4ddcf 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -12,6 +12,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <stdlib.h>
+#include <fcntl.h>
 #include <errno.h>
 
 /*
@@ -46,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");
 
@@ -120,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;
@@ -184,3 +212,19 @@ app_msgarg(struct msgs_array *msgs, char *cp)
 		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;
+}