Added declaration of icequal();

[unix-history] / usr / src / usr.bin / mail / cmd3.c

diff --git a/usr/src/usr.bin/mail/cmd3.c b/usr/src/usr.bin/mail/cmd3.c
index 993b122..e027207 100644 (file)
--- a/usr/src/usr.bin/mail/cmd3.c
+++ b/usr/src/usr.bin/mail/cmd3.c
@@ -9,7 +9,7 @@
  * Still more user commands.
  */
 
  * Still more user commands.
  */
 

-static char *SccsId = "@(#)cmd3.c      1.9 %G%";
+static char *SccsId = "@(#)cmd3.c      2.10 %G%";

 
 /*
  * Process a shell escape by saving signals, ignoring signals,
 
 /*
  * Process a shell escape by saving signals, ignoring signals,


@@ -30,12 +30,13 @@ shell(str)
        if ((Shell = value("SHELL")) == NOSTR)
                Shell = SHELL;
        for (t = 2; t < 4; t++)
        if ((Shell = value("SHELL")) == NOSTR)
                Shell = SHELL;
        for (t = 2; t < 4; t++)

-               sig[t-2] = signal(t, SIG_IGN);
+               sig[t-2] = sigset(t, SIG_IGN);

        t = vfork();
        if (t == 0) {
        t = vfork();
        if (t == 0) {

+               sigchild();

                for (t = 2; t < 4; t++)
                        if (sig[t-2] != SIG_IGN)
                for (t = 2; t < 4; t++)
                        if (sig[t-2] != SIG_IGN)

-                               signal(t, SIG_DFL);
+                               sigsys(t, SIG_DFL);

                execl(Shell, Shell, "-c", cmd, 0);
                perror(Shell);
                _exit(1);
                execl(Shell, Shell, "-c", cmd, 0);
                perror(Shell);
                _exit(1);


@@ -45,7 +46,7 @@ shell(str)
        if (t == -1)
                perror("fork");
        for (t = 2; t < 4; t++)
        if (t == -1)
                perror("fork");
        for (t = 2; t < 4; t++)

-               signal(t, sig[t-2]);
+               sigset(t, sig[t-2]);

        printf("!\n");
        return(0);
 }
        printf("!\n");
        return(0);
 }


@@ -63,12 +64,13 @@ dosh(str)
        if ((Shell = value("SHELL")) == NOSTR)
                Shell = SHELL;
        for (t = 2; t < 4; t++)
        if ((Shell = value("SHELL")) == NOSTR)
                Shell = SHELL;
        for (t = 2; t < 4; t++)

-               sig[t-2] = signal(t, SIG_IGN);
+               sig[t-2] = sigset(t, SIG_IGN);

        t = vfork();
        if (t == 0) {
        t = vfork();
        if (t == 0) {

+               sigchild();

                for (t = 2; t < 4; t++)
                        if (sig[t-2] != SIG_IGN)
                for (t = 2; t < 4; t++)
                        if (sig[t-2] != SIG_IGN)

-                               signal(t, SIG_DFL);
+                               sigsys(t, SIG_DFL);

                execl(Shell, Shell, 0);
                perror(Shell);
                _exit(1);
                execl(Shell, Shell, 0);
                perror(Shell);
                _exit(1);


@@ -78,7 +80,7 @@ dosh(str)
        if (t == -1)
                perror("fork");
        for (t = 2; t < 4; t++)
        if (t == -1)
                perror("fork");
        for (t = 2; t < 4; t++)

-               signal(t, sig[t-2]);
+               sigsys(t, sig[t-2]);

        putchar('\n');
        return(0);
 }
        putchar('\n');
        return(0);
 }


@@ -147,7 +149,7 @@ help()
        register FILE *f;
 
        if ((f = fopen(HELPFILE, "r")) == NULL) {
        register FILE *f;
 
        if ((f = fopen(HELPFILE, "r")) == NULL) {

-               printf("No help just now.\n");
+               perror(HELPFILE);

                return(1);
        }
        while ((c = getc(f)) != EOF)
                return(1);
        }
        while ((c = getc(f)) != EOF)


@@ -188,10 +190,10 @@ respond(msgvec)
        int *msgvec;
 {
        struct message *mp;
        int *msgvec;
 {
        struct message *mp;

-       char *cp, buf[2 * LINESIZE], *rcv, *replyto;
+       char *cp, *cp2, *cp3, *rcv, *replyto;
+       char buf[2 * LINESIZE], **ap;

        struct name *np;
        struct header head;
        struct name *np;
        struct header head;

-       char *netmap();

 
        if (msgvec[1] != 0) {
                printf("Sorry, can't reply to multiple messages at once\n");
 
        if (msgvec[1] != 0) {
                printf("Sorry, can't reply to multiple messages at once\n");


@@ -200,7 +202,7 @@ respond(msgvec)
        mp = &message[msgvec[0] - 1];
        dot = mp;
        rcv = nameof(mp, 1);
        mp = &message[msgvec[0] - 1];
        dot = mp;
        rcv = nameof(mp, 1);

-       replyto = hfield("reply-to", mp);
+       replyto = skin(hfield("reply-to", mp));

        strcpy(buf, "");
        if (replyto != NOSTR)
                strcpy(buf, replyto);
        strcpy(buf, "");
        if (replyto != NOSTR)
                strcpy(buf, replyto);


@@ -212,7 +214,14 @@ respond(msgvec)
        np = elide(extract(buf, GTO));
        /* rcv = rename(rcv); */
        mapf(np, rcv);
        np = elide(extract(buf, GTO));
        /* rcv = rename(rcv); */
        mapf(np, rcv);

