X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bf3160aa94f981374f0c6353344fd68a4e1daa12..d6c3b7e970429b2d8325161a749fe06858d234bc:/sbr/path.c diff --git a/sbr/path.c b/sbr/path.c index bf9283a3..9f70bc16 100644 --- a/sbr/path.c +++ b/sbr/path.c @@ -22,26 +22,31 @@ static char *pwds; static char *expath(char *,int); static void compath(char *); + +/* Return value must be free(3)'d. */ char * pluspath(char *name) { return path(name + 1, *name == '+' ? TFOLDER : TSUBCWF); } + +/* Return value must be free(3)'d. */ char * path(char *name, int flag) { - char *cp, *ep; + char *p, *last; - if ((cp = expath (name, flag)) - && (ep = cp + strlen (cp) - 1) > cp - && *ep == '/') - *ep = '\0'; + p = expath(name, flag); + last = p + strlen(p) - 1; + if (last > p && *last == '/') + *last = '\0'; - return cp; + return p; } +/* Return value must be free(3)'d. */ static char * expath (char *name, int flag) {