sbr/mts.c: Delete mmdlm2; use same-valued mmdlm1 instead.

[nmh] / docs / historical / mh-6.8.5 / sbr / RCS / m_getfld.c,v

head    1.15;
access;
symbols;
locks; strict;
comment @ * @;


1.15
date    93.02.26.21.57.14;      author jromine; state Exp;
branches;
next    1.14;

1.14
date    92.10.31.07.44.56;      author jromine; state Exp;
branches;
next    1.13;

1.13
date    92.10.28.22.56.27;      author jromine; state Exp;
branches;
next    1.12;

1.12
date    92.05.12.21.49.37;      author jromine; state Exp;
branches;
next    1.11;

1.11
date    92.02.12.05.07.25;      author jromine; state Exp;
branches;
next    1.10;

1.10
date    92.01.31.21.54.32;      author jromine; state Exp;
branches;
next    1.9;

1.9
date    92.01.24.18.03.41;      author jromine; state Exp;
branches;
next    1.8;

1.8
date    90.04.18.13.48.12;      author sources; state Exp;
branches;
next    1.7;

1.7
date    90.04.05.15.31.37;      author sources; state Exp;
branches;
next    1.6;

1.6
date    90.04.05.14.46.02;      author sources; state Exp;
branches;
next    1.5;

1.5
date    90.04.02.14.39.47;      author sources; state Exp;
branches;
next    1.4;

1.4
date    90.03.12.10.12.38;      author sources; state Exp;
branches;
next    1.3;

1.3
date    90.02.08.16.11.03;      author sources; state Exp;
branches;
next    1.2;

1.2
date    90.02.05.15.06.23;      author sources; state Exp;
branches;
next    1.1;

1.1
date    90.02.05.15.05.52;      author sources; state Exp;
branches;
next    ;


desc
@@


1.15
log
@386BSD/BSD44
@
text
@/* m_getfld.c - read/parse a message */
#ifndef lint
static char ident[] = "@@(#)$Id: m_getfld.c,v 1.14 1992/10/31 07:44:56 jromine Exp jromine $";
#endif /* lint */

#include "../h/mh.h"
#include <stdio.h>
#include "../zotnet/mts.h"
#include <ctype.h>


