X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/61e09274bb3338efbd9c50f797751853c99dba3b..3c516d410d256012f843944b0f43a77d8c1ac146:/sbr/mf.c

diff --git a/sbr/mf.c b/sbr/mf.c
index 975e3964..37fcf7b9 100644
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -16,7 +16,6 @@
  * static prototypes
  */
 static char *getcpy (char *);
-static void compress (char *, char *);
 static int isat (char *);
 static int parse_address (void);
 static int phrase (char *);
@@ -73,156 +72,6 @@ lequal (char *a, char *b)
 }
 
 
-/* 
- * seekadrx() is tricky.  We want to cover both UUCP-style and ARPA-style
- * addresses, so for each list of addresses we see if we can find some
- * character to give us a hint.
- */
-
-
-#define	CHKADR	0		/* undertermined address style */
-#define	UNIXDR	1		/* UNIX-style address */
-#define	ARPADR	2		/* ARPAnet-style address */
-
-
-static char *punctuators = ";<>.()[]";
-static char *vp = NULL;
-static char *tp = NULL;
-
-static struct adrx adrxs1;
-
-
-struct adrx *
-seekadrx (char *addrs)
-{
-    static int state = CHKADR;
-    register char *cp;
-    register struct adrx *adrxp;
-
-    if (state == CHKADR)
-	for (state = UNIXDR, cp = addrs; *cp; cp++)
-	    if (strchr(punctuators, *cp)) {
-		state = ARPADR;
-		break;
-	    }
-
-    switch (state) {
-	case UNIXDR: 
-	    adrxp = uucpadrx (addrs);
-	    break;
-
-	case ARPADR: 
-	default:
-	    adrxp = getadrx (addrs);
-	    break;
-    }
-
-    if (adrxp == NULL)
-	state = CHKADR;
-
-    return adrxp;
-}
-
-
-/*
- * uucpadrx() implements a partial UUCP-style address parser.  It's based
- * on the UUCP notion that addresses are separated by spaces or commas.
- */
-
-
-struct adrx *
-uucpadrx (char *addrs)
-{
-    char *cp, *wp, *xp, *yp, *zp;
-    struct adrx *adrxp = &adrxs1;
-
-    if (vp == NULL) {
-	vp = tp = getcpy (addrs);
-	compress (addrs, vp);
-    }
-    else
-	if (tp == NULL) {
-	    free (vp);
-	    vp = NULL;
-	    return NULL;
-	}
-
-    for (cp = tp; isspace ((unsigned char) *cp); cp++)
-	continue;
-    if (*cp == 0) {
-	free (vp);
-	vp = tp = NULL;
-	return NULL;
-    }
-
-    if ((wp = strchr(cp, ',')) == NULL) {
-	if ((wp = strchr(cp, ' ')) != NULL) {
-	    xp = wp;
-	    while (isspace ((unsigned char) *xp))
-		xp++;
-	    if (*xp != 0 && isat (--xp)) {
-		yp = xp + 4;
-		while (isspace ((unsigned char) *yp))
-		    yp++;
-		if (*yp != 0) {
-		    if ((zp = strchr(yp, ' ')) != NULL)
-			*zp = 0, tp = ++zp;
-		    else
-			tp = NULL;
-		}
-		else
-		    *wp = 0, tp = ++wp;
-	    }
-	    else
-		*wp = 0, tp = ++wp;
-	}
-	else
-	    tp = NULL;
-    }
-    else
-	*wp = 0, tp = ++wp;
-
-    if (adrxp->text)
-	free (adrxp->text);
-    adrxp->text = getcpy (cp);
-    adrxp->mbox = cp;
-    adrxp->host = adrxp->path = NULL;
-    if ((wp = strrchr(cp, '@')) != NULL) {
-	*wp++ = 0;
-	adrxp->host = *wp ? wp : NULL;
-    }
-    else
-	for (wp = cp + strlen (cp) - 4; wp >= cp; wp--)
-	    if (isat (wp)) {
-		*wp++ = 0;
-		adrxp->host = wp + 3;
-	    }
-
-    adrxp->pers = adrxp->grp = adrxp->note = adrxp->err = NULL;
-    adrxp->ingrp = 0;
-
-    return adrxp;
-}
-
-
-static void
-compress (char *fp, char *tp)
-{
-    char c, *cp;
-
-    for (c = ' ', cp = tp; (*tp = *fp++) != 0;)
-	if (isspace ((unsigned char) *tp)) {
-	    if (c != ' ')
-		*tp++ = c = ' ';
-	}
-	else
-	    c = *tp++;
-
-    if (c == ' ' && cp < tp)
-	*--tp = 0;
-}
-
-
 static int
 isat (char *p)
 {