[Nmh-commits] nmh ./ChangeLog h/prototypes.h h/utils.h sbr/Ma...

[Josh Bressers]

CVSROOT:        /sources/nmh
Module name:    nmh
Branch:         
Changes by:     Josh Bressers <address@hidden>  06/01/06 21:51:44

Modified files:
        .              : ChangeLog 
        h              : prototypes.h utils.h 
        sbr            : Makefile.in mf.c seq_read.c utils.c 
        uip            : ali.c distsbr.c mhbuild.c mhcachesbr.c 
                         mhlistsbr.c mhmail.c mhmisc.c mhshowsbr.c 
                         mhstoresbr.c picksbr.c post.c repl.c show.c 
                         slocal.c spost.c 
Removed files:
        sbr            : add.c 

Log message:
        * patch #3968: Move the add() function from its own file (add.c) and
        into utils.c. There was also a duplicate add() function in mf.c which
        has been removed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/ChangeLog.diff?tr1=1.220&tr2=1.221&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/h/prototypes.h.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/h/utils.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/sbr/Makefile.in.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/sbr/mf.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/sbr/seq_read.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/sbr/utils.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/ali.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/distsbr.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhbuild.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhcachesbr.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhlistsbr.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhmail.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhmisc.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhshowsbr.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhstoresbr.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/picksbr.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/post.c.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/repl.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/show.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/slocal.c.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/spost.c.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: nmh/ChangeLog
diff -u nmh/ChangeLog:1.220 nmh/ChangeLog:1.221
--- nmh/ChangeLog:1.220 Tue Jan  3 01:08:33 2006
+++ nmh/ChangeLog       Fri Jan  6 21:51:43 2006
@@ -1,3 +1,9 @@
+2006-01-06  Josh Bressers <address@hidden>
+
+       * patch #3968: Move the add() function from its own file (add.c) and
+       into utils.c. There was also a duplicate add() function in mf.c which
+       has been removed.
+
 2006-01-02  Josh Bressers <address@hidden>
 
        * Remove sbr/pwd.c file, moving the pwd() function into sbr/utils.c.
Index: nmh/h/prototypes.h
diff -u nmh/h/prototypes.h:1.12 nmh/h/prototypes.h:1.13
--- nmh/h/prototypes.h:1.12     Wed Dec  7 21:25:47 2005
+++ nmh/h/prototypes.h  Fri Jan  6 21:51:43 2006
@@ -2,7 +2,7 @@
 /*
  * prototypes.h -- various prototypes
  *
- * $Id: prototypes.h,v 1.12 2005/12/07 21:25:47 jon Exp $
+ * $Id: prototypes.h,v 1.13 2006/01/06 21:51:43 bress Exp $
  */
 
 /*
@@ -25,7 +25,6 @@
 /*
  * prototypes from the nmh subroutine library
  */
-char *add (char *, char *);
 void adios (char *, char *, ...);
 void admonish (char *, char *, ...);
 void advertise (char *, char *, char *, va_list);
Index: nmh/h/utils.h
diff -u nmh/h/utils.h:1.3 nmh/h/utils.h:1.4
--- nmh/h/utils.h:1.3   Tue Jan  3 01:08:33 2006
+++ nmh/h/utils.h       Fri Jan  6 21:51:43 2006
@@ -2,9 +2,10 @@
 /*
  * utils.h -- utility prototypes
  *
- * $Id: utils.h,v 1.3 2006/01/03 01:08:33 bress Exp $
+ * $Id: utils.h,v 1.4 2006/01/06 21:51:43 bress Exp $
  */
 
 void *mh_xmalloc(size_t);
 void *mh_xrealloc(void *, size_t);
 char *pwd(void);
+char *add(char *, char *);
Index: nmh/sbr/Makefile.in
diff -u nmh/sbr/Makefile.in:1.22 nmh/sbr/Makefile.in:1.23
--- nmh/sbr/Makefile.in:1.22    Tue Jan  3 01:08:33 2006
+++ nmh/sbr/Makefile.in Fri Jan  6 21:51:43 2006
@@ -1,7 +1,7 @@
 #
 # Makefile for sbr subdirectory
 #
-# $Id: Makefile.in,v 1.22 2006/01/03 01:08:33 bress Exp $
+# $Id: Makefile.in,v 1.23 2006/01/06 21:51:43 bress Exp $
 #
 
 SHELL = /bin/sh
@@ -52,7 +52,7 @@
 SIGNAL_H = @SIGNAL_H@
 
 # source for library functions
-SRCS = add.c addrsbr.c ambigsw.c atooi.c brkstring.c                   \
+SRCS = addrsbr.c ambigsw.c atooi.c brkstring.c                 \
        check_charset.c client.c closefds.c concat.c context_del.c      \
        context_find.c context_foil.c context_read.c                    \
        context_replace.c context_save.c copy.c                         \
