projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
BSD 4_3_Reno release
[unix-history] / usr / src / usr.sbin / sendmail / src / recipient.c
diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index 737c875..56b26b5 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/recipient.c
+++ b/usr/src/usr.sbin/sendmail/src/recipient.c
@@ -1,34 +1,49 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * Neither the name of the University nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)recipient.c        5.18 (Berkeley) 6/1/90";
+#endif /* not lint */
+
+# include <sys/types.h>
+# include <sys/stat.h>
 # include <pwd.h>
 # include "sendmail.h"
 # include <pwd.h>
 # include "sendmail.h"
-# include <sys/stat.h>
-
-SCCSID(@(#)recipient.c 3.33            %G%);
 
 /*
 
 /*
-**  SENDTO -- Designate a send list.
+**  SENDTOLIST -- Designate a send list.
 **
 **     The parameter is a comma-separated list of people to send to.
 **     This routine arranges to send to all of them.
 **
 **
 **     The parameter is a comma-separated list of people to send to.
 **     This routine arranges to send to all of them.
 **
-**     The `ctladdr' is the address that expanded to be this one,
-**     e.g., in an alias expansion.  This is used for a number of
-**     purposed, most notably inheritance of uid/gid for protection
-**     purposes.  It is also used to detect self-reference in group
-**     expansions and the like.
-**
 **     Parameters:
 **             list -- the send list.
 **     Parameters:
 **             list -- the send list.
-**             copyf -- the copy flag; passed to parse.
 **             ctladdr -- the address template for the person to
 **                     send to -- effective uid/gid are important.
 **                     This is typically the alias that caused this
 **                     expansion.
 **             sendq -- a pointer to the head of a queue to put
 **                     these people into.
 **             ctladdr -- the address template for the person to
 **                     send to -- effective uid/gid are important.
 **                     This is typically the alias that caused this
 **                     expansion.
 **             sendq -- a pointer to the head of a queue to put
 **                     these people into.
-**             qflags -- special flags to set in the q_flags field.
 **
 **     Returns:
 **
 **     Returns:
-**             pointer to chain of addresses.
+**             none
 **
 **     Side Effects:
 **             none.
 **
 **     Side Effects:
 **             none.
@@ -36,69 +51,58 @@ SCCSID(@(#)recipient.c      3.33            %G%);
 
 # define MAXRCRSN      10
 
 
 # define MAXRCRSN      10
 
-ADDRESS *
-sendto(list, copyf, ctladdr, qflags)
+sendtolist(list, ctladdr, sendq)
        char *list;
        char *list;
-       int copyf;
        ADDRESS *ctladdr;
        ADDRESS **sendq;
        ADDRESS *ctladdr;
        ADDRESS **sendq;
-       u_short qflags;
 {
        register char *p;
 {
        register char *p;
-       bool more;              /* set if more addresses to send to */
-       ADDRESS *al;            /* list of addresses to send to */
+       register ADDRESS *al;   /* list of addresses to send to */
        bool firstone;          /* set on first address sent */
        bool selfref;           /* set if this list includes ctladdr */
        bool firstone;          /* set on first address sent */
        bool selfref;           /* set if this list includes ctladdr */
-       ADDRESS *sibl;          /* sibling pointer in tree */
-       ADDRESS *prev;          /* previous sibling */
+       char delimiter;         /* the address delimiter */
 
 
-# ifdef DEBUG
-       if (Debug > 1)
+       if (tTd(25, 1))
        {
                printf("sendto: %s\n   ctladdr=", list);
                printaddr(ctladdr, FALSE);
        }
        {
                printf("sendto: %s\n   ctladdr=", list);
                printaddr(ctladdr, FALSE);
        }
-# endif DEBUG
 
 
-       more = TRUE;
+       /* heuristic to determine old versus new style addresses */
+       if (ctladdr == NULL &&
+           (index(list, ',') != NULL || index(list, ';') != NULL ||
+            index(list, '<') != NULL || index(list, '(') != NULL))
+               CurEnv->e_flags &= ~EF_OLDSTYLE;
+       delimiter = ' ';
+       if (!bitset(EF_OLDSTYLE, CurEnv->e_flags) || ctladdr != NULL)
+               delimiter = ',';
+
        firstone = TRUE;
        selfref = FALSE;
        al = NULL;
        firstone = TRUE;
        selfref = FALSE;
        al = NULL;
-       for (p = list; more; )
-       {
-               register char *q;
-               register char c;
-               ADDRESS *a;
 
 
-               /* find the end of this address */
-               while (*p == ' ' || *p == '\t')
-                       p++;
-               q = p;
-               while ((c = *p++) != '\0' && c != ',' && c != '\n')
-                       continue;
-               more = c != '\0';
-               *--p = '\0';
-               if (more)
-                       p++;
-               if (*q == '\0')
-                       continue;
+       for (p = list; *p != '\0'; )
+       {
+               register ADDRESS *a;
+               extern char *DelimChar;         /* defined in prescan */
 
                /* parse the address */
 
                /* parse the address */
-               if ((a = parse(q, (ADDRESS *) NULL, copyf)) == NULL)
+               while (isspace(*p) || *p == ',')
+                       p++;
+               a = parseaddr(p, (ADDRESS *) NULL, 1, delimiter);
+               p = DelimChar;
+               if (a == NULL)
                        continue;
                a->q_next = al;
                a->q_alias = ctladdr;
                        continue;
                a->q_next = al;
                a->q_alias = ctladdr;
-               if (ctladdr != NULL)
-                       a->q_flags |= ctladdr->q_flags & ~QPRIMARY;
-               a->q_flags |= qflags;
 
                /* see if this should be marked as a primary address */
                if (ctladdr == NULL ||
 
                /* see if this should be marked as a primary address */
                if (ctladdr == NULL ||
-                   (firstone && !more && bitset(QPRIMARY, ctladdr->q_flags)))
+                   (firstone && *p == '\0' && bitset(QPRIMARY, ctladdr->q_flags)))
                        a->q_flags |= QPRIMARY;
 
                /* put on send queue or suppress self-reference */
                        a->q_flags |= QPRIMARY;
 
                /* put on send queue or suppress self-reference */
-               if (ctladdr != NULL && sameaddr(ctladdr, a, FALSE))
+               if (ctladdr != NULL && sameaddr(ctladdr, a))
                        selfref = TRUE;
                else
                        al = a;
                        selfref = TRUE;
                else
                        al = a;
@@ -110,71 +114,21 @@ sendto(list, copyf, ctladdr, qflags)
                ctladdr->q_flags |= QDONTSEND;
 
        /* arrange to send to everyone on the local send list */
                ctladdr->q_flags |= QDONTSEND;
 
        /* arrange to send to everyone on the local send list */
-       prev = sibl = NULL;
-       if (ctladdr != NULL)
-               prev = ctladdr->q_child;
        while (al != NULL)
        {
                register ADDRESS *a = al;
                extern ADDRESS *recipient();
 
                al = a->q_next;
        while (al != NULL)
        {
                register ADDRESS *a = al;
                extern ADDRESS *recipient();
 
                al = a->q_next;
-               sibl = recipient(a);
-               if (sibl != NULL)
-               {
-                       extern ADDRESS *addrref();
-
-                       /* inherit full name */
-                       if (sibl->q_fullname == NULL && ctladdr != NULL)
-                               sibl->q_fullname = ctladdr->q_fullname;
+               setctladdr(a);
+               a = recipient(a, sendq);
 
 
-                       /* link tree together (but only if the node is new) */
-                       if (sibl == a)
-                       {
-                               sibl->q_sibling = prev;
-                               prev = sibl;
-                       }
-               }
+               /* arrange to inherit full name */
+               if (a->q_fullname == NULL && ctladdr != NULL)
+                       a->q_fullname = ctladdr->q_fullname;
        }
 
        }
 
-       To = NULL;
-       if (ctladdr != NULL)
-               ctladdr->q_child = prev;
-       return (prev);
-}
-\f/*
-**  ADDRREF -- return pointer to address that references another address.
-**
-**     Parameters:
-**             a -- address to check.
-**             r -- reference to find.
-**
-**     Returns:
-**             address of node in tree rooted at 'a' that references
-**                     'r'.
-**             NULL if no such node exists.
-**
-**     Side Effects:
-**             none.
-*/
-
-ADDRESS *
-addrref(a, r)
-       register ADDRESS *a;
-       register ADDRESS *r;
-{
-       register ADDRESS *q;
-
-       while (a != NULL)
-       {
-               if (a->q_child == r || a->q_sibling == r)
-                       return (a);
-               q = addrref(a->q_child, r);
-               if (q != NULL)
-                       return (q);
-               a = a->q_sibling;
-       }
-       return (NULL);
+       CurEnv->e_to = NULL;
 }
 \f/*
 **  RECIPIENT -- Designate a message recipient
 }
 \f/*
 **  RECIPIENT -- Designate a message recipient
@@ -188,7 +142,8 @@ addrref(a, r)
 **                     in this queue.
 **
 **     Returns:
 **                     in this queue.
 **
 **     Returns:
-**             pointer to address actually inserted in send list.
+**             The actual address in the queue.  This will be "a" if
+**             the address is not a duplicate, else the original address.
 **
 **     Side Effects:
 **             none.
 **
 **     Side Effects:
 **             none.
@@ -202,45 +157,57 @@ recipient(a, sendq)
        register ADDRESS *q;
        ADDRESS **pq;
        register struct mailer *m;
        register ADDRESS *q;
        ADDRESS **pq;
        register struct mailer *m;
+       register char *p;
+       bool quoted = FALSE;            /* set if the addr has a quote bit */
+       char buf[MAXNAME];              /* unquoted image of the user name */
        extern ADDRESS *getctladdr();
        extern bool safefile();
 
        extern ADDRESS *getctladdr();
        extern bool safefile();
 
-       To = a->q_paddr;
+       CurEnv->e_to = a->q_paddr;
        m = a->q_mailer;
        errno = 0;
        m = a->q_mailer;
        errno = 0;
-# ifdef DEBUG
-       if (Debug)
+       if (tTd(26, 1))
        {
                printf("\nrecipient: ");
                printaddr(a, FALSE);
        }
        {
                printf("\nrecipient: ");
                printaddr(a, FALSE);
        }
-# endif DEBUG
 
        /* break aliasing loops */
        if (AliasLevel > MAXRCRSN)
        {
                usrerr("aliasing/forwarding loop broken");
 
        /* break aliasing loops */
        if (AliasLevel > MAXRCRSN)
        {
                usrerr("aliasing/forwarding loop broken");
-               return (NULL);
+               return (a);
        }
 
        /*
        **  Finish setting up address structure.
        */
 
        }
 
        /*
        **  Finish setting up address structure.
        */
 
+       /* set the queue timeout */
        a->q_timeout = TimeOut;
 
        a->q_timeout = TimeOut;
 
+       /* map user & host to lower case if requested on non-aliases */
+       if (a->q_alias == NULL)
+               loweraddr(a);
+
+       /* get unquoted user for file, program or user.name check */
+       (void) strcpy(buf, a->q_user);
+       for (p = buf; *p != '\0' && !quoted; p++)
+       {
+               if (!isascii(*p) && (*p & 0377) != (SpaceSub & 0377))
+                       quoted = TRUE;
+       }
+       stripquotes(buf, TRUE);
+
        /* do sickly crude mapping for program mailing, etc. */
        /* do sickly crude mapping for program mailing, etc. */
-       if (a->q_mailer == LocalMailer)
+       if (m == LocalMailer && buf[0] == '|')
        {
        {
-               if (a->q_user[0] == '|')
+               a->q_mailer = m = ProgMailer;
+               a->q_user++;
+               if (a->q_alias == NULL && !QueueRun && !ForceMail)
                {
                {
-                       a->q_mailer = m = ProgMailer;
-                       a->q_user++;
-                       if (a->q_alias == NULL && Debug == 0 && !QueueRun && !ForceMail)
-                       {
-                               usrerr("Cannot mail directly to programs");
-                               a->q_flags |= QDONTSEND;
-                       }
+                       a->q_flags |= QDONTSEND|QBADADDR;
+                       usrerr("Cannot mail directly to programs");
                }
        }
 
                }
        }
 
@@ -255,21 +222,17 @@ recipient(a, sendq)
 
        for (pq = sendq; (q = *pq) != NULL; pq = &q->q_next)
        {
 
        for (pq = sendq; (q = *pq) != NULL; pq = &q->q_next)
        {
-               if (!ForceMail && sameaddr(q, a, FALSE))
+               if (!ForceMail && sameaddr(q, a))
                {
                {
-# ifdef DEBUG
-                       if (Debug)
+                       if (tTd(26, 1))
                        {
                                printf("%s in sendq: ", a->q_paddr);
                                printaddr(q, FALSE);
                        }
                        {
                                printf("%s in sendq: ", a->q_paddr);
                                printaddr(q, FALSE);
                        }
-# endif DEBUG
-                       if (Verbose && !bitset(QDONTSEND|QPSEUDO, a->q_flags))
+                       if (!bitset(QDONTSEND, a->q_flags))
                                message(Arpa_Info, "duplicate suppressed");
                        if (!bitset(QPRIMARY, q->q_flags))
                                q->q_flags |= a->q_flags;
                                message(Arpa_Info, "duplicate suppressed");
                        if (!bitset(QPRIMARY, q->q_flags))
                                q->q_flags |= a->q_flags;
-                       if (!bitset(QPSEUDO, a->q_flags))
-                               q->q_flags &= ~QPSEUDO;
                        return (q);
                }
        }
                        return (q);
                }
        }
@@ -277,24 +240,25 @@ recipient(a, sendq)
        /* add address on list */
        *pq = a;
        a->q_next = NULL;
        /* add address on list */
        *pq = a;
        a->q_next = NULL;
-       if (DontSend)
-               a->q_flags |= QDONTSEND;
+       CurEnv->e_nrcpts++;
 
        /*
        **  Alias the name and handle :include: specs.
        */
 
 
        /*
        **  Alias the name and handle :include: specs.
        */
 
-       if (a->q_mailer == LocalMailer)
+       if (m == LocalMailer && !bitset(QDONTSEND, a->q_flags))
        {
                if (strncmp(a->q_user, ":include:", 9) == 0)
                {
                        a->q_flags |= QDONTSEND;
        {
                if (strncmp(a->q_user, ":include:", 9) == 0)
                {
                        a->q_flags |= QDONTSEND;
-                       if (a->q_alias == NULL && Debug == 0 && !QueueRun && !ForceMail)
+                       if (a->q_alias == NULL && !QueueRun && !ForceMail)
+                       {
+                               a->q_flags |= QBADADDR;
                                usrerr("Cannot mail directly to :include:s");
                                usrerr("Cannot mail directly to :include:s");
+                       }
                        else
                        {
                        else
                        {
-                               if (Verbose)
-                                       message(Arpa_Info, "including file %s", &a->q_user[9]);
+                               message(Arpa_Info, "including file %s", &a->q_user[9]);
                                include(&a->q_user[9], " sending", a, sendq);
                        }
                }
                                include(&a->q_user[9], " sending", a, sendq);
                        }
                }
@@ -310,37 +274,26 @@ recipient(a, sendq)
        **  the user (which is probably correct anyway).
        */
 
        **  the user (which is probably correct anyway).
        */
 
-       if (!bitset(QDONTSEND, a->q_flags) && a->q_mailer == LocalMailer)
+       if (!bitset(QDONTSEND, a->q_flags) && m == LocalMailer)
        {
        {
-               char buf[MAXNAME];
-               register char *p;
                struct stat stb;
                extern bool writable();
                struct stat stb;
                extern bool writable();
-               bool quoted = FALSE;
-
-               strcpy(buf, a->q_user);
-               for (p = buf; *p != '\0' && !quoted; p++)
-               {
-                       if (!isascii(*p) && (*p & 0377) != (SPACESUB) & 0377)
-                               quoted = TRUE;
-               }
-               stripquotes(buf, TRUE);
 
                /* see if this is to a file */
                if (buf[0] == '/')
                {
                        p = rindex(buf, '/');
                        /* check if writable or creatable */
 
                /* see if this is to a file */
                if (buf[0] == '/')
                {
                        p = rindex(buf, '/');
                        /* check if writable or creatable */
-                       if (a->q_alias == NULL && Debug == 0 && !QueueRun && !ForceMail)
+                       if (a->q_alias == NULL && !QueueRun && !ForceMail)
                        {
                        {
+                               a->q_flags |= QDONTSEND|QBADADDR;
                                usrerr("Cannot mail directly to files");
                                usrerr("Cannot mail directly to files");
-                               a->q_flags |= QDONTSEND;
                        }
                        else if ((stat(buf, &stb) >= 0) ? (!writable(&stb)) :
                            (*p = '\0', !safefile(buf, getruid(), S_IWRITE|S_IEXEC)))
                        {
                                a->q_flags |= QBADADDR;
                        }
                        else if ((stat(buf, &stb) >= 0) ? (!writable(&stb)) :
                            (*p = '\0', !safefile(buf, getruid(), S_IWRITE|S_IEXEC)))
                        {
                                a->q_flags |= QBADADDR;
-                               giveresponse(EX_CANTCREAT, TRUE, m);
+                               giveresponse(EX_CANTCREAT, m, CurEnv);
                        }
                }
                else
                        }
                }
                else
@@ -353,27 +306,22 @@ recipient(a, sendq)
                        if (pw == NULL)
                        {
                                a->q_flags |= QBADADDR;
                        if (pw == NULL)
                        {
                                a->q_flags |= QBADADDR;
-                               giveresponse(EX_NOUSER, TRUE, m);
+                               giveresponse(EX_NOUSER, m, CurEnv);
                        }
                        else
                        {
                                char nbuf[MAXNAME];
 
                        }
                        else
                        {
                                char nbuf[MAXNAME];
 
-                               char nbuf[MAXNAME];
-
                                if (strcmp(a->q_user, pw->pw_name) != 0)
                                {
                                        a->q_user = newstr(pw->pw_name);
                                if (strcmp(a->q_user, pw->pw_name) != 0)
                                {
                                        a->q_user = newstr(pw->pw_name);
-                                       strcpy(buf, pw->pw_name);
+                                       (void) strcpy(buf, pw->pw_name);
                                }
                                a->q_home = newstr(pw->pw_dir);
                                a->q_uid = pw->pw_uid;
                                a->q_gid = pw->pw_gid;
                                a->q_flags |= QGOODUID;
                                buildfname(pw->pw_gecos, pw->pw_name, nbuf);
                                }
                                a->q_home = newstr(pw->pw_dir);
                                a->q_uid = pw->pw_uid;
                                a->q_gid = pw->pw_gid;
                                a->q_flags |= QGOODUID;
                                buildfname(pw->pw_gecos, pw->pw_name, nbuf);
-                               if (nbuf[0] != '\0')
-                                       a->q_fullname = newstr(nbuf);
-                               fullname(pw, nbuf);
                                if (nbuf[0] != '\0')
                                        a->q_fullname = newstr(nbuf);
                                if (!quoted)
                                if (nbuf[0] != '\0')
                                        a->q_fullname = newstr(nbuf);
                                if (!quoted)
@@ -381,7 +329,6 @@ recipient(a, sendq)
                        }
                }
        }
                        }
                }
        }
-
        return (a);
 }
 \f/*
        return (a);
 }
 \f/*
@@ -390,6 +337,9 @@ recipient(a, sendq)
 **     This looks a lot like getpwnam, except that it may want to
 **     do some fancier pattern matching in /etc/passwd.
 **
 **     This looks a lot like getpwnam, except that it may want to
 **     do some fancier pattern matching in /etc/passwd.
 **
+**     This routine contains most of the time of many sendmail runs.
+**     It deserves to be optimized.
+**
 **     Parameters:
 **             name -- the name to match against.
 **
 **     Parameters:
 **             name -- the name to match against.
 **
@@ -405,34 +355,37 @@ struct passwd *
 finduser(name)
        char *name;
 {
 finduser(name)
        char *name;
 {
-       extern struct passwd *getpwent();
        register struct passwd *pw;
        register char *p;
        register struct passwd *pw;
        register char *p;
+       extern struct passwd *getpwent();
+       extern struct passwd *getpwnam();
 
 
-       /*
-       **  Make name canonical.
-       */
+       /* map upper => lower case */
+       for (p = name; *p != '\0'; p++)
+       {
+               if (isascii(*p) && isupper(*p))
+                       *p = tolower(*p);
+       }
+
+       /* look up this login name using fast path */
+       if ((pw = getpwnam(name)) != NULL)
+               return (pw);
 
 
+       /* search for a matching full name instead */
        for (p = name; *p != '\0'; p++)
        {
        for (p = name; *p != '\0'; p++)
        {
-               if (*p == (SPACESUB & 0177) || *p == '_')
+               if (*p == (SpaceSub & 0177) || *p == '_')
                        *p = ' ';
        }
                        *p = ' ';
        }
-
-       setpwent();
+       (void) setpwent();
        while ((pw = getpwent()) != NULL)
        {
        while ((pw = getpwent()) != NULL)
        {
-               extern bool sameword();
                char buf[MAXNAME];
 
                char buf[MAXNAME];
 
-               if (strcmp(pw->pw_name, name) == 0)
-                       return (pw);
-               fullname(pw, buf);
-               if (index(buf, ' ') != NULL && sameword(buf, name))
+               buildfname(pw->pw_gecos, pw->pw_name, buf);
+               if (index(buf, ' ') != NULL && !strcasecmp(buf, name))
                {
                {
-                       if (Verbose)
-                               message(Arpa_Info, "sending to %s <%s>",
-                                   buf, pw->pw_name);
+                       message(Arpa_Info, "sending to login name %s", pw->pw_name);
                        return (pw);
                }
        }
                        return (pw);
                }
        }
@@ -518,7 +471,9 @@ include(fname, msg, ctladdr, sendq)
 {
        char buf[MAXLINE];
        register FILE *fp;
 {
        char buf[MAXLINE];
        register FILE *fp;
-       char *oldto = To;
+       char *oldto = CurEnv->e_to;
+       char *oldfilename = FileName;
+       int oldlinenumber = LineNumber;
 
        fp = fopen(fname, "r");
        if (fp == NULL)
 
        fp = fopen(fname, "r");
        if (fp == NULL)
@@ -538,23 +493,27 @@ include(fname, msg, ctladdr, sendq)
        }
 
        /* read the file -- each line is a comma-separated list. */
        }
 
        /* read the file -- each line is a comma-separated list. */
+       FileName = fname;
+       LineNumber = 0;
        while (fgets(buf, sizeof buf, fp) != NULL)
        {
                register char *p = index(buf, '\n');
 
        while (fgets(buf, sizeof buf, fp) != NULL)
        {
                register char *p = index(buf, '\n');
 
+               LineNumber++;
                if (p != NULL)
                        *p = '\0';
                if (buf[0] == '\0')
                        continue;
                if (p != NULL)
                        *p = '\0';
                if (buf[0] == '\0')
                        continue;
-               To = oldto;
-               if (Verbose)
-                       message(Arpa_Info, "%s to %s", msg, buf);
+               CurEnv->e_to = oldto;
+               message(Arpa_Info, "%s to %s", msg, buf);
                AliasLevel++;
                AliasLevel++;
-               sendto(buf, 1, ctladdr, 0);
+               sendtolist(buf, ctladdr, sendq);
                AliasLevel--;
        }
 
        (void) fclose(fp);
                AliasLevel--;
        }
 
        (void) fclose(fp);
+       FileName = oldfilename;
+       LineNumber = oldlinenumber;
 }
 \f/*
 **  SENDTOARGV -- send to an argument vector.
 }
 \f/*
 **  SENDTOARGV -- send to an argument vector.
@@ -574,11 +533,10 @@ sendtoargv(argv)
        register char **argv;
 {
        register char *p;
        register char **argv;
 {
        register char *p;
-       extern bool sameword();
 
        while ((p = *argv++) != NULL)
        {
 
        while ((p = *argv++) != NULL)
        {
-               if (argv[0] != NULL && argv[1] != NULL && sameword(argv[0], "at"))
+               if (argv[0] != NULL && argv[1] != NULL && !strcasecmp(argv[0], "at"))
                {
                        char nbuf[MAXNAME];
 
                {
                        char nbuf[MAXNAME];
 
@@ -593,7 +551,7 @@ sendtoargv(argv)
                                argv += 2;
                        }
                }
                                argv += 2;
                        }
                }
-               sendto(p, 0, (ADDRESS *) NULL, 0);
+               sendtolist(p, (ADDRESS *) NULL, &CurEnv->e_sendqueue);
        }
 }
 \f/*
        }
 }
 \f/*
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.