Makefile.am: Add test/inc/test-eom-align to XFAIL_TESTS.

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index e0725148fbd0ed6ee6cc39226eae553d945bbe52..8281b4fc44fc172fb0de52de84858966f6077441 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -9,6 +9,7 @@
 #include <h/utils.h>
 #include <h/signals.h>
 #include "m_mktemp.h"
 #include <h/utils.h>
 #include <h/signals.h>
 #include "m_mktemp.h"

+#include "makedir.h"

 #include <fcntl.h>
 
 extern char *mhdocdir;
 #include <fcntl.h>
 
 extern char *mhdocdir;


@@ -266,22 +267,6 @@ app_msgnum(struct msgnum_array *msgs, int msgnum)
        msgs->msgnums[msgs->size++] = msgnum;
 }
 
        msgs->msgnums[msgs->size++] = msgnum;
 }
 

-/* 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;
-}
-

 
 /*
  * Finds first occurrence of str in buf.  buf is not a C string but a
 
 /*
  * Finds first occurrence of str in buf.  buf is not a C string but a


@@ -546,18 +531,6 @@ nmh_version_changed (int older) {
 }
 
 
 }
 
 

-/* Returns copy of argument str with all characters converted to upper
-   case, and trimmed whitespace (see cpytrim()) . */
-char *
-upcase (const char *str) {
-    char *up = cpytrim (str);
-
-    to_upper(up);
-
-    return up;
-}
-
-

 /*
  * Scan for any 8-bit characters.  Return 1 if they exist.
  *
 /*
  * Scan for any 8-bit characters.  Return 1 if they exist.
  *


@@ -588,7 +561,7 @@ scan_input (int fd, int *eightbit) {
     char buf[BUFSIZ];
 
     *eightbit = 0;
     char buf[BUFSIZ];
 
     *eightbit = 0;

-    lseek (fd, (off_t) 0, SEEK_SET);
+    lseek(fd, 0, SEEK_SET);

 
     while ((state = read (fd, buf, sizeof buf)) > 0) {
         if (contains8bit (buf, buf + state)) {
 
     while ((state = read (fd, buf, sizeof buf)) > 0) {
         if (contains8bit (buf, buf + state)) {