-#
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)names.c 5.17 (Berkeley) %G%";
+#endif /* not lint */
/*
* Mail -- a mail program
*/
#include "rcv.h"
-
-static char *SccsId = "@(#)names.c 2.2 %G%";
+#include <fcntl.h>
+#include "extern.h"
/*
* Allocate a single element of a name list,
* initialize its name field to the passed
* name and return it.
*/
-
struct name *
-nalloc(str)
+nalloc(str, ntype)
char str[];
+ int ntype;
{
register struct name *np;
np = (struct name *) salloc(sizeof *np);
np->n_flink = NIL;
np->n_blink = NIL;
- np->n_type = -1;
+ np->n_type = ntype;
np->n_name = savestr(str);
return(np);
}
/*
* Find the tail of a list and return it.
*/
-
struct name *
tailof(name)
struct name *name;
* and make a list of names from it.
* Return the list or NIL if none found.
*/
-
struct name *
extract(line, ntype)
char line[];
+ int ntype;
{
register char *cp;
register struct name *top, *np, *t;
- char nbuf[BUFSIZ], abuf[BUFSIZ];
+ char nbuf[BUFSIZ];
- if (line == NOSTR || strlen(line) == 0)
- return(NIL);
+ if (line == NOSTR || *line == '\0')
+ return NIL;
top = NIL;
np = NIL;
cp = line;
while ((cp = yankword(cp, nbuf)) != NOSTR) {
- if (np != NIL && equal(nbuf, "at")) {
- strcpy(abuf, nbuf);
- if ((cp = yankword(cp, nbuf)) == NOSTR) {
- strcpy(nbuf, abuf);
- goto normal;
- }
- strcpy(abuf, np->n_name);
- stradd(abuf, '@');
- strcat(abuf, nbuf);
- np->n_name = savestr(abuf);
- continue;
- }
-normal:
- t = nalloc(nbuf);
- t->n_type = ntype;
+ t = nalloc(nbuf, ntype);
if (top == NIL)
top = t;
else
t->n_blink = np;
np = t;
}
- return(top);
+ return top;
}
/*
* Turn a list of names into a string of the same names.
*/
-
char *
detract(np, ntype)
register struct name *np;
+ int ntype;
{
register int s;
register char *cp, *top;
/*
* Grab a single word (liberal word)
- * Throw away things between ()'s.
+ * Throw away things between ()'s, and take anything between <>.
*/
-
char *
yankword(ap, wbuf)
char *ap, wbuf[];
{
register char *cp, *cp2;
- do {
- for (cp = ap; *cp && any(*cp, " \t,"); cp++)
- ;
- if (*cp == '(') {
- while (*cp && *cp != ')')
- cp++;
- if (*cp)
- cp++;
- }
+ cp = ap;
+ for (;;) {
if (*cp == '\0')
- return(NOSTR);
- } while (any(*cp, " \t,("));
- for (cp2 = wbuf; *cp && !any(*cp, " \t,("); *cp2++ = *cp++)
- ;
- *cp2 = '\0';
- return(cp);
-}
-
-/*
- * Verify that all the users in the list of names are
- * legitimate. Bitch about and delink those who aren't.
- */
-
-struct name *
-verify(names)
- struct name *names;
-{
- register struct name *np, *top, *t, *x;
- register char *cp;
-
-#ifdef DELIVERMAIL
- return(names);
-#else
- top = names;
- np = names;
- while (np != NIL) {
- if (np->n_type & GDEL) {
- np = np->n_flink;
- continue;
- }
- for (cp = "!:@^"; *cp; cp++)
- if (any(*cp, np->n_name))
- break;
- if (*cp != 0) {
- np = np->n_flink;
- continue;
- }
- cp = np->n_name;
- while (*cp == '\\')
+ return NOSTR;
+ if (*cp == '(') {
+ register int nesting = 0;
+
+ while (*cp != '\0') {
+ switch (*cp++) {
+ case '(':
+ nesting++;
+ break;
+ case ')':
+ --nesting;
+ break;
+ }
+ if (nesting <= 0)
+ break;
+ }
+ } else if (*cp == ' ' || *cp == '\t' || *cp == ',')
cp++;
- if (equal(cp, "msgs") ||
- getuserid(cp) != -1) {
- np = np->n_flink;
- continue;
- }
- fprintf(stderr, "Can't send to %s\n", np->n_name);
- senderr++;
- if (np == top) {
- top = np->n_flink;
- if (top != NIL)
- top->n_blink = NIL;
- np = top;
- continue;
- }
- x = np->n_blink;
- t = np->n_flink;
- x->n_flink = t;
- if (t != NIL)
- t->n_blink = x;
- np = t;
+ else
+ break;
}
- return(top);
-#endif
+ if (*cp == '<')
+ for (cp2 = wbuf; *cp && (*cp2++ = *cp++) != '>';)
+ ;
+ else
+ for (cp2 = wbuf; *cp && !index(" \t,(", *cp); *cp2++ = *cp++)
+ ;
+ *cp2 = '\0';
+ return cp;
}
/*
* Recipients whose name begins with | are piped through the given
* program and removed.
*/
-
struct name *
outof(names, fo, hp)
struct name *names;
struct header *hp;
{
register int c;
- register struct name *np, *top, *t, *x;
- long now;
- char *date, *fname, *shell, *ctime();
+ register struct name *np, *top;
+ time_t now, time();
+ char *date, *fname, *ctime();
FILE *fout, *fin;
- int ispipe, s, pid;
+ int ispipe;
extern char tempEdit[];
top = names;
np = names;
- time(&now);
+ (void) time(&now);
date = ctime(&now);
while (np != NIL) {
- if (!any('/', np->n_name) && np->n_name[0] != '|') {
+ if (!isfileaddr(np->n_name) && np->n_name[0] != '|') {
np = np->n_flink;
continue;
}
*/
if (image < 0) {
- if ((fout = fopen(tempEdit, "a")) == NULL) {
+ if ((fout = Fopen(tempEdit, "a")) == NULL) {
perror(tempEdit);
senderr++;
goto cant;
}
image = open(tempEdit, 2);
- unlink(tempEdit);
+ (void) unlink(tempEdit);
if (image < 0) {
perror(tempEdit);
senderr++;
+ (void) Fclose(fout);
goto cant;
}
- else {
- rewind(fo);
- fprintf(fout, "From %s %s", myname, date);
- puthead(hp, fout, GTO|GSUBJECT|GCC|GNL);
- while ((c = getc(fo)) != EOF)
- putc(c, fout);
- rewind(fo);
- putc('\n', fout);
- fflush(fout);
- if (ferror(fout))
- perror(tempEdit);
- fclose(fout);
- }
+ fprintf(fout, "From %s %s", myname, date);
+ puthead(hp, fout, GTO|GSUBJECT|GCC|GNL);
+ while ((c = getc(fo)) != EOF)
+ (void) putc(c, fout);
+ rewind(fo);
+ (void) putc('\n', fout);
+ (void) fflush(fout);
+ if (ferror(fout))
+ perror(tempEdit);
+ (void) Fclose(fout);
}
/*
*/
if (ispipe) {
- wait(&s);
- switch (pid = fork()) {
- case 0:
- sigsys(SIGHUP, SIG_IGN);
- sigsys(SIGINT, SIG_IGN);
- sigsys(SIGQUIT, SIG_IGN);
- close(0);
- dup(image);
- close(image);
- if ((shell = value("SHELL")) == NOSTR)
- shell = SHELL;
- execl(shell, shell, "-c", fname, 0);
- perror(shell);
- exit(1);
- break;
-
- case -1:
- perror("fork");
+ int pid;
+ char *shell;
+
+ /*
+ * XXX
+ * We can't really reuse the same image file,
+ * because multiple piped recipients will
+ * share the same lseek location and trample
+ * on one another.
+ */
+ if ((shell = value("SHELL")) == NOSTR)
+ shell = _PATH_CSHELL;
+ pid = start_command(shell, sigmask(SIGHUP)|
+ sigmask(SIGINT)|sigmask(SIGQUIT),
+ image, -1, "-c", fname, NOSTR);
+ if (pid < 0) {
senderr++;
goto cant;
}
- }
- else {
- if ((fout = fopen(fname, "a")) == NULL) {
+ free_child(pid);
+ } else {
+ int f;
+ if ((fout = Fopen(fname, "a")) == NULL) {
perror(fname);
senderr++;
goto cant;
}
- fin = Fdopen(image, "r");
+ if ((f = dup(image)) < 0) {
+ perror("dup");
+ fin = NULL;
+ } else
+ fin = Fdopen(f, "r");
if (fin == NULL) {
fprintf(stderr, "Can't reopen image\n");
- fclose(fout);
+ (void) Fclose(fout);
senderr++;
goto cant;
}
rewind(fin);
while ((c = getc(fin)) != EOF)
- putc(c, fout);
+ (void) putc(c, fout);
if (ferror(fout))
senderr++, perror(fname);
- fclose(fout);
- fclose(fin);
+ (void) Fclose(fout);
+ (void) Fclose(fin);
}
-
cant:
-
/*
* In days of old we removed the entry from the
* the list; now for sake of header expansion
* we leave it in and mark it as deleted.
*/
-
-#ifdef CRAZYWOW
- if (np == top) {
- top = np->n_flink;
- if (top != NIL)
- top->n_blink = NIL;
- np = top;
- continue;
- }
- x = np->n_blink;
- t = np->n_flink;
- x->n_flink = t;
- if (t != NIL)
- t->n_blink = x;
- np = t;
-#endif
-
np->n_type |= GDEL;
np = np->n_flink;
}
if (image >= 0) {
- close(image);
+ (void) close(image);
image = -1;
}
return(top);
}
+/*
+ * Determine if the passed address is a local "send to file" address.
+ * If any of the network metacharacters precedes any slashes, it can't
+ * be a filename. We cheat with .'s to allow path names like ./...
+ */
+int
+isfileaddr(name)
+ char *name;
+{
+ register char *cp;
+
+ if (*name == '+')
+ return 1;
+ for (cp = name; *cp; cp++) {
+ if (*cp == '!' || *cp == '%' || *cp == '@')
+ return 0;
+ if (*cp == '/')
+ return 1;
+ }
+ return 0;
+}
+
/*
* Map all of the aliased users in the invoker's mailrc
* file and insert them into the list.
struct name *names;
{
register struct name *new, *np, *cp;
- struct name *getto;
struct grouphead *gh;
register int metoo;
new = NIL;
np = names;
- getto = NIL;
metoo = (value("metoo") != NOSTR);
while (np != NIL) {
if (np->n_name[0] == '\\') {
gexpand(nlist, gh, metoo, ntype)
struct name *nlist;
struct grouphead *gh;
+ int metoo, ntype;
{
struct group *gp;
struct grouphead *ngh;
continue;
}
quote:
- np = nalloc(cp);
- np->n_type = ntype;
+ np = nalloc(cp, ntype);
/*
* At this point should allow to expand
* to self if only person in group
return(nlist);
}
-
-
-/*
- * Compute the length of the passed name list and
- * return it.
- */
-
-lengthof(name)
- struct name *name;
-{
- register struct name *np;
- register int c;
-
- for (c = 0, np = name; np != NIL; c++, np = np->n_flink)
- ;
- return(c);
-}
-
/*
* Concatenate the two passed name lists, return the result.
*/
-
struct name *
cat(n1, n2)
struct name *n1, *n2;
* Unpack the name list onto a vector of strings.
* Return an error if the name list won't fit.
*/
-
char **
unpack(np)
struct name *np;
{
register char **ap, **top;
register struct name *n;
- char *cp;
- char hbuf[10];
- int t, extra, metoo;
+ int t, extra, metoo, verbose;
n = np;
- if ((t = lengthof(n)) == 0)
+ if ((t = count(n)) == 0)
panic("No names to unpack");
-
/*
* Compute the number of extra arguments we will need.
* We need at least two extra -- one for "mail" and one for
* the terminating 0 pointer. Additional spots may be needed
- * to pass along -r and -f to the host mailer.
+ * to pass along -f to the host mailer.
*/
-
extra = 2;
- if (rflag != NOSTR)
- extra += 2;
-#ifdef DELIVERMAIL
extra++;
metoo = value("metoo") != NOSTR;
if (metoo)
extra++;
-#endif DELIVERMAIL
- if (hflag)
- extra += 2;
- top = (char **) salloc((t + extra) * sizeof cp);
+ verbose = value("verbose") != NOSTR;
+ if (verbose)
+ extra++;
+ top = (char **) salloc((t + extra) * sizeof *top);
ap = top;
*ap++ = "send-mail";
- if (rflag != NOSTR) {
- *ap++ = "-r";
- *ap++ = rflag;
- }
-#ifdef DELIVERMAIL
*ap++ = "-i";
if (metoo)
*ap++ = "-m";
-#endif DELIVERMAIL
- if (hflag) {
- *ap++ = "-h";
- sprintf(hbuf, "%d", hflag);
- *ap++ = savestr(hbuf);
- }
- while (n != NIL) {
- if (n->n_type & GDEL) {
- n = n->n_flink;
- continue;
- }
- *ap++ = n->n_name;
- n = n->n_flink;
- }
+ if (verbose)
+ *ap++ = "-v";
+ for (; n != NIL; n = n->n_flink)
+ if ((n->n_type & GDEL) == 0)
+ *ap++ = n->n_name;
*ap = NOSTR;
return(top);
}
-/*
- * See if the user named himself as a destination
- * for outgoing mail. If so, set the global flag
- * selfsent so that we avoid removing his mailbox.
- */
-
-mechk(names)
- struct name *names;
-{
- register struct name *np;
-
- for (np = names; np != NIL; np = np->n_flink)
- if ((np->n_type & GDEL) == 0 && equal(myname, np->n_name)) {
- selfsent++;
- return;
- }
-}
-
/*
* Remove all of the duplicates from the passed name list by
* insertion sorting them, then checking for dups.
* Return the head of the new list.
*/
-
struct name *
elide(names)
struct name *names;
new->n_flink = NIL;
while (np != NIL) {
t = new;
- while (nstrcmp(t->n_name, np->n_name) < 0) {
+ while (strcasecmp(t->n_name, np->n_name) < 0) {
if (t->n_flink == NIL)
break;
t = t->n_flink;
* the current value of t.
*/
- if (nstrcmp(t->n_name, np->n_name) < 0) {
+ if (strcasecmp(t->n_name, np->n_name) < 0) {
t->n_flink = np;
np->n_blink = t;
t = np;
np = new;
while (np != NIL) {
t = np;
- while (t->n_flink!=NIL &&
- icequal(np->n_name,t->n_flink->n_name))
+ while (t->n_flink != NIL &&
+ strcasecmp(np->n_name, t->n_flink->n_name) == 0)
t = t->n_flink;
if (t == np || t == NIL) {
np = np->n_flink;
return(new);
}
-/*
- * Version of strcmp which ignores case differences.
- */
-
-nstrcmp(s1, s2)
- register char *s1, *s2;
-{
- register int c1, c2;
-
- do {
- c1 = *s1++;
- c2 = *s2++;
- } while (c1 && c1 == c2);
- return(c1 - c2);
-}
-
/*
* Put another node onto a list of names and return
* the list.
*/
-
struct name *
put(list, node)
struct name *list, *node;
}
/*
- * Determine the number of elements in
+ * Determine the number of undeleted elements in
* a name list and return it.
*/
-
+int
count(np)
register struct name *np;
{
- register int c = 0;
+ register int c;
- while (np != NIL) {
- c++;
- np = np->n_flink;
- }
- return(c);
+ for (c = 0; np != NIL; np = np->n_flink)
+ if ((np->n_type & GDEL) == 0)
+ c++;
+ return c;
}
/*
* Delete the given name from a namelist.
*/
-
struct name *
delname(np, name)
register struct name *np;
register struct name *p;
for (p = np; p != NIL; p = p->n_flink)
- if (equal(p->n_name, name)) {
+ if (strcasecmp(p->n_name, name) == 0) {
if (p->n_blink == NIL) {
if (p->n_flink != NIL)
p->n_flink->n_blink = NIL;
p->n_blink->n_flink = p->n_flink;
p->n_flink->n_blink = p->n_blink;
}
- return(np);
-}
-
-/*
- * Call the given routine on each element of the name
- * list, replacing said value if need be.
- */
-
-mapf(np, from)
- register struct name *np;
- char *from;
-{
- register struct name *p;
-
- for (p = np; p != NIL; p = p->n_flink)
- p->n_name = netmap(p->n_name, from);
+ return np;
}
/*
* Uncomment it if you need it.
*/
+/*
+void
prettyprint(name)
struct name *name;
{
}
fprintf(stderr, "\n");
}
+*/