BSD 4_3_Tahoe release

[unix-history] / usr / src / ucb / Mail / aux.c

diff --git a/usr/src/ucb/Mail/aux.c b/usr/src/ucb/Mail/aux.c
index 4ee5588..f344f43 100644 (file)
--- a/usr/src/ucb/Mail/aux.c
+++ b/usr/src/ucb/Mail/aux.c
@@ -1,16 +1,21 @@
 /*
  * Copyright (c) 1980 Regents of the University of California.
 /*
  * Copyright (c) 1980 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
  */
 

-#ifndef lint
-static char *sccsid = "@(#)aux.c       5.4 (Berkeley) 1/13/86";
-#endif not lint
+#ifdef notdef
+static char sccsid[] = "@(#)aux.c      5.7 (Berkeley) 2/18/88";
+#endif /* notdef */

 
 #include "rcv.h"
 #include <sys/stat.h>
 
 #include "rcv.h"
 #include <sys/stat.h>

-#include <ctype.h>

 
 /*
  * Mail -- a mail program
 
 /*
  * Mail -- a mail program


@@ -39,62 +44,20 @@ savestr(str)
        return(top);
 }
 
        return(top);
 }
 

-/*
- * Copy the name from the passed header line into the passed
- * name buffer.  Null pad the name buffer.
- */
-
-copyname(linebuf, nbuf)
-       char *linebuf, *nbuf;
-{
-       register char *cp, *cp2;
-
-       for (cp = linebuf + 5, cp2 = nbuf; *cp != ' ' && cp2-nbuf < 8; cp++)
-               *cp2++ = *cp;
-       while (cp2-nbuf < 8)
-               *cp2++ = 0;
-}
-

 /*
  * Announce a fatal error and die.
  */
 
 /*
  * Announce a fatal error and die.
  */
 

-panic(str)
-       char *str;
+/*VARARGS1*/
+panic(fmt, a, b)
+       char *fmt;

 {
 {

-       prs("panic: ");
-       prs(str);
-       prs("\n");
+       fprintf(stderr, "panic: ");
+       fprintf(stderr, fmt, a, b);
+       putc('\n', stderr);

        exit(1);
 }
 
        exit(1);
 }
 

-/*
- * Catch stdio errors and report them more nicely.
- */
-
-_error(str)
-       char *str;
-{
-       prs("Stdio Error: ");
-       prs(str);
-       prs("\n");
-       abort();
-}
-
-/*
- * Print a string on diagnostic output.
- */
-
-prs(str)
-       char *str;
-{
-       register char *s;
-
-       for (s = str; *s; s++)
-               ;
-       write(2, str, s-str);
-}
-

 /*
  * Touch the named message by setting its MTOUCH flag.
  * Touched messages have the effect of not being sent
 /*
  * Touch the named message by setting its MTOUCH flag.
  * Touched messages have the effect of not being sent


@@ -137,38 +100,9 @@ argcount(argv)
 {
        register char **ap;
 
 {
        register char **ap;
 

-       for (ap = argv; *ap != NOSTR; ap++)
+       for (ap = argv; *ap++ != NOSTR;)

                ;       
                ;       

-       return(ap-argv);
-}
-
-/*
- * Given a file address, determine the
- * block number it represents.
- */
-
-blockof(off)
-       off_t off;
-{
-       off_t a;
-
-       a = off >> 9;
-       a &= 077777;
-       return((int) a);
-}
-
-/*
- * Take a file address, and determine
- * its offset in the current block.
- */
-
-offsetof(off)
-       off_t off;
-{
-       off_t a;
-
-       a = off & 0777;
-       return((int) a);
+       return ap - argv - 1;

 }
 
 /*
 }
 
 /*


@@ -184,156 +118,104 @@ hfield(field, mp)
        register FILE *ibuf;
        char linebuf[LINESIZE];
        register int lc;
        register FILE *ibuf;
        char linebuf[LINESIZE];
        register int lc;

+       register char *hfield;
+       char *colon;

 
        ibuf = setinput(mp);
 
        ibuf = setinput(mp);

-       if ((lc = mp->m_lines) <= 0)
-               return(NOSTR);
+       if ((lc = mp->m_lines - 1) < 0)
+               return NOSTR;

        if (readline(ibuf, linebuf) < 0)
        if (readline(ibuf, linebuf) < 0)

-               return(NOSTR);
-       lc--;
-       do {
-               lc = gethfield(ibuf, linebuf, lc);
-               if (lc == -1)
-                       return(NOSTR);
-               if (ishfield(linebuf, field))
-                       return(savestr(hcontents(linebuf)));
-       } while (lc > 0);
-       return(NOSTR);
+               return NOSTR;
+       while (lc > 0) {
+               if ((lc = gethfield(ibuf, linebuf, lc, &colon)) < 0)
+                       return NOSTR;
+               if (hfield = ishfield(linebuf, colon, field))
+                       return savestr(hfield);
+       }
+       return NOSTR;

 }
 
 /*
  * Return the next header field found in the given message.
 }
 
 /*
  * Return the next header field found in the given message.

- * Return > 0 if something found, <= 0 elsewise.
+ * Return >= 0 if something found, < 0 elsewise.
+ * "colon" is set to point to the colon in the header.

  * Must deal with \ continuations & other such fraud.
  */
 
  * Must deal with \ continuations & other such fraud.
  */
 