-       np = delname(np, myname);
+       /*
+        * Delete my name from the reply list,
+        * and with it, all my alternate names.
+        */
+       np = delname(np, myname, icequal);
+       if (altnames)
+               for (ap = altnames; *ap; ap++)
+                       np = delname(np, *ap, icequal);

        head.h_seq = 1;
        cp = detract(np, 0);
        if (cp != NOSTR && replyto == NOSTR) {
        head.h_seq = 1;
        cp = detract(np, 0);
        if (cp != NOSTR && replyto == NOSTR) {


@@ -239,7 +248,10 @@ respond(msgvec)
                if (cp != NOSTR) {
                        np = elide(extract(cp, GCC));
                        mapf(np, rcv);
                if (cp != NOSTR) {
                        np = elide(extract(cp, GCC));
                        mapf(np, rcv);

-                       np = delname(np, myname);
+                       np = delname(np, myname, icequal);
+                       if (altnames != 0)
+                               for (ap = altnames; *ap; ap++)
+                                       np = delname(np, *ap, icequal);

                        head.h_cc = detract(np, 0);
                }
        }
                        head.h_cc = detract(np, 0);
                }
        }


@@ -290,6 +302,7 @@ preserve(msgvec)
                mesg = *ip;
                mp = &message[mesg-1];
                mp->m_flag |= MPRESERVE;
                mesg = *ip;
                mp = &message[mesg-1];
                mp->m_flag |= MPRESERVE;

+               mp->m_flag &= ~MBOX;

                dot = mp;
        }
        return(0);
                dot = mp;
        }
        return(0);


