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

diff --git a/sbr/utils.c b/sbr/utils.c
index 5c1253d..641a75d 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