-gethfield(f, linebuf, rem)
+gethfield(f, linebuf, rem, colon)

        register FILE *f;
        char linebuf[];
        register int rem;
        register FILE *f;
        char linebuf[];
        register int rem;

+       char **colon;

 {
        char line2[LINESIZE];
 {
        char line2[LINESIZE];

-       long loc;

        register char *cp, *cp2;
        register int c;
 
        register char *cp, *cp2;
        register int c;
 

-

        for (;;) {
        for (;;) {

-               if (rem <= 0)
-                       return(-1);
-               if (readline(f, linebuf) < 0)
-                       return(-1);
-               rem--;
-               if (strlen(linebuf) == 0)
-                       return(-1);
-               if (isspace(linebuf[0]))
-                       continue;
-               if (linebuf[0] == '>')
+               if (--rem < 0)
+                       return -1;
+               if ((c = readline(f, linebuf)) <= 0)
+                       return -1;
+               for (cp = linebuf; isprint(*cp) && *cp != ' ' && *cp != ':';
+                    cp++)
+                       ;
+               if (*cp != ':' || cp == linebuf)

                        continue;
                        continue;

-               cp = index(linebuf, ':');
-               if (cp == NOSTR)
-                       continue;
-               for (cp2 = linebuf; cp2 < cp; cp2++)
-                       if (isdigit(*cp2))
-                               continue;
-               

                /*
                 * I guess we got a headline.
                 * Handle wraparounding
                 */
                /*
                 * I guess we got a headline.
                 * Handle wraparounding
                 */

-               
+               *colon = cp;
+               cp = linebuf + c;

                for (;;) {
                for (;;) {

+                       while (--cp >= linebuf && (*cp == ' ' || *cp == '\t'))
+                               ;
+                       cp++;

                        if (rem <= 0)
                                break;
                        if (rem <= 0)
                                break;

-#ifdef CANTELL
-                       loc = ftell(f);
-                       if (readline(f, line2) < 0)
+                       ungetc(c = getc(f), f);
+                       if (c != ' ' && c != '\t')

                                break;
                                break;

-                       rem--;
-                       if (!isspace(line2[0])) {
-                               fseek(f, loc, 0);
-                               rem++;
-                               break;
-                       }
-#else
-                       c = getc(f);
-                       ungetc(c, f);
-                       if (!isspace(c) || c == '\n')
-                               break;
-                       if (readline(f, line2) < 0)
+                       if ((c = readline(f, line2)) < 0)

                                break;
                        rem--;
                                break;
                        rem--;

-#endif
-                       cp2 = line2;
-                       for (cp2 = line2; *cp2 != 0 && isspace(*cp2); cp2++)
+                       for (cp2 = line2; *cp2 == ' ' || *cp2 == '\t'; cp2++)

                                ;
                                ;

-                       if (strlen(linebuf) + strlen(cp2) >= LINESIZE-2)
+                       c -= cp2 - line2;
+                       if (cp + c >= linebuf + LINESIZE - 2)

                                break;
                                break;

-                       cp = &linebuf[strlen(linebuf)];
-                       while (cp > linebuf &&
-                           (isspace(cp[-1]) || cp[-1] == '\\'))
-                               cp--;

                        *cp++ = ' ';
                        *cp++ = ' ';

-                       for (cp2 = line2; *cp2 != 0 && isspace(*cp2); cp2++)
-                               ;
-                       strcpy(cp, cp2);
+                       bcopy(cp2, cp, c);
+                       cp += c;

                }
                }

-               if ((c = strlen(linebuf)) > 0) {
-                       cp = &linebuf[c-1];
-                       while (cp > linebuf && isspace(*cp))
-                               cp--;
-                       *++cp = 0;
-               }
-               return(rem);
+               *cp = 0;
+               return rem;

        }
        /* NOTREACHED */
 }
 
 /*
  * Check whether the passed line is a header line of
        }
        /* NOTREACHED */
 }
 
 /*
  * Check whether the passed line is a header line of

- * the desired breed.
+ * the desired breed.  Return the field body, or 0.

  */
 
  */
 

-ishfield(linebuf, field)
+char*
+ishfield(linebuf, colon, field)

        char linebuf[], field[];
        char linebuf[], field[];

+       char *colon;

 {
 {

-       register char *cp;
-       register int c;
+       register char *cp = colon;

 
 

-       if ((cp = index(linebuf, ':')) == NOSTR)
-               return(0);
-       if (cp == linebuf)
-               return(0);
-       cp--;
-       while (cp > linebuf && isspace(*cp))
-               cp--;
-       c = *++cp;

        *cp = 0;
        *cp = 0;

-       if (icequal(linebuf ,field)) {
-               *cp = c;
-               return(1);
+       if (!icequal(linebuf, field)) {
+               *cp = ':';
+               return 0;

        }
        }

-       *cp = c;
-       return(0);
-}
-
-/*
- * Extract the non label information from the given header field
- * and return it.
- */
-
-char *
-hcontents(hfield)
-       char hfield[];
-{
-       register char *cp;
-
-       if ((cp = index(hfield, ':')) == NOSTR)
-               return(NOSTR);
-       cp++;
-       while (*cp && isspace(*cp))
-               cp++;
-       return(cp);
+       *cp = ':';
+       for (cp++; *cp == ' ' || *cp == '\t'; cp++)
+               ;
+       return cp;

 }
 
 /*
 }
 
 /*


@@ -343,26 +225,35 @@ hcontents(hfield)
 icequal(s1, s2)
        register char *s1, *s2;
 {
 icequal(s1, s2)
        register char *s1, *s2;
 {

+       register c1, c2;

 
 

-       while (raise(*s1++) == raise(*s2))
-               if (*s2++ == 0)
-                       return(1);
-       return(0);
+       for (;;) {
+               if ((c1 = (unsigned char)*s1++) !=
+                   (c2 = (unsigned char)*s2++)) {
+                       if (isupper(c1))
+                               c1 = tolower(c1);
+                       if (c1 != c2)
+                               return 0;
+               }
+               if (c1 == 0)
+                       return 1;
+       }
+       /*NOTREACHED*/

 }
 
 /*
  * Copy a string, lowercasing it as we go.
  */
 istrcpy(dest, src)
 }
 
 /*
  * Copy a string, lowercasing it as we go.
  */
 istrcpy(dest, src)

