X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Futils.c;h=fa4cfdb2b3b8e5e97831407f5599327b05fa43e5;hb=4cc601f996579386ce4f4937b9b72b7b3d891107;hp=1a9093d88140752ec5f4b2a08eb77a80e9467e48;hpb=2abb9a7cfb0930e27062088734d306e7d78e4cc2;p=mmh

diff --git a/sbr/utils.c b/sbr/utils.c
index 1a9093d..fa4cfdb 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#include <sysexits.h>
 
 /*
 ** We allocate space for messages (msgs array)
@@ -28,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;
 }
@@ -48,27 +51,47 @@ 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(EX_SOFTWARE, NULL, "Tried to realloc 0 bytes");
 	}
-
-	if (size == 0)
-		adios(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)) {
@@ -104,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);
 
@@ -118,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';
@@ -140,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);
 	}
 }
 
@@ -167,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;
@@ -189,8 +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;
 }