X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Futils.c;h=fa4cfdb2b3b8e5e97831407f5599327b05fa43e5;hp=55be77c4231242426c6f955ee3cf4f8fc510f5fd;hb=bdd879c997e50e6b6e14dffb746d9fe9b6a1cf6c;hpb=137b1ac9efd8d566e03708b74fe3f9d8d5c266f8

diff --git a/sbr/utils.c b/sbr/utils.c
index 55be77c..fa4cfdb 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)
@@ -26,12 +29,14 @@ mh_xmalloc(size_t size)
 {
 	void *memory;
 
-	if (size == 0)
-		adios(NULL, "Tried to malloc 0 bytes");
+	if (size == 0) {
+		adios(EX_SOFTWARE, NULL, "Tried to malloc 0 bytes");
+	}
 
 	memory = malloc(size);
-	if (!memory)
-		adios(NULL, "Malloc failed");
+	if (!memory) {
+		adios(EX_OSERR, NULL, "Malloc failed");
+	}
 
 	return memory;
 }
@@ -45,27 +50,48 @@ 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");
+	if (!ptr) {
+		return mh_xcalloc((size_t) 1, size);
+	}
+	if (size == 0) {
+		adios(EX_SOFTWARE, NULL, "Tried to realloc 0 bytes");
+	}
 
 	memory = realloc(ptr, size);
-	if (!memory)
-		adios(NULL, "Realloc failed");
+	if (!memory) {
+		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)) {
@@ -89,6 +115,7 @@ pwd(void)
 /*
 ** add   -- If "s1" is NULL, this routine just creates a
 **       -- copy of "s2" into newly malloc'ed memory.
+**       -- (use getcpy() instead in this case)
 **       --
 **       -- If "s1" is not NULL, then copy the concatenation
 **       -- of "s1" and "s2" (note the order) into newly
@@ -100,10 +127,12 @@ add(char *s2, char *s1)
 	char *cp;
 	size_t len1 = 0, len2 = 0;
 
-	if (s1)
+	if (s1) {
 		len1 = strlen(s1);
-	if (s2)
+	}
+	if (s2) {
 		len2 = strlen(s2);
+	}
 
 	cp = mh_xmalloc(len1 + len2 + 1);
 
@@ -114,8 +143,9 @@ add(char *s2, char *s1)
 	}
 
 	/* Copy s2 */
-	if (s2)
+	if (s2) {
 		memcpy(cp + len1, s2, len2);
+	}
 
 	/* Now NULL terminate the string */
 	cp[len1 + len2] = '\0';
@@ -123,30 +153,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
@@ -160,20 +166,23 @@ create_folder(char *folder, int autocreate, void (*done_callback)(int))
 	char *cp;
 
 	if (stat(folder, &st) == -1) {
-		if (errno != ENOENT)
-			adios(folder, "error on folder");
+		if (errno != ENOENT) {
+			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);
+			if (!getanswer(cp)) {
+				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(EX_CANTCREAT, NULL, "unable to create folder %s", folder);
 		}
-		if (!makedir(folder))
-			adios(NULL, "unable to create folder %s", folder);
 	}
 }
 
@@ -187,11 +196,13 @@ num_digits(int n)
 	int ndigits = 0;
 
 	/* Sanity check */
-	if (n < 0)
-		adios(NULL, "oops, num_digits called with negative value");
+	if (n < 0) {
+		adios(EX_SOFTWARE, NULL, "oops, num_digits called with negative value");
+	}
 
-	if (n == 0)
+	if (n == 0) {
 		return 1;
+	}
 
 	while (n) {
 		n /= 10;
@@ -209,24 +220,9 @@ num_digits(int n)
 void
 app_msgarg(struct msgs_array *msgs, char *cp)
 {
-	if(msgs->size >= msgs->max)
+	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;
+	msgs->msgs[msgs->size++] = cp;
 }