-       char *dest, *src;
+       register char *dest, *src;

 {
 {

-       register char *cp, *cp2;

 
 

-       cp2 = dest;
-       cp = src;

        do {
        do {

-               *cp2++ = little(*cp);
-       } while (*cp++ != 0);
+               if (isupper(*src))
+                       *dest++ = tolower(*src);
+               else
+                       *dest++ = *src;
+       } while (*src++ != 0);

 }
 
 /*
 }
 
 /*


@@ -411,21 +302,6 @@ source(name)
        return(0);
 }
 
        return(0);
 }
 

-/*
- * Source a file, but do nothing if the file cannot be opened.
- */
-
-source1(name)
-       char name[];
-{
-       register int f;
-
-       if ((f = open(name, 0)) < 0)
-               return(0);
-       close(f);
-       source(name);
-}
-

 /*
  * Pop the current input back to the previous level.
  * Update the "sourcing" flag as appropriate.
 /*
  * Pop the current input back to the previous level.
  * Update the "sourcing" flag as appropriate.


@@ -541,7 +417,7 @@ skin(name)
        if (name == NOSTR)
                return(NOSTR);
        if (index(name, '(') == NOSTR && index(name, '<') == NOSTR
        if (name == NOSTR)
                return(NOSTR);
        if (index(name, '(') == NOSTR && index(name, '<') == NOSTR

-       && index(name, ' ') == NOSTR)
+           && index(name, ' ') == NOSTR)

                return(name);
        gotlt = 0;
        lastsp = 0;
                return(name);
        gotlt = 0;
        lastsp = 0;


@@ -665,23 +541,23 @@ name1(mp, reptype)
        int first = 1;
 
        if ((cp = hfield("from", mp)) != NOSTR)
        int first = 1;
 
        if ((cp = hfield("from", mp)) != NOSTR)

-               return(cp);
+               return cp;

        if (reptype == 0 && (cp = hfield("sender", mp)) != NOSTR)
        if (reptype == 0 && (cp = hfield("sender", mp)) != NOSTR)

-               return(cp);
+               return cp;

        ibuf = setinput(mp);
        ibuf = setinput(mp);

-       copy("", namebuf);
-       if (readline(ibuf, linebuf) <= 0)
+       namebuf[0] = 0;
+       if (readline(ibuf, linebuf) < 0)

                return(savestr(namebuf));
 newname:
                return(savestr(namebuf));
 newname:

-       for (cp = linebuf; *cp != ' '; cp++)
+       for (cp = linebuf; *cp && *cp != ' '; cp++)

                ;
                ;

-       while (any(*cp, " \t"))
-               cp++;
-       for (cp2 = &namebuf[strlen(namebuf)]; *cp && !any(*cp, " \t") &&
-           cp2-namebuf < LINESIZE-1; *cp2++ = *cp++)
+       for (; *cp == ' ' || *cp == '\t'; cp++)

                ;
                ;

+       for (cp2 = &namebuf[strlen(namebuf)];
+            *cp && *cp != ' ' && *cp != '\t' && cp2 < namebuf + LINESIZE - 1;)
+               *cp2++ = *cp++;

        *cp2 = '\0';
        *cp2 = '\0';

-       if (readline(ibuf, linebuf) <= 0)
+       if (readline(ibuf, linebuf) < 0)

                return(savestr(namebuf));
        if ((cp = index(linebuf, 'F')) == NULL)
                return(savestr(namebuf));
                return(savestr(namebuf));
        if ((cp = index(linebuf, 'F')) == NULL)
                return(savestr(namebuf));


@@ -697,7 +573,7 @@ newname:
                                break;
                        cp++;
                        if (first) {
                                break;
                        cp++;
                        if (first) {

-                               copy(cp, namebuf);
+                               strcpy(namebuf, cp);

                                first = 0;
                        } else
                                strcpy(rindex(namebuf, '!')+1, cp);
                                first = 0;
                        } else
                                strcpy(rindex(namebuf, '!')+1, cp);


@@ -725,68 +601,58 @@ charcount(str, c)
 }
 
 /*
 }
 
 /*

- * Find the rightmost pointer to an instance of the
- * character in the string and return it.
+ * Are any of the characters in the two strings the same?

  */
  */

-char *
-rindex(str, c)
-       char str[];
-       register int c;
+
+anyof(s1, s2)
+       register char *s1, *s2;

 {
 {

-       register char *cp, *cp2;

 
 

-       for (cp = str, cp2 = NOSTR; *cp; cp++)
-               if (c == *cp)
-                       cp2 = cp;
-       return(cp2);
+       while (*s1)
+               if (index(s2, *s1++))
+                       return 1;
+       return 0;

 }
 
 /*
 }
 
 /*

- * See if the string is a number.
+ * Convert c to upper case

  */
 
  */
 

-numeric(str)
-       char str[];
+raise(c)
+       register c;

 {
 {

-       register char *cp = str;

 
 

-       while (*cp)
-               if (!isdigit(*cp++))
-                       return(0);
-       return(1);
+       if (islower(c))
+               return toupper(c);
+       return c;

 }
 
 /*
 }
 
 /*

- * Are any of the characters in the two strings the same?
+ * Copy s1 to s2, return pointer to null in s2.

  */
 
  */
 

-anyof(s1, s2)
+char *
+copy(s1, s2)

        register char *s1, *s2;
 {
        register char *s1, *s2;
 {

-       register int c;

 
 

-       while (c = *s1++)
-               if (any(c, s2))
-                       return(1);
-       return(0);
+       while (*s2++ = *s1++)
+               ;
+       return s2 - 1;

 }
 
 /*
 }
 
 /*

- * Determine the leftmost index of the character
- * in the string.
+ * Add a single character onto a string.

  */
 
  */
 

-char *
-index(str, ch)
-       char *str;
+stradd(str, c)
+       register char *str;

 {
 {

-       register char *cp;
-       register int c;

 
 

-       for (c = ch, cp = str; *cp; cp++)
-               if (*cp == c)
-                       return(cp);
-       return(NOSTR);
+       while (*str++)
+               ;
+       str[-1] = c;
+       *str = 0;

 }
 
 /*
 }
 
 /*


@@ -802,7 +668,6 @@ isign(field)
         * will hash to the same place.
         */
        istrcpy(realfld, field);
         * will hash to the same place.
         */
        istrcpy(realfld, field);

-

        if (nretained > 0)
                return (!member(realfld, retain));
        else
        if (nretained > 0)
                return (!member(realfld, retain));
        else


@@ -811,13 +676,13 @@ isign(field)
 
 member(realfield, table)
        register char *realfield;
 
 member(realfield, table)
        register char *realfield;

-       register struct ignore **table;
+       struct ignore **table;

 {
        register struct ignore *igp;
 
        for (igp = table[hash(realfield)]; igp != 0; igp = igp->i_link)
 {
        register struct ignore *igp;
 
        for (igp = table[hash(realfield)]; igp != 0; igp = igp->i_link)

-               if (equal(igp->i_field, realfield))
+               if (*igp->i_field == *realfield &&
+                   equal(igp->i_field, realfield))

                        return (1);
                        return (1);

-

        return (0);
 }
        return (0);
 }