/* This module has a long and checkered history.  First, it didn't burst
   maildrops correctly because it considered two CTRL-A:s in a row to be
   an inter-message delimiter.  It really is four CTRL-A:s followed by a
   newline.  Unfortunately, MMDF will convert this delimiter *inside* a
   message to a CTRL-B followed by three CTRL-A:s and a newline.  This
   caused the old version of m_getfld() to declare eom prematurely.  The
   fix was a lot slower than

                c == '\001' && peekc (iob) == '\001'

   but it worked, and to increase generality, UUCP style maildrops could
   be parsed as well.  Unfortunately the speed issue finally caught up with
   us since this routine is at the very heart of MH.

   To speed things up considerably, the routine Eom() was made an auxilary
   function called by the macro eom().  Unless we are bursting a maildrop,
   the eom() macro returns FALSE saying we aren't at the end of the
   message.

   The next thing to do is to read the mtstailor file and initialize
   delimiter[] and delimlen accordingly...

   After mhl was made a built-in in msh, m_getfld() worked just fine
   (using m_unknown() at startup).  Until one day: a message which was
   the result of a bursting was shown. Then, since the burst boundaries
   aren't CTRL-A:s, m_getfld() would blinding plunge on past the boundary.
   Very sad.  The solution: introduce m_eomsbr().  This hook gets called
   after the end of each line (since testing for eom involves an fseek()).
   This worked fine, until one day: a message with no body portion arrived.
   Then the

                   while (eom (c = Getc (iob), iob))
                        continue;

   loop caused m_getfld() to return FMTERR.  So, that logic was changed to
   check for (*eom_action) and act accordingly.

   This worked fine, until one day: someone didn't use four CTRL:A's as
   their delimiters.  So, the bullet got bit and we read mts.h and
   continue to struggle on.  It's not that bad though, since the only time
   the code gets executed is when inc (or msh) calls it, and both of these
   have already called mts_init().

   ------------------------
   (Written by Van Jacobson for the mh6 m_getfld, January, 1986):

   This routine was accounting for 60% of the cpu time used by most mh
   programs.  I spent a bit of time tuning and it now accounts for <10%
   of the time used.  Like any heavily tuned routine, it's a bit
   complex and you want to be sure you understand everything that it's
   doing before you start hacking on it.  Let me try to emphasize
   that:  every line in this atrocity depends on every other line,
   sometimes in subtle ways.  You should understand it all, in detail,
   before trying to change any part.  If you do change it, test the
   result thoroughly (I use a hand-constructed test file that exercises
   all the ways a header name, header body, header continuation,
   header-body separator, body line and body eom can align themselves
   with respect to a buffer boundary).  "Minor" bugs in this routine
   result in garbaged or lost mail.

   If you hack on this and slow it down, I, my children and my
   children's children will curse you.

   This routine gets used on three different types of files: normal,
   single msg files, "packed" unix or mmdf mailboxs (when used by inc)
   and packed, directoried bulletin board files (when used by msh).
   The biggest impact of different file types is in "eom" testing.  The
   code has been carefully organized to test for eom at appropriate
   times and at no other times (since the check is quite expensive).
   I have tried to arrange things so that the eom check need only be
   done on entry to this routine.  Since an eom can only occur after a
   newline, this is easy to manage for header fields.  For the msg
   body, we try to efficiently search the input buffer to see if
   contains the eom delimiter.  If it does, we take up to the
   delimiter, otherwise we take everything in the buffer.  (The change
   to the body eom/copy processing produced the most noticeable
   performance difference, particularly for "inc" and "show".)

   There are three qualitatively different things this routine busts
   out of a message: field names, field text and msg bodies.  Field
   names are typically short (~8 char) and the loop that extracts them
   might terminate on a colon, newline or max width.  I considered
   using a Vax "scanc" to locate the end of the field followed by a
   "bcopy" but the routine call overhead on a Vax is too large for this
   to work on short names.  If Berkeley ever makes "inline" part of the
   C optimiser (so things like "scanc" turn into inline instructions) a
   change here would be worthwhile.

   Field text is typically 60 - 100 characters so there's (barely)
   a win in doing a routine call to something that does a "locc"
   followed by a "bmove".  About 30% of the fields have continuations
   (usually the 822 "received:" lines) and each continuation generates
   another routine call.  "Inline" would be a big win here, as well.

   Messages, as of this writing, seem to come in two flavors: small
   (~1K) and long (>2K).  Most messages have 400 - 600 bytes of headers
   so message bodies average at least a few hundred characters.
   Assuming your system uses reasonably sized stdio buffers (1K or
   more), this routine should be able to remove the body in large
   (>500 byte) chunks.  The makes the cost of a call to "bcopy"
   small but there is a premium on checking for the eom in packed
   maildrops.  The eom pattern is always a simple string so we can
   construct an efficient pattern matcher for it (e.g., a Vax "matchc"
   instruction).  Some thought went into recognizing the start of
   an eom that has been split across two buffers.

   This routine wants to deal with large chunks of data so, rather
   than "getc" into a local buffer, it uses stdio's buffer.  If
   you try to use it on a non-buffered file, you'll get what you
   deserve.  This routine "knows" that struct FILEs have a _ptr
   and a _cnt to describe the current state of the buffer and
   it knows that _filbuf ignores the _ptr & _cnt and simply fills
   the buffer.  If stdio on your system doesn't work this way, you
   may have to make small changes in this routine.
   
   This routine also "knows" that an EOF indication on a stream is
   "sticky" (i.e., you will keep getting EOF until you reposition the
   stream).  If your system doesn't work this way it is broken and you
   should complain to the vendor.  As a consequence of the sticky
   EOF, this routine will never return any kind of EOF status when
   there is data in "name" or "buf").
  */


#define Getc(iob)       getc(iob)
#define eom(c,iob)      (msg_style != MS_DEFAULT && \
                         (((c) == *msg_delim && m_Eom(c,iob)) ||\
                          (eom_action && (*eom_action)(c))))

