X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fmf.c;h=fd92e369590b799d4785eb16fc13e5587cc900ea;hp=44dab8a26b90f34d5ffa0dc08534755ee7e5f1fc;hb=5dd6771b28c257af405d7248639ed0e3bcdce38b;hpb=9a33ff618b5901a3af815650d4b84d39ee96e529 diff --git a/sbr/mf.c b/sbr/mf.c index 44dab8a..fd92e36 100644 --- a/sbr/mf.c +++ b/sbr/mf.c @@ -2,8 +2,6 @@ /* * mf.c -- mail filter subroutines * - * $Id$ - * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for * complete copyright information. @@ -18,7 +16,7 @@ * static prototypes */ static char *getcpy (char *); -static void compress (char *, char *); +static void compress (char *, unsigned char *); static int isat (char *); static int parse_address (void); static int phrase (char *); @@ -57,7 +55,7 @@ isfrom(char *string) int -lequal (char *a, char *b) +lequal (unsigned char *a, unsigned char *b) { for (; *a; a++, b++) if (*b == 0) @@ -133,7 +131,8 @@ seekadrx (char *addrs) struct adrx * uucpadrx (char *addrs) { - register char *cp, *wp, *xp, *yp, *zp; + register unsigned char *cp, *wp, *xp, *yp; + register char *zp; register struct adrx *adrxp = &adrxs1; if (vp == NULL) { @@ -206,9 +205,10 @@ uucpadrx (char *addrs) static void -compress (char *fp, char *tp) +compress (char *fp, unsigned char *tp) { - register char c, *cp; + register char c; + register unsigned char *cp; for (c = ' ', cp = tp; (*tp = *fp++) != 0;) if (isspace (*tp)) { @@ -333,8 +333,8 @@ static int ingrp = 0; static int last_lex = LX_END; static char *dp = NULL; -static char *cp = NULL; -static char *ap = NULL; +static unsigned char *cp = NULL; +static unsigned char *ap = NULL; static char *pers = NULL; static char *mbox = NULL; static char *host = NULL; @@ -419,7 +419,7 @@ getadrx (char *addrs) while (isspace (*ap)) ap++; if (cp) - sprintf (adr, "%.*s", cp - ap, ap); + sprintf (adr, "%.*s", (int)(cp - ap), ap); else strcpy (adr, ap); bp = adr + strlen (adr) - 1; @@ -759,7 +759,8 @@ my_lex (char *buffer) { /* buffer should be at least BUFSIZ bytes long */ int i, gotat = 0; - register char c, *bp; + register unsigned char c; + register char *bp; /* Add C to the buffer bp. After use of this macro *bp is guaranteed to be within the buffer. */ #define ADDCHR(C) do { *bp++ = (C); if ((bp - buffer) == (BUFSIZ-1)) goto my_lex_buffull; } while (0)