From: Ralph Corderoy Date: Sat, 22 Apr 2017 16:16:54 +0000 (+0100) Subject: sbr/mf.c: Remove unused functions: isfrom, lequal, mfgets. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/9304bac0a2afa895247d378c7f8137b851d61f16 sbr/mf.c: Remove unused functions: isfrom, lequal, mfgets. isfrom(s) checked for /^>?From /. lequal(a, b) was another case-insensitive strcmp(3). mfgets(fp, line) fetched a header at a time from fp, indicating when the end of headers was reached. Investigating their historical usage was, ironically, made too tedious to complete by the pollution of mass commits of historical MH. --- diff --git a/h/mf.h b/h/mf.h index 1272640b..bc86081b 100644 --- a/h/mf.h +++ b/h/mf.h @@ -70,9 +70,6 @@ struct adrx { /* * prototypes */ -int isfrom(const char *); -int lequal (const char *, const char *); -int mfgets (FILE *, char **); char *legal_person (const char *); struct adrx *getadrx (const char *, int); diff --git a/sbr/mf.c b/sbr/mf.c index 30746837..4fcff0d6 100644 --- a/sbr/mf.c +++ b/sbr/mf.c @@ -23,32 +23,6 @@ static int route (char *); static int my_lex (char *); -int -isfrom(const char *string) -{ - return (has_prefix(string, "From ") - || has_prefix(string, ">From ")); -} - - -int -lequal (const char *a, const char *b) -{ - char c1, c2; - - for (; *a; a++, b++) { - if (*b == 0) - return FALSE; - c1 = toupper((unsigned char)*a); - c2 = toupper((unsigned char)*b); - if (c1 != c2) - return FALSE; - } - - return (*b == 0); -} - - static int isat (const char *p) { @@ -742,60 +716,3 @@ legal_person (const char *p) return (char *) p; } - - -int -mfgets (FILE *in, char **bp) -{ - int i; - char *cp, *dp, *ep; - static int len = 0; - static char *pp = NULL; - - if (pp == NULL) - pp = mh_xmalloc ((size_t) (len = BUFSIZ)); - - for (ep = (cp = pp) + len - 2;;) { - switch (i = getc (in)) { - case EOF: - eol: ; - if (cp != pp) { - *cp = 0; - *bp = pp; - return OK; - } - eoh: ; - *bp = NULL; - free (pp); - pp = NULL; - return DONE; - - case 0: - continue; - - case '\n': - if (cp == pp) /* end of headers, gobble it */ - goto eoh; - switch (i = getc (in)) { - default: /* end of line */ - case '\n': /* end of headers, save for next call */ - ungetc (i, in); - goto eol; - - case ' ': /* continue headers */ - case '\t': - *cp++ = '\n'; - break; - } - /* FALLTHRU */ - - default: - *cp++ = i; - break; - } - if (cp >= ep) { - dp = mh_xrealloc (pp, (size_t) (len += BUFSIZ)); - cp += dp - pp, ep = (pp = cp) + len - 2; - } - } -}