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

[mmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 5c1253d..1a9093d 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -11,6 +11,8 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <unistd.h>
+#include <sys/stat.h>
 
 /*
 ** We allocate space for messages (msgs array)
@@ -45,11 +47,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)
@@ -70,16 +73,18 @@ pwd(void)
 
        if (!getcwd(curwd, PATH_MAX)) {
                admonish(NULL, "unable to determine working directory");
-               if (!mypath || !*mypath
-                       || (strcpy(curwd, mypath), chdir(curwd)) == -1) {
+               if (!mypath || !*mypath ||
+                               (strcpy(curwd, mypath), chdir(curwd)) == -1) {
                        strcpy(curwd, "/");
                        chdir(curwd);
                }
                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 +92,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
@@ -121,30 +127,6 @@ add(char *s2, char *s1)
        return cp;
 }
 
-/*
-** folder_exists
-**     Check to see if a folder exists.
-*/
-int
-folder_exists(char *folder)
-{
-       struct stat st;
-       int exists = 0;
-
-       if (stat(folder, &st) == -1) {
-               /*
-               ** The folder either doesn't exist, or we hit an error.
-               ** Either way return a failure.
-               */
-               exists = 0;
-       } else {
-               /* We can see a folder with the right name */
-               exists = 1;
-       }
-
-       return exists;
-}
-
 
 /*
 ** create_folder
@@ -212,19 +194,3 @@ app_msgarg(struct msgs_array *msgs, char *cp)
                                (msgs->max+=MAXMSGS)*sizeof(*msgs->msgs));
        msgs->msgs[msgs->size++] = cp;
 }
-
-/* Open a form or components file */
-int
-open_form(char **form, char *def)
-{
-       int in;
-       if (*form) {
-               if ((in = open(etcpath(*form), O_RDONLY)) == NOTOK)
-                       adios(*form, "unable to open form file");
-       } else {
-               if ((in = open(etcpath(def), O_RDONLY)) == NOTOK)
-                       adios(def, "unable to open default components file");
-               *form = def;
-       }
-       return in;
-}