static unsigned char *matchc();
static unsigned char *locc();

static unsigned char **pat_map;

extern int msg_count;   /* defined in sbr/m_msgdef.c = 0
                         * disgusting hack for "inc" so it can 
                         * know how many characters were stuffed
                         * in the buffer on the last call (see
                         * comments in uip/scansbr.c) */

extern int msg_style;   /* defined in sbr/m_msgdef.c = MS_DEFAULT */
/*
 * The "full" delimiter string for a packed maildrop consists
 * of a newline followed by the actual delimiter.  E.g., the
 * full string for a Unix maildrop would be: "\n\nFrom ".
 * "Fdelim" points to the start of the full string and is used
 * in the BODY case of the main routine to search the buffer for
 * a possible eom.  Msg_delim points to the first character of
 * the actual delim. string (i.e., fdelim+1).  Edelim
 * points to the 2nd character of actual delimiter string.  It
 * is used in m_Eom because the first character of the string
 * has been read and matched before m_Eom is called.
 */
extern char *msg_delim; /*  defined in sbr/m_msgdef.c = "" */
static unsigned char *fdelim;
static unsigned char *delimend;
static int  fdelimlen;
static unsigned char *edelim;
static int  edelimlen;

static int  (*eom_action) () = NULL;

#ifdef _FSTDIO
#define _ptr    _p              /* Gag */
#define _cnt    _r              /* Retch */
#define _filbuf __srget         /* Puke */
#endif

/* \f */

m_getfld (state, name, buf, bufsz, iob)
int             state;
int             bufsz;
unsigned char   *name,
                *buf;