Index: nmh/sbr/mf.c
diff -u nmh/sbr/mf.c:1.5 nmh/sbr/mf.c:1.6
--- nmh/sbr/mf.c:1.5    Mon Jan  2 03:25:18 2006
+++ nmh/sbr/mf.c        Fri Jan  6 21:51:44 2006
@@ -2,7 +2,7 @@
 /*
  * mf.c -- mail filter subroutines
  *
- * $Id: mf.c,v 1.5 2006/01/02 03:25:18 bress Exp $
+ * $Id: mf.c,v 1.6 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -18,7 +18,6 @@
  * static prototypes
  */
 static char *getcpy (char *);
-static char *add (char *, char *);
 static void compress (char *, char *);
 static int isat (char *);
 static int parse_address (void);
@@ -49,20 +48,6 @@
 }
 
 
-static char *
-add (char *s1, char *s2)
-{
-    register char *p;
-
-    if (!s2)
-       return getcpy (s1);
-
-    p = mh_xmalloc ((size_t) (strlen (s1) + strlen (s2) + 2));
-    sprintf (p, "%s%s", s2, s1);
-    free (s2);
-    return p;
-}
-
 int
 isfrom(char *string)
 {
Index: nmh/sbr/seq_read.c
diff -u nmh/sbr/seq_read.c:1.4 nmh/sbr/seq_read.c:1.5
--- nmh/sbr/seq_read.c:1.4      Fri Sep  5 18:36:36 2003
+++ nmh/sbr/seq_read.c  Fri Jan  6 21:51:44 2006
@@ -3,7 +3,7 @@
  * seq_read.c -- read the .mh_sequence file and
  *            -- initialize sequence information
  *
- * $Id: seq_read.c,v 1.4 2003/09/05 18:36:36 kenh Exp $
+ * $Id: seq_read.c,v 1.5 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -11,6 +11,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 /*
  * static prototypes
Index: nmh/sbr/utils.c
diff -u nmh/sbr/utils.c:1.4 nmh/sbr/utils.c:1.5
--- nmh/sbr/utils.c:1.4 Wed Jan  4 02:10:25 2006
+++ nmh/sbr/utils.c     Fri Jan  6 21:51:44 2006
@@ -2,7 +2,7 @@
 /*
  * utils.c -- various utility routines
  *
- * $Id: utils.c,v 1.4 2006/01/04 02:10:25 bress Exp $
+ * $Id: utils.c,v 1.5 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2006, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -74,3 +74,40 @@
 
     return curwd;
 }
+
+/*
+ * add   -- If "s1" is NULL, this routine just creates a
+ *       -- copy of "s2" into newly malloc'ed memory.
+ *       --
+ *       -- 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;
+
+    if (s1)
+        len1 = strlen (s1);
+    if (s2)
+        len2 = strlen (s2);
+
+    cp = mh_xmalloc (len1 + len2 + 1);
+
+    /* Copy s1 and free it */
+    if (s1) {
+        memcpy (cp, s1, len1);
+        free (s1);
+    }
+
+    /* Copy s2 */
+    if (s2)
+        memcpy (cp + len1, s2, len2);
+
+    /* Now NULL terminate the string */
+    cp[len1 + len2] = '\0';
+
+    return cp;
+}
Index: nmh/uip/ali.c
diff -u nmh/uip/ali.c:1.7 nmh/uip/ali.c:1.8
--- nmh/uip/ali.c:1.7   Tue Jul  2 22:09:14 2002
+++ nmh/uip/ali.c       Fri Jan  6 21:51:44 2006
@@ -2,7 +2,7 @@
 /*
  * ali.c -- list nmh mail aliases
  *
- * $Id: ali.c,v 1.7 2002/07/02 22:09:14 kenh Exp $
+ * $Id: ali.c,v 1.8 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -13,6 +13,7 @@
 #include <h/addrsbr.h>
 #include <h/aliasbr.h>
 #include <h/mts.h>
+#include <h/utils.h>
 
 /*
  * maximum number of names
Index: nmh/uip/distsbr.c
diff -u nmh/uip/distsbr.c:1.2 nmh/uip/distsbr.c:1.3
--- nmh/uip/distsbr.c:1.2       Tue Jul  2 22:09:14 2002
+++ nmh/uip/distsbr.c   Fri Jan  6 21:51:44 2006
@@ -2,7 +2,7 @@
 /*
  * distsbr.c -- routines to do additional "dist-style" processing
  *
- * $Id: distsbr.c,v 1.2 2002/07/02 22:09:14 kenh Exp $
+ * $Id: distsbr.c,v 1.3 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -11,6 +11,7 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
+#include <h/utils.h>
 
 static int  hdrfd = NOTOK;
 static int  txtfd = NOTOK;
Index: nmh/uip/mhbuild.c
diff -u nmh/uip/mhbuild.c:1.8 nmh/uip/mhbuild.c:1.9
--- nmh/uip/mhbuild.c:1.8       Tue Sep 30 16:58:43 2003
+++ nmh/uip/mhbuild.c   Fri Jan  6 21:51:44 2006
@@ -2,7 +2,7 @@
 /*
  * mhbuild.c -- expand/translate MIME composition files
  *
- * $Id: mhbuild.c,v 1.8 2003/09/30 16:58:43 gbburkhardt Exp $
+ * $Id: mhbuild.c,v 1.9 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -20,6 +20,7 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
+#include <h/utils.h>
 
 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
Index: nmh/uip/mhcachesbr.c
diff -u nmh/uip/mhcachesbr.c:1.7 nmh/uip/mhcachesbr.c:1.8
--- nmh/uip/mhcachesbr.c:1.7    Tue Sep 30 16:58:43 2003
+++ nmh/uip/mhcachesbr.c        Fri Jan  6 21:51:44 2006
@@ -2,7 +2,7 @@
 /*
  * mhcachesbr.c -- routines to manipulate the MIME content cache
  *
- * $Id: mhcachesbr.c,v 1.7 2003/09/30 16:58:43 gbburkhardt Exp $
+ * $Id: mhcachesbr.c,v 1.8 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -21,6 +21,7 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
+#include <h/utils.h>
 
 #ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
Index: nmh/uip/mhlistsbr.c
diff -u nmh/uip/mhlistsbr.c:1.6 nmh/uip/mhlistsbr.c:1.7
--- nmh/uip/mhlistsbr.c:1.6     Tue Sep 30 16:58:43 2003
+++ nmh/uip/mhlistsbr.c Fri Jan  6 21:51:44 2006
@@ -3,7 +3,7 @@
  * mhlistsbr.c -- routines to list information about the
  *             -- contents of MIME messages
  *
- * $Id: mhlistsbr.c,v 1.6 2003/09/30 16:58:43 gbburkhardt Exp $
+ * $Id: mhlistsbr.c,v 1.7 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -19,6 +19,7 @@
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
+#include <h/utils.h>
 
 /* mhmisc.c */
 int part_ok (CT, int);
