X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Futils.c;h=5c5b0f5149a01dfd19cf1044e9b799acbb0b26b9;hp=5c1253d8b174f1e2883d4ecb016838ada0980f65;hb=dfa0332c4e6144699dedd5c9795219adc0f9c0d2;hpb=714b5c530ece27ea2835a313013f5b770163403c

diff --git a/sbr/utils.c b/sbr/utils.c
index 5c1253d..5c5b0f5 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -45,11 +45,12 @@ mh_xrealloc(void *ptr, size_t size)
 	void *memory;
 
 	/* Some non-POSIX realloc()s don't cope with realloc(NULL,sz) */
-	if (!ptr)
+	if (!ptr) {
 		return mh_xmalloc(size);
+	}
 
 	if (size == 0)
-		adios(NULL, "Tried to realloc 0bytes");
+		adios(NULL, "Tried to realloc 0 bytes");
 
 	memory = realloc(ptr, size);
 	if (!memory)
@@ -70,16 +71,18 @@ pwd(void)
 
 	if (!getcwd(curwd, PATH_MAX)) {
 		admonish(NULL, "unable to determine working directory");
-		if (!mypath || !*mypath
-			|| (strcpy(curwd, mypath), chdir(curwd)) == -1) {
+		if (!mypath || !*mypath ||
+				(strcpy(curwd, mypath), chdir(curwd)) == -1) {
 			strcpy(curwd, "/");
 			chdir(curwd);
 		}
 		return curwd;
 	}
 
-	if ((cp = curwd + strlen(curwd) - 1) > curwd && *cp == '/')
+	if ((cp = curwd + strlen(curwd) - 1) > curwd && *cp == '/') {
+		/* strip trailing slash */
 		*cp = '\0';
+	}
 
 	return curwd;
 }
@@ -87,6 +90,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
@@ -212,19 +216,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;
-}