register FILE   *iob;
{
    register unsigned char  *cp;
    register unsigned char  *bp;
    register unsigned char  *ep;
    register unsigned char  *sp;
    register int    cnt;
    register int    c;
    register int    i;
    register int    j;

    if ((c = Getc(iob)) < 0) {
        msg_count = 0;
        *buf = 0;
        return FILEEOF;
    }
    if (eom (c, iob)) {
        if (! eom_action) {
            /* flush null messages */
            while ((c = Getc(iob)) >= 0 && eom (c, iob))
                ;
            if (c >= 0)
                (void) ungetc(c, iob);
        }
        msg_count = 0;
        *buf = 0;
        return FILEEOF;
    }

    switch (state) {
        case FLDEOF: 
        case BODYEOF: 
        case FLD: 
            if (c == '\n' || c == '-') {
                /* we hit the header/body separator */
                while (c != '\n' && (c = Getc(iob)) >= 0)
                    ;

                if (c < 0 || (c = Getc(iob)) < 0 || eom (c, iob)) {
                    if (! eom_action) {
                        /* flush null messages */
                        while ((c = Getc(iob)) >= 0 && eom (c, iob))
                            ;
                        if (c >= 0)
                            (void) ungetc(c, iob);
                    }
                    msg_count = 0;
                    *buf = 0;
                    return FILEEOF;
                }
                state = BODY;
                goto body;
            }
            /*
             * get the name of this component.  take characters up
             * to a ':', a newline or NAMESZ-1 characters, whichever
             * comes first.  
             */
            cp = name; i = NAMESZ - 1;
            for (;;) {
                bp = sp = (unsigned char *) iob->_ptr - 1;
                j = (cnt = iob->_cnt+1) < i ? cnt : i;
                while ((c = *bp++) != ':' && c != '\n' && --j >= 0)
                    *cp++ = c;

                j = bp - sp;
                if ((cnt -= j) <= 0) {
                    if (_filbuf(iob) == EOF) {
                        *cp = *buf = 0;
                        advise (NULLCP, "eof encountered in field \"%s\"",
                                name);
                        return FMTERR;
                    }
                } else {
                    iob->_ptr = bp + 1;
                    iob->_cnt = cnt - 1;
                }
                if (c == ':')
                    break;

                /*
                 * something went wrong.  possibilities are:
                 *  . hit a newline (error)
                 *  . got more than namesz chars. (error)
                 *  . hit the end of the buffer. (loop)
                 */
                if (c == '\n') {
                    *cp = *buf = 0;
                    advise (NULLCP, "eol encountered in field \"%s\"", name);
                    state = FMTERR;
                    goto finish;
                }
                if ((i -= j) <= 0) {
                    *cp = *buf = 0;
                    advise (NULLCP, "field name \"%s\" exceeds %d bytes",
                            name, NAMESZ - 1);
                    state = LENERR;
                    goto finish;
                }
            }

            while (isspace (*--cp) && cp >= name)
                ;
            *++cp = 0;
            /* fall through */

        case FLDPLUS: 
            /*
             * get (more of) the text of a field.  take
             * characters up to the end of this field (newline
             * followed by non-blank) or bufsz-1 characters.
             */
            cp = buf; i = bufsz-1;
            for (;;) {
                cnt = iob->_cnt++; bp = (unsigned char *) --iob->_ptr;
                c = cnt < i ? cnt : i;
                while (ep = locc( c, bp, '\n' )) {
                    /*
                     * if we hit the end of this field, return.
                     */
                    if ((j = *++ep) != ' ' && j != '\t') {
                        j = ep - (unsigned char *) iob->_ptr;
                        (void) bcopy( iob->_ptr, cp, j);
                        iob->_ptr = ep; iob->_cnt -= j;
                        cp += j;
                        state = FLD;
                        goto finish;
                    }
                    c -= ep - bp; bp = ep;
                }
                /*
                 * end of input or dest buffer - copy what we've found.
                 */
                c += bp - (unsigned char *) iob->_ptr;
                (void) bcopy( iob->_ptr, cp, c);
                i -= c; cp += c;
                if (i <= 0) {
                    /* the dest buffer is full */
                    iob->_cnt -= c; iob->_ptr += c;
                    state = FLDPLUS;
                    break;
                }
                /* 
                 * There's one character left in the input buffer.
                 * Copy it & fill the buffer.  If the last char
                 * was a newline and the next char is not whitespace,
                 * this is the end of the field.  Otherwise loop.
                 */
                --i;
                *cp++ = j = *(iob->_ptr + c);
                c = _filbuf(iob);
                if ((j == '\0' || j == '\n') && c != ' ' && c != '\t') {
                    if (c != EOF)
                        --iob->_ptr, ++iob->_cnt;
                    state = FLD;
                    break;
                }
            }
            break;

        case BODY: 
        body:
            /*
             * get the message body up to bufsz characters or the
             * end of the message.  Sleazy hack: if bufsz is negative
             * we assume that we were called to copy directly into
             * the output buffer and we don't add an eos.
             */
            i = (bufsz < 0) ? -bufsz : bufsz-1;
            bp = (unsigned char *) --iob->_ptr; cnt = ++iob->_cnt;
            c = (cnt < i ? cnt : i);
            if (msg_style != MS_DEFAULT && c > 1) {
                /*
                 * packed maildrop - only take up to the (possible)
                 * start of the next message.  This "matchc" should
                 * probably be a Boyer-Moore matcher for non-vaxen,
                 * particularly since we have the alignment table
                 * all built for the end-of-buffer test (next).
                 * But our vax timings indicate that the "matchc"
                 * instruction is 50% faster than a carefully coded
                 * B.M. matcher for most strings.  (So much for elegant
                 * algorithms vs. brute force.)  Since I (currently)
                 * run MH on a vax, we use the matchc instruction. --vj
                 */
                if (ep = matchc( fdelimlen, fdelim, c, bp ) )
                    c = ep - bp + 1;
                else {
                    /*
                     * There's no delim in the buffer but there may be
                     * a partial one at the end.  If so, we want to leave
                     * it so the "eom" check on the next call picks it up.
                     * Use a modified Boyer-Moore matcher to make this
                     * check relatively cheap.  The first "if" figures
                     * out what position in the pattern matches the last
                     * character in the buffer.  The inner "while" matches
                     * the pattern against the buffer, backwards starting
                     * at that position.  Note that unless the buffer
                     * ends with one of the characters in the pattern
                     * (excluding the first and last), we do only one test.
                     */
                    ep = bp + c - 1;
                    if (sp = pat_map[*ep]) {
                        do {
                            cp = sp;
                            while (*--ep == *--cp)
                            ;
                            if (cp < fdelim) {
                                if (ep >= bp)
                                    /*
                                     * ep < bp means that all the buffer
                                     * contains is a prefix of delim.
                                     * If this prefix is really a delim, the
                                     * m_eom call at entry should have found
                                     * it.  Thus it's not a delim and we can
                                     * take all of it.
                                     */
                                    c = (ep - bp) + 2;
                            break;
                        }
                            /* try matching one less char of delim string */
                            ep = bp + c - 1;
                        } while (--sp > fdelim);
                    }
                }
            }
            (void) bcopy( bp, buf, c );
            iob->_cnt -= c;
            iob->_ptr += c;
            if (bufsz < 0) {
                msg_count = c;
                return (state);
            }
            cp = buf + c;
            break;

        default: 
            adios (NULLCP, "m_getfld() called with bogus state of %d", state);
    }
finish:;
    *cp = 0;
    msg_count = cp - buf;
    return (state);
}