@@ -308,7 +321,7 @@ messize(msgvec)
        for (ip = msgvec; *ip != NULL; ip++) {
                mesg = *ip;
                mp = &message[mesg-1];
        for (ip = msgvec; *ip != NULL; ip++) {
                mesg = *ip;
                mp = &message[mesg-1];

-               printf("%d: %d\n", mesg, msize(mp));
+               printf("%d: %ld\n", mesg, mp->m_size);

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


@@ -322,6 +335,8 @@ rexit(e)
 {
        if (sourcing)
                return(1);
 {
        if (sourcing)
                return(1);

+       if (Tflag != NOSTR)
+               close(creat(Tflag, 0600));

        exit(e);
 }
 
        exit(e);
 }
 


@@ -517,6 +532,7 @@ file(argv)
 {
        register char *cp;
        char fname[BUFSIZ];
 {
        register char *cp;
        char fname[BUFSIZ];

+       int edit;

 
        if (argv[0] == NOSTR) {
                newfileinfo();
 
        if (argv[0] == NOSTR) {
                newfileinfo();


@@ -533,10 +549,14 @@ file(argv)
         *      string -- reads the given file
         */
 
         *      string -- reads the given file
         */
 

-       cp = getfilename(argv[0]);
+       cp = getfilename(argv[0], &edit);

        if (cp == NOSTR)
                return(-1);
        if (cp == NOSTR)
                return(-1);

-       return(setfile(cp, 1));
+       if (setfile(cp, edit)) {
+               perror(cp);
+               return(-1);
+       }
+       newfileinfo();

 }
 
 /*
 }
 
 /*


@@ -553,15 +573,22 @@ file(argv)
 char   prevfile[PATHSIZE];
 
 char *
 char   prevfile[PATHSIZE];
 
 char *

-getfilename(name)
+getfilename(name, aedit)

        char *name;
        char *name;

+       int *aedit;

 {
        register char *cp;
        char savename[BUFSIZ];
        char oldmailname[BUFSIZ];
 
 {
        register char *cp;
        char savename[BUFSIZ];
        char oldmailname[BUFSIZ];
 

+       /*
+        * Assume we will be in "edit file" mode, until
+        * proven wrong.
+        */
+       *aedit = 1;

        switch (*name) {
        case '%':
        switch (*name) {
        case '%':

+               *aedit = 0;

                strcpy(prevfile, mailname);
                if (name[1] != 0) {
                        strcpy(savename, myname);
                strcpy(prevfile, mailname);
                if (name[1] != 0) {
                        strcpy(savename, myname);


@@ -618,7 +645,7 @@ echo(argv)
        for (ap = argv; *ap != NOSTR; ap++) {
                cp = *ap;
                if ((cp = expand(cp)) != NOSTR)
        for (ap = argv; *ap != NOSTR; ap++) {
                cp = *ap;
                if ((cp = expand(cp)) != NOSTR)

-                       printf("%s\n", cp);
+                       printf("%s ", cp);

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


@@ -640,7 +667,7 @@ Respond(msgvec)
        for (s = 0, ap = msgvec; *ap != 0; ap++) {
                mp = &message[*ap - 1];
                dot = mp;
        for (s = 0, ap = msgvec; *ap != 0; ap++) {
                mp = &message[*ap - 1];
                dot = mp;

-               s += strlen(nameof(mp, 1)) + 1;
+               s += strlen(nameof(mp, 2)) + 1;

        }
        if (s == 0)
                return(0);
        }
        if (s == 0)
                return(0);


@@ -648,7 +675,7 @@ Respond(msgvec)
        head.h_to = cp;
        for (ap = msgvec; *ap != 0; ap++) {
                mp = &message[*ap - 1];
        head.h_to = cp;
        for (ap = msgvec; *ap != 0; ap++) {
                mp = &message[*ap - 1];

-               cp = copy(nameof(mp, 1), cp);
+               cp = copy(nameof(mp, 2), cp);

                *cp++ = ' ';
        }
        *--cp = 0;
                *cp++ = ' ';
        }
        *--cp = 0;


@@ -741,3 +768,33 @@ endifcmd()
        cond = CANY;
        return(0);
 }
        cond = CANY;
        return(0);
 }

+
+/*
+ * Set the list of alternate names.
+ */
+alternates(namelist)
+       char **namelist;
+{
+       register int c;
+       register char **ap, **ap2, *cp;
+
+       c = argcount(namelist) + 1;
+       if (c == 1) {
+               if (altnames == 0)
+                       return(0);
+               for (ap = altnames; *ap; ap++)
+                       printf("%s ", *ap);
+               printf("\n");
+               return(0);
+       }
+       if (altnames != 0)
+               cfree((char *) altnames);
+       altnames = (char **) calloc(c, sizeof (char *));
+       for (ap = namelist, ap2 = altnames; *ap; ap++, ap2++) {
+               cp = (char *) calloc(strlen(*ap) + 1, sizeof (char));
+               strcpy(cp, *ap);
+               *ap2 = cp;
+       }
+       *ap2 = 0;
+       return(0);
+}