X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Futils.c;h=b0e8274f2a0dde220ca3058c3f6b5064ada32047;hb=0595979e1f0514b3da28762f336b3b9ac9eec5c5;hp=641a75db6006de715d4cd82b49d91afbbaa170e2;hpb=0bfc482371bf63c4c312c749ba0bfc50483772ba;p=mmh

diff --git a/sbr/utils.c b/sbr/utils.c
index 641a75d..b0e8274 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -11,6 +11,9 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sysexits.h>
 
 /*
 ** We allocate space for messages (msgs array)
@@ -27,11 +30,11 @@ mh_xmalloc(size_t size)
 	void *memory;
 
 	if (size == 0)
-		adios(NULL, "Tried to malloc 0 bytes");
+		adios(EX_SOFTWARE, NULL, "Tried to malloc 0 bytes");
 
 	memory = malloc(size);
 	if (!memory)
-		adios(NULL, "Malloc failed");
+		adios(EX_OSERR, NULL, "Malloc failed");
 
 	return memory;
 }
@@ -46,27 +49,45 @@ mh_xrealloc(void *ptr, size_t size)
 
 	/* Some non-POSIX realloc()s don't cope with realloc(NULL,sz) */
 	if (!ptr) {
-		return mh_xmalloc(size);
+		return mh_xcalloc((size_t) 1, size);
 	}
 
 	if (size == 0)
-		adios(NULL, "Tried to realloc 0 bytes");
+		adios(EX_SOFTWARE, NULL, "Tried to realloc 0 bytes");
 
 	memory = realloc(ptr, size);
 	if (!memory)
-		adios(NULL, "Realloc failed");
+		adios(EX_OSERR, NULL, "Realloc failed");
 
 	return memory;
 }
 
 /*
+ * Safely call calloc
+ */
+void *
+mh_xcalloc(size_t nmemb, size_t size)
+{
+    void *memory;
+
+    if (nmemb == 0  ||  size == 0)
+        adios(EX_SOFTWARE, NULL, "Tried to calloc 0 bytes");
+
+    if ((memory = calloc(nmemb, size))) {
+        return memory;
+    } else {
+        adios(EX_OSERR, NULL, "calloc failed");
+    }
+}
+
+/*
 ** Return the present working directory, if the current directory does not
 ** exist, or is too long, make / the pwd.
 */
 char *
 pwd(void)
 {
-	register char *cp;
+	char *cp;
 	static char curwd[PATH_MAX];
 
 	if (!getcwd(curwd, PATH_MAX)) {
@@ -125,30 +146,6 @@ add(char *s2, char *s1)
 	return cp;
 }
 
-/*
-** 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
@@ -163,19 +160,19 @@ create_folder(char *folder, int autocreate, void (*done_callback)(int))
 
 	if (stat(folder, &st) == -1) {
 		if (errno != ENOENT)
-			adios(folder, "error on folder");
+			adios(EX_IOERR, folder, "error on folder");
 		if (autocreate == 0) {
 			/* ask before creating folder */
 			cp = concat("Create folder \"", folder, "\"? ", NULL);
 			if (!getanswer(cp))
-				done_callback(1);
+				done_callback(EX_CANTCREAT);
 			free(cp);
 		} else if (autocreate == -1) {
 			/* do not create, so exit */
-			done_callback(1);
+			done_callback(EX_CANTCREAT);
 		}
 		if (!makedir(folder))
-			adios(NULL, "unable to create folder %s", folder);
+			adios(EX_CANTCREAT, NULL, "unable to create folder %s", folder);
 	}
 }
 
@@ -190,7 +187,7 @@ num_digits(int n)
 
 	/* Sanity check */
 	if (n < 0)
-		adios(NULL, "oops, num_digits called with negative value");
+		adios(EX_SOFTWARE, NULL, "oops, num_digits called with negative value");
 
 	if (n == 0)
 		return 1;
@@ -216,19 +213,3 @@ app_msgarg(struct msgs_array *msgs, char *cp)
 				(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;
-}