$NetBSD: patch-aa,v 1.5 2006/03/02 21:28:23 joerg Exp $

--- uip/mhbuildsbr.c.orig	1999-09-12 13:50:12.000000000 +0000
+++ uip/mhbuildsbr.c
@@ -40,8 +40,6 @@
 #endif
 
 
-extern int errno;
-
 extern int debugsw;
 extern int verbosw;
 
@@ -174,7 +172,7 @@ static int InitFTP (CT);
 static int openFTP (CT, char **);
 static int InitMail (CT);
 static int openMail (CT, char **);
-static char *fgetstr (char *, int, FILE *);
+static char *mh_fgetstr (char *, int, FILE *);
 static int user_content (FILE *, char *, char *, CT *);
 static void set_id (CT, int);
 static int compose_content (CT);
@@ -374,7 +372,7 @@ finish_field:
      * read and parse the composition file
      * and the directives it contains.
      */
-    while (fgetstr (buf, sizeof(buf) - 1, in)) {
+    while (mh_fgetstr (buf, sizeof(buf) - 1, in)) {
 	struct part *part;
 	CT p;
 
@@ -2829,7 +2827,7 @@ openMail (CT ct, char **file)
 
 
 static char *
-fgetstr (char *s, int n, FILE *stream)
+mh_fgetstr (char *s, int n, FILE *stream)
 {
     char *cp, *ep;
 
@@ -2931,7 +2929,7 @@ user_content (FILE *in, char *file, char
 
 again_descr:
 		ct->c_descr = add (buffer + i + 1, ct->c_descr);
-		if (!fgetstr (buffer, sizeof(buffer) - 1, in))
+		if (!mh_fgetstr (buffer, sizeof(buffer) - 1, in))
 		    adios (NULL, "end-of-file after %s: field in plaintext", DESCR_FIELD);
 		switch (buffer[0]) {
 		case ' ':
@@ -2954,7 +2952,7 @@ again_descr:
 rock_and_roll:
 	    headers = -1;
 	    pos = ftell (in);
-	    if ((cp = fgetstr (buffer, sizeof(buffer) - 1, in)) == NULL)
+	    if ((cp = mh_fgetstr (buffer, sizeof(buffer) - 1, in)) == NULL)
 		break;
 	    if (buffer[0] == '#') {
 		char *bp;
@@ -3297,7 +3295,7 @@ use_forw:
 	ct->c_ctparams = (void *) m;
 
 	pp = &m->mp_parts;
-	while (fgetstr (buffer, sizeof(buffer) - 1, in)) {
+	while (mh_fgetstr (buffer, sizeof(buffer) - 1, in)) {
 	    struct part *part;
 	    CT p;