Move #include from h/mh.h to source files

[mmh] / sbr / path.c

diff --git a/sbr/path.c b/sbr/path.c
index e5576b8..90d3a27 100644 (file)
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -8,6 +8,7 @@
 
 #include <h/mh.h>
 #include <pwd.h>
+#include <unistd.h>
 
 
 /*
@@ -18,6 +19,7 @@
 ** 2) Next, if already absolute pathname, then leave unchanged.
 ** 3) Next, check in mmh directory.
 ** 4) Next, check in mmh `etc' directory.
+** 5) As fall-back, return `file' unchanged.
 */
 char *
 etcpath(char *file)
@@ -65,9 +67,11 @@ try_it:
 
        /* Check nmh `etc' directory */
        snprintf(epath, sizeof epath, "%s/%s", mhetcdir, file);
-       return (access(epath, R_OK) != NOTOK ? epath : file);
+       if  (access(epath, R_OK) != NOTOK)
+               return epath;
 
-       /* TODO: What is the ultimate fallback? NULL or file? */
+       /* The fall-back */
+       return file;
 }
 
 
@@ -234,12 +238,13 @@ char *
 expanddir(char *d)
 {
        static char buf[BUFSIZ];
+       int len;
 
        if (*d == '/') {
                strcpy(buf, d);
        } else {
                getcwd(buf, sizeof buf);
-               int len = strlen(buf);
+               len = strlen(buf);
                snprintf(buf+len, sizeof buf - len, "/%s", d);
        }
        packpath(buf);