Index: nmh/uip/mhmail.c
diff -u nmh/uip/mhmail.c:1.4 nmh/uip/mhmail.c:1.5
--- nmh/uip/mhmail.c:1.4        Tue Jul  2 22:09:14 2002
+++ nmh/uip/mhmail.c    Fri Jan  6 21:51:44 2006
@@ -2,7 +2,7 @@
 /*
  * mhmail.c -- simple mail program
  *
- * $Id: mhmail.c,v 1.4 2002/07/02 22:09:14 kenh Exp $
+ * $Id: mhmail.c,v 1.5 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -11,6 +11,7 @@
 
 #include <h/mh.h>
 #include <h/signals.h>
+#include <h/utils.h>
 #include <signal.h>
 
 static struct swit switches[] = {
Index: nmh/uip/mhmisc.c
diff -u nmh/uip/mhmisc.c:1.5 nmh/uip/mhmisc.c:1.6
--- nmh/uip/mhmisc.c:1.5        Fri Dec 17 15:16:04 2004
+++ nmh/uip/mhmisc.c    Fri Jan  6 21:51:44 2006
@@ -2,7 +2,7 @@
 /*
  * mhparse.c -- misc routines to process MIME messages
  *
- * $Id: mhmisc.c,v 1.5 2004/12/17 15:16:04 opk Exp $
+ * $Id: mhmisc.c,v 1.6 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
+#include <h/utils.h>
 
 extern int debugsw;
 
Index: nmh/uip/mhshowsbr.c
diff -u nmh/uip/mhshowsbr.c:1.11 nmh/uip/mhshowsbr.c:1.12
--- nmh/uip/mhshowsbr.c:1.11    Tue Sep 30 16:58:43 2003
+++ nmh/uip/mhshowsbr.c Fri Jan  6 21:51:44 2006
@@ -2,7 +2,7 @@
 /*
  * mhshowsbr.c -- routines to display the contents of MIME messages
  *
- * $Id: mhshowsbr.c,v 1.11 2003/09/30 16:58:43 gbburkhardt Exp $
+ * $Id: mhshowsbr.c,v 1.12 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -20,6 +20,7 @@
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
+#include <h/utils.h>
 
 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
Index: nmh/uip/mhstoresbr.c
diff -u nmh/uip/mhstoresbr.c:1.10 nmh/uip/mhstoresbr.c:1.11
--- nmh/uip/mhstoresbr.c:1.10   Fri Nov 19 05:06:16 2004
+++ nmh/uip/mhstoresbr.c        Fri Jan  6 21:51:44 2006
@@ -2,7 +2,7 @@
 /*
  * mhstoresbr.c -- routines to save/store the contents of MIME messages
  *
- * $Id: mhstoresbr.c,v 1.10 2004/11/19 05:06:16 jon Exp $
+ * $Id: mhstoresbr.c,v 1.11 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -20,6 +20,7 @@
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
+#include <h/utils.h>
 
 
 /*
Index: nmh/uip/picksbr.c
diff -u nmh/uip/picksbr.c:1.7 nmh/uip/picksbr.c:1.8
--- nmh/uip/picksbr.c:1.7       Tue Jul  2 22:09:15 2002
+++ nmh/uip/picksbr.c   Fri Jan  6 21:51:44 2006
@@ -2,7 +2,7 @@
 /*
  * picksbr.c -- routines to help pick along...
  *
- * $Id: picksbr.c,v 1.7 2002/07/02 22:09:15 kenh Exp $
+ * $Id: picksbr.c,v 1.8 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -12,6 +12,7 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/picksbr.h>
+#include <h/utils.h>
 
 #ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
Index: nmh/uip/post.c
diff -u nmh/uip/post.c:1.14 nmh/uip/post.c:1.15
--- nmh/uip/post.c:1.14 Sun Nov 13 23:57:49 2005
+++ nmh/uip/post.c      Fri Jan  6 21:51:44 2006
@@ -2,7 +2,7 @@
 /*
  * post.c -- enter messages into the mail transport system
  *
- * $Id: post.c,v 1.14 2005/11/13 23:57:49 pm215 Exp $
+ * $Id: post.c,v 1.15 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -16,6 +16,7 @@
 #include <h/aliasbr.h>
 #include <h/dropsbr.h>
 #include <h/mime.h>
+#include <h/utils.h>
 
 #include <h/tws.h>
 #include <h/mts.h>
Index: nmh/uip/repl.c
diff -u nmh/uip/repl.c:1.6 nmh/uip/repl.c:1.7
--- nmh/uip/repl.c:1.6  Tue Jul  2 22:09:15 2002
+++ nmh/uip/repl.c      Fri Jan  6 21:51:44 2006
@@ -2,7 +2,7 @@
 /*
  * repl.c -- reply to a message
  *
- * $Id: repl.c,v 1.6 2002/07/02 22:09:15 kenh Exp $
+ * $Id: repl.c,v 1.7 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -10,6 +10,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 
 static struct swit switches[] = {
Index: nmh/uip/show.c
diff -u nmh/uip/show.c:1.6 nmh/uip/show.c:1.7
--- nmh/uip/show.c:1.6  Thu Jan  2 04:07:49 2003
+++ nmh/uip/show.c      Fri Jan  6 21:51:44 2006
@@ -2,7 +2,7 @@
 /*
  * show.c -- show/list messages
  *
- * $Id: show.c,v 1.6 2003/01/02 04:07:49 kimmo Exp $
+ * $Id: show.c,v 1.7 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -11,6 +11,7 @@
 
 #include <h/mh.h>
 #include <h/mime.h>
+#include <h/utils.h>
 
 static struct swit switches[] = {
 #define CHECKMIMESW          0
Index: nmh/uip/slocal.c
diff -u nmh/uip/slocal.c:1.20 nmh/uip/slocal.c:1.21
--- nmh/uip/slocal.c:1.20       Sat Dec 24 17:17:38 2005
+++ nmh/uip/slocal.c    Fri Jan  6 21:51:44 2006
@@ -2,7 +2,7 @@
 /*
  * slocal.c -- asynchronously filter and deliver new mail
  *
- * $Id: slocal.c,v 1.20 2005/12/24 17:17:38 pm215 Exp $
+ * $Id: slocal.c,v 1.21 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -32,6 +32,7 @@
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/mts.h>
+#include <h/utils.h>
 
 #include <pwd.h>
 #include <signal.h>
Index: nmh/uip/spost.c
diff -u nmh/uip/spost.c:1.14 nmh/uip/spost.c:1.15
--- nmh/uip/spost.c:1.14        Mon Sep 22 01:04:04 2003
+++ nmh/uip/spost.c     Fri Jan  6 21:51:44 2006
@@ -5,7 +5,7 @@
  * This is a simpler, faster, replacement for "post" for use
  * when "sendmail" is the transport system.
  *
- * $Id: spost.c,v 1.14 2003/09/22 01:04:04 gbburkhardt Exp $
+ * $Id: spost.c,v 1.15 2006/01/06 21:51:44 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -19,6 +19,7 @@
 #include <h/dropsbr.h>
 #include <h/tws.h>
 #include <h/mts.h>
+#include <h/utils.h>
 
 #define        uptolow(c)      ((isalpha(c) && isupper (c)) ? tolower (c) : c)