Remove sbr/pwd.c file, moving the pwd() function into sbr/utils.c.

[mmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 7dfe900..c25e02d 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -9,7 +9,7 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/nmh.h>
+#include <h/mh.h>

 #include <h/utils.h>
 #include <stdlib.h>
 
 #include <h/utils.h>
 #include <stdlib.h>
 

@@ -42,3 +42,24 @@ mh_xrealloc(void *ptr, size_t size)
 
     return memory;
 }
 
     return memory;
 }

+char *
+pwd(void)
+{
+    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;
+    }
+
+    if ((cp = curwd + strlen (curwd) - 1) > curwd && *cp == '/')
+        *cp = '\0';
+
+    return curwd;
+}