/* \f */

#ifdef  RPATHS
static char  unixbuf[BUFSIZ] = "";
#endif /* RPATHS */

void
m_unknown(iob)
        register FILE *iob;
{
    register    int c;
    register    long pos;
    char        text[10];
    register    char *cp;
    register    char *delimstr;

    msg_style = MS_UNKNOWN;

    /* Figure out what the message delimitter string is for this
     * maildrop.  (This used to be part of m_Eom but I didn't like
     * the idea of an "if" statement that could only succeed on the
     * first call to m_Eom getting executed on each call, i.e., at
     * every newline in the message).
     *
     * If the first line of the maildrop is a Unix "from" line, we say the
     * style is UUCP and eat the rest of the line.  Otherwise we say the style
     * is MMDF & look for the delimiter string specified when MH was built
     * (or from the mtstailor file).
     */
    pos = ftell (iob);
    if (fread (text, sizeof *text, 5, iob) == 5
            && strncmp (text, "From ", 5) == 0) {
        msg_style = MS_UUCP;
        delimstr = "\nFrom ";
#ifndef RPATHS
        while ((c = getc (iob)) != '\n' && c >= 0)
            ;
#else /* RPATHS */
        cp = unixbuf;
        while ((c = getc (iob)) != '\n')
            *cp++ = c;
        *cp = 0;
#endif /* RPATHS */
    } else {
        /* not a Unix style maildrop */
        (void) fseek (iob, pos, 0);
        if (mmdlm2 == NULLCP || *mmdlm2 == 0)
            mmdlm2 = "\001\001\001\001\n";
        delimstr = mmdlm2;
        msg_style = MS_MMDF;
    }
    c = strlen (delimstr);
    fdelim = (unsigned char *)malloc((unsigned)c + 3);
    *fdelim++ = '\0';
    *fdelim = '\n';
    msg_delim = (char *)fdelim+1;
    edelim = (unsigned char *)msg_delim+1;
    fdelimlen = c + 1;
    edelimlen = c - 1;
    (void)strcpy(msg_delim, delimstr);
    delimend = (unsigned char *)msg_delim + edelimlen;
    if (edelimlen <= 1)
        adios (NULLCP, "maildrop delimiter must be at least 2 bytes");
    /*
     * build a Boyer-Moore end-position map for the matcher in m_getfld.
     * N.B. - we don't match just the first char (since it's the newline
     * separator) or the last char (since the matchc would have found it
     * if it was a real delim).
     */
    pat_map = (unsigned char **) calloc (256, sizeof (unsigned char *));

    for (cp = (char *)fdelim + 1; cp < (char *)delimend; cp++ )
        pat_map[*cp] = (unsigned char *)cp;

    if (msg_style == MS_MMDF) {
        /* flush extra msg hdrs */
        while ((c = Getc(iob)) >= 0 && eom (c, iob))
            ;
        if (c >= 0)
            (void) ungetc(c, iob);
    }
}


