X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Futils.c;h=641a75db6006de715d4cd82b49d91afbbaa170e2;hb=33dc8211a72df0c27fa11220f3b27583cd1c7e49;hp=99c551010ded78c7c07e5c8b9de5d3ad412f8800;hpb=cadeb41388928c84e39842b6a45d1bdce1773ad4;p=mmh diff --git a/sbr/utils.c b/sbr/utils.c index 99c5510..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) @@ -78,8 +79,10 @@ pwd(void) 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