- register char *cp;
- static char curwd[PATH_MAX];
-
- if (!getcwd (curwd, PATH_MAX)) {
- admonish (NULL, "unable to determine working directory");
- if (!mypath || !*mypath
- || (strcpy (curwd, mypath), chdir (curwd)) == -1) {
- strcpy (curwd, "/");
- chdir (curwd);
- }
- return curwd;
- }
+ char *cp;
+ static char curwd[PATH_MAX];
+
+ if (!getcwd(curwd, PATH_MAX)) {
+ admonish(NULL, "unable to determine working directory");
+ if (!mypath || !*mypath ||
+ (strcpy(curwd, mypath), chdir(curwd)) == -1) {
+ strcpy(curwd, "/");
+ chdir(curwd);
+ }
+ return curwd;
+ }
+
+ if ((cp = curwd + strlen(curwd) - 1) > curwd && *cp == '/') {
+ /* strip trailing slash */
+ *cp = '\0';
+ }
+
+ return curwd;
+}
+
+/*
+** 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
+** -- malloc'ed memory. Then free "s1".
+*/
+char *
+add(char *s2, char *s1)
+{
+ char *cp;
+ size_t len1 = 0, len2 = 0;