void m_eomsbr (action)
int     (*action) ();
{
    if (eom_action = action) {
        msg_style = MS_MSH;
        *msg_delim = 0;
        fdelimlen = 1;
        delimend = fdelim;
    } else {
        msg_style = MS_MMDF;
        msg_delim = (char *)fdelim + 1;
        fdelimlen = strlen((char *)fdelim);
        delimend = (unsigned char *)(msg_delim + edelimlen);
    }
}

/* \f */

/* test for msg delimiter string */

int  m_Eom (c, iob)
register int     c;
register FILE   *iob;
{
    register long pos = 0L;
    register int i;
    char    text[10];
#ifdef  RPATHS
    register    char *cp;
#endif /* RPATHS */

    pos = ftell (iob);
    if ((i = fread (text, sizeof *text, edelimlen, iob)) != edelimlen
            || strncmp (text, (char *)edelim, edelimlen)) {
        if (i == 0 && msg_style == MS_UUCP)
            /* the final newline in the (brain damaged) unix-format
             * maildrop is part of the delimitter - delete it.
             */
            return 1;

#ifdef  notdef
        (void) fseek (iob, pos, 0);
#else
        (void) fseek (iob, (long)(pos-1), 0);
        (void) getc (iob);              /* should be OK */
#endif /* !notdef */
        return 0;
    }

    if (msg_style == MS_UUCP) {
#ifndef RPATHS
        while ((c = getc (iob)) != '\n')
            if (c < 0)
                break;
#else /* RPATHS */
        cp = unixbuf;
        while ((c = getc (iob)) != '\n' && c >= 0)
            *cp++ = c;
        *cp = 0;
#endif /* RPATHS */
    }

    return 1;
}

/* \f */

#ifdef  RPATHS
char   *unixline () {
    register char  *cp,
                   *dp,
                   *pp;
    static char unixfrom[BUFSIZ];

    pp = unixfrom;
    if (cp = dp = index (unixbuf, ' ')) {
        while (cp = index (cp + 1, 'r'))
            if (strncmp (cp, "remote from ", 12) == 0) {
                *cp = 0;
                (void) sprintf (pp, "%s!", cp + 12);
                pp += strlen (pp);
                break;
            }
        if (cp == NULL)
            cp = unixbuf + strlen (unixbuf);
        if ((cp -= 25) >= dp)
            *cp = 0;
    }

    (void) sprintf (pp, "%s\n", unixbuf);
    unixbuf[0] = 0;
    return unixfrom;
}
#endif /* RPATHS */

/* \f */

#if (vax && !lint)
        asm(".align 1");
        asm("_matchc: .word 0");
        asm("   movq 4(ap),r0");
        asm("   movq 12(ap),r2");
        asm("   matchc  r0,(r1),r2,(r3)");
        asm("   beql 1f");
        asm("   movl 4(ap),r3");
        asm("1: subl3  4(ap),r3,r0");
        asm("   ret");
#else
static unsigned char *
matchc( patln, pat, strln, str )
        int patln;
        char *pat;
        int strln;
        register char *str;
{
        register char *es = str + strln - patln;
        register char *sp;
        register char *pp;
        register char *ep = pat + patln;
        register char pc = *pat++;

        for(;;) {
                while (pc != *str++)
                        if (str > es)
                                return 0;

                sp = str; pp = pat;
                while (pp < ep && *sp++ == *pp)
                        pp++;
                if (pp >= ep) 
                        return ((unsigned char *)--str);
        }
}
#endif

/* \f */

/*
 * Locate character "term" in the next "cnt" characters of "src".
 * If found, return its address, otherwise return 0.
 */
#if (vax && !lint)
        asm(".align 1");
        asm("_locc: .word 0");
        asm("   movq  4(ap),r0");
        asm("   locc  12(ap),r0,(r1)");
        asm("   beql  1f");
        asm("   movl  r1,r0");
        asm("1: ret");
#else
static unsigned char *
locc( cnt, src, term )
        register int  cnt;
        register unsigned char *src;
        register unsigned char term;
{
    while (*src++ != term && --cnt > 0);

    return (cnt > 0 ? --src : (unsigned char *)0);
}
#endif

/* \f */

#if     !defined (BSD42) && !defined (bcopy)
int     bcmp (b1, b2, length)
register char *b1,
              *b2;
register int   length;
{
    while (length-- > 0)
        if (*b1++ != *b2++)
            return 1;

    return 0;
}


bcopy (b1, b2, length)
register char *b1,
              *b2;
register int   length;
{
    while (length-- > 0)
        *b2++ = *b1++;
}


bzero (b, length)
register char *b;
register int   length;
{
    while (length-- > 0)
        *b++ = 0;
}
#endif /* not BSD42 */
@


1.14
log
@fix NULL inc bug
@
text
@d3 1
a3 1
static char ident[] = "@@(#)$Id: m_getfld.c,v 1.13 1992/10/28 22:56:27 jromine Exp jromine $";
d173 6
@


1.13
log
@possible fix for no-newline in .mh_profile problem.
@
text
@d3 1
a3 1
static char ident[] = "@@(#)$Id: m_getfld.c,v 1.12 1992/05/12 21:49:37 jromine Exp jromine $";
d549 1
a549 1
#ifndef safe
d554 1
a554 1
#endif /* !safe */
@


1.12
log
@fix ifdefs
@
text
@d3 1
a3 1
static char ident[] = "@@(#)$Id: m_getfld.c,v 1.11 1992/02/12 05:07:25 jromine Exp jromine $";
d332 1
a332 1
                if (j == '\n' && c != ' ' && c != '\t') {
@


1.11
log
@second try at fseek() fix
@
text
@d3 2
a4 2
static char ident[] = "@@(#)$Id: m_getfld.c,v 1.10 1992/01/31 21:54:32 jromine Exp jromine $";
#endif  lint
d429 1
a429 1
#endif  RPATHS
d462 1
a462 1
#else   RPATHS
d467 1
a467 1
#endif  RPATHS
d520 1
a520 1
        fdelimlen = strlen(fdelim);
d538 1
a538 1
#endif  RPATHS
d542 1
a542 1
            || strncmp (text, edelim, edelimlen)) {
d563 1
a563 1
#else   RPATHS
d568 1
a568 1
#endif  RPATHS
d602 1
a602 1
#endif  RPATHS
d704 1
a704 1
#endif  not BSD42
@


1.10
log
@kerberos
@
text
@d3 1
a3 1
static char ident[] = "@@(#)$Id: m_getfld.c,v 1.9 1992/01/24 18:03:41 jromine Exp jromine $";
d549 3
a551 1
#ifdef notdef
d553 2
a554 5
        if (iob->_cnt <= 0)
            _filbuf(iob);
#else
        (void) fseek (iob, pos, 0);
#endif /* !notdef */
@


1.9
log
@move msg_count, msg_style & msg_delim to m_msgdef.c for
shared libraries
@
text
@d3 1
a3 1
static char ident[] = "@@(#)$Id: m_getfld.c,v 1.8 1990/04/18 13:48:12 sources Exp jromine $";
d249 1
a249 1
                        *cp = *buf = NULL;
d268 1
a268 1
                    *cp = *buf = NULL;
d274 1
a274 1
                    *cp = *buf = NULL;
d284 1
a284 1
            *++cp = NULL;
d420 1
a420 1
    *cp = NULL;
d466 1
a466 1
        *cp = NULL;
d471 1
a471 1
        if (mmdlm2 == NULLCP || *mmdlm2 == NULL)
d568 1
a568 1
        *cp = NULL;
d588 1
a588 1
                *cp = NULL;
d596 1
a596 1
            *cp = NULL;
d600 1
a600 1
    unixbuf[0] = NULL;
d703 1
a703 1
        *b++ = NULL;
@


1.8
log
@back out RAND fix -- under #ifdef notdef
@
text
@d3 1
a3 1
static char ident[] = "@@(#)$Id: m_getfld.c,v 1.7 90/04/05 15:31:37 sources Exp Locker: sources $";
d146 2
a147 1
int     msg_count = 0;  /* disgusting hack for "inc" so it can
d152 1
a152 1
int     msg_style = MS_DEFAULT;
d165 1
a165 1
char    *msg_delim = "";
@


1.7
log
@add ID
@
text
@d3 1
a3 1
static char ident[] = "@@(#)$Id:$";
d548 1
d552 3
@


1.6
log
@add ID
@
text
@d3 1
a3 1
static char ident[] = "$Id:";
@


1.5
log
@RAND fixes
@
text
@d2 3
@


1.4
log
@cast iob->_ptr as unsigned char *.  This stuff is really yukky!
@
text
@d545 3
a547 1
        (void) fseek (iob, pos, 0);
d629 2
a630 2
                while (pp < ep && *sp++ == *pp++)
                        ;
@


1.3
log
@Fixes from Van Jacobson
@
text
@d237 1
a237 1
                bp = sp = iob->_ptr - 1;
d291 1
a291 1
                cnt = iob->_cnt++; bp = --iob->_ptr;
d298 1
a298 1
                        j = ep - iob->_ptr;
d310 1
a310 1
                c += bp - iob->_ptr;
d346 1
a346 1
            bp = --iob->_ptr; cnt = ++iob->_cnt;
@


1.2
log
@*** empty log message ***
@
text
@d138 2
a139 2
static char *matchc();
static char *locc();
d141 1
a141 1
static char **pat_map;
d162 2
a163 2
static char *fdelim;
static char *delimend;
d165 1
a165 1
static char *edelim;
d175 1
a175 1
char            *name,
d179 1
a179 6
    register char  *cp;
#ifndef SYS5
    register char  *bp;
    register char  *ep;
    register char  *sp;
#else   SYS5
a182 1
#endif  SYS5
a292 1
#ifndef SYS5
a293 3
#else   SYS5
                while (ep = (unsigned char *) locc( c, bp, '\n' )) {
#endif  SYS5
a360 1
#ifndef SYS5
a361 3
#else   SYS5
                if (ep = (unsigned char *) matchc( fdelimlen, fdelim, c, bp ) )
#endif  SYS5
d369 1
a369 1
                     * check relatively cheap.  The first "while" figures
a376 2
#ifndef SYS5
                    sp = delimend;
d378 4
a381 9
                    while ((cp = pat_map[*ep]) < sp) {
                        ep = bp + c - 1; sp = cp;
#else   SYS5
                    sp = (unsigned char *) delimend;
                    ep = bp + c - 1;
                    while ((cp = pat_map[*ep]) < (char *) sp) {
                        ep = bp + c - 1; sp = (unsigned char *) cp;
#endif  SYS5
                        while (*--ep == *--cp && cp > fdelim)
d383 11
a393 3
                        if (cp == fdelim) {
                            if (*ep == *cp && ep > bp)
                                c = (ep - bp) + 1;
d396 3
d427 3
a429 2
void m_unknown (iob)
register FILE *iob;
d435 1
d454 1
a454 1
        fdelim = "\n\nFrom ";
d469 1
a469 3
        fdelim = (char *)malloc((unsigned)strlen(mmdlm2)+2);
        *fdelim = '\n';
        (void)strcpy(fdelim+1, mmdlm2);
d472 10
a481 5
    fdelimlen = strlen(fdelim);
    msg_delim = fdelim+1;
    edelim = msg_delim+1;
    edelimlen = fdelimlen-2;
    delimend = msg_delim + edelimlen;
d490 1
a490 3
    pat_map = (char **) malloc( 256 * sizeof (char *));
    for (c = 256; c--; )
        pat_map[c] = delimend + 1;
d492 2
a493 2
    for (cp = fdelim + 1; cp < delimend; cp++ )
        pat_map[*cp] = cp;
d515 3
a517 3
        msg_delim = fdelim + 1;
        fdelimlen = strlen (fdelim);
        delimend = msg_delim + edelimlen;
d608 1
a608 1
static char *
d630 1
a630 1
                        return (--str);
d650 1
a650 1
static char *
d653 2
a654 2
        register char *src;
        register char term;
d658 1
a658 1
    return (cnt > 0 ? --src : NULLCP);
d695 1
a695 1
#endif  not BSD42 or SYS5
@


1.1
log
@Initial revision
@
text
@d299 1
d301 3
d371 1
d373 3
d391 1
d396 6
@