removed global uid variable

[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 a66c81d..0e64ea1 100644 (file)
--- a/usr/src/usr.bin/mail/cmd3.c
+++ b/usr/src/usr.bin/mail/cmd3.c
@@ -1,7 +1,27 @@
-#
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, 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'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)cmd3.c     5.13 (Berkeley) %G%";
+#endif /* not lint */

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

+#include <sys/wait.h>

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


@@ -9,8 +29,6 @@
  * Still more user commands.
  */
 
  * Still more user commands.
  */
 

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

 /*
  * Process a shell escape by saving signals, ignoring signals,
  * and forking a sh -c
 /*
  * Process a shell escape by saving signals, ignoring signals,
  * and forking a sh -c


@@ -19,7 +37,8 @@ static char *SccsId = "@(#)cmd3.c     2.5 %G%";
 shell(str)
        char *str;
 {
 shell(str)
        char *str;
 {

-       int (*sig[2])(), stat[1];
+       int (*sigint)(), (*sigquit)();
+       union wait stat;

        register int t;
        char *Shell;
        char cmd[BUFSIZ];
        register int t;
        char *Shell;
        char cmd[BUFSIZ];


@@ -29,23 +48,24 @@ shell(str)
                return(-1);
        if ((Shell = value("SHELL")) == NOSTR)
                Shell = SHELL;
                return(-1);
        if ((Shell = value("SHELL")) == NOSTR)
                Shell = SHELL;

-       for (t = 2; t < 4; t++)
-               sig[t-2] = sigset(t, SIG_IGN);
+       sigint = signal(SIGINT, SIG_IGN);
+       sigquit = signal(SIGQUIT, SIG_IGN);

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

-               for (t = 2; t < 4; t++)
-                       if (sig[t-2] != SIG_IGN)
-                               sigsys(t, SIG_DFL);
-               execl(Shell, Shell, "-c", cmd, 0);
+               if (sigint != SIG_IGN)
+                       signal(SIGINT, SIG_DFL);
+               if (sigquit != SIG_IGN)
+                       signal(SIGQUIT, SIG_DFL);
+               execl(Shell, Shell, "-c", cmd, (char *)0);

                perror(Shell);
                _exit(1);
        }
                perror(Shell);
                _exit(1);
        }

-       while (wait(stat) != t)
+       while (wait(&stat) != t)

                ;
        if (t == -1)
                perror("fork");
                ;
        if (t == -1)
                perror("fork");

-       for (t = 2; t < 4; t++)
-               sigset(t, sig[t-2]);
+       signal(SIGINT, sigint);
+       signal(SIGQUIT, sigquit);

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


@@ -54,31 +74,35 @@ shell(str)
  * Fork an interactive shell.
  */
 
  * Fork an interactive shell.
  */
 

+/*ARGSUSED*/

 dosh(str)
        char *str;
 {
 dosh(str)
        char *str;
 {

-       int (*sig[2])(), stat[1];
+       int (*sigint)(), (*sigquit)();
+       union wait stat;

        register int t;
        char *Shell;
        register int t;
        char *Shell;

+

        if ((Shell = value("SHELL")) == NOSTR)
                Shell = SHELL;
        if ((Shell = value("SHELL")) == NOSTR)
                Shell = SHELL;

-       for (t = 2; t < 4; t++)
-               sig[t-2] = sigset(t, SIG_IGN);
+       sigint = signal(SIGINT, SIG_IGN);
+       sigquit = signal(SIGQUIT, SIG_IGN);

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

-               for (t = 2; t < 4; t++)
-                       if (sig[t-2] != SIG_IGN)
-                               sigsys(t, SIG_DFL);
-               execl(Shell, Shell, 0);
+               if (sigint != SIG_IGN)
+                       signal(SIGINT, SIG_DFL);
+               if (sigquit != SIG_IGN)
+                       signal(SIGQUIT, SIG_DFL);
+               execl(Shell, Shell, (char *)0);

                perror(Shell);
                _exit(1);
        }
                perror(Shell);
                _exit(1);
        }

-       while (wait(stat) != t)
+       while (wait(&stat) != t)

                ;
        if (t == -1)
                perror("fork");
                ;
        if (t == -1)
                perror("fork");

-       for (t = 2; t < 4; t++)
-               sigsys(t, sig[t-2]);
+       signal(SIGINT, sigint);
+       signal(SIGQUIT, sigquit);

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


@@ -147,7 +171,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)


@@ -179,19 +203,27 @@ schdir(str)
        return(0);
 }
 
        return(0);
 }
 

+respond(msgvec)
+       int *msgvec;
+{
+       if (value("Replyall") == NOSTR)
+               return (_respond(msgvec));
+       else
+               return (_Respond(msgvec));
+}
+

 /*
  * Reply to a list of messages.  Extract each name from the
  * message header and send them off to mail1()
  */
 /*
  * Reply to a list of messages.  Extract each name from the
  * message header and send them off to mail1()
  */

-
-respond(msgvec)
+_respond(msgvec)

        int *msgvec;
 {
        struct message *mp;
        int *msgvec;
 {
        struct message *mp;

-       char *cp, buf[2 * LINESIZE], *rcv, *replyto, **ap;
+       char *cp, *rcv, *replyto;
+       char **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");


@@ -199,62 +231,46 @@ respond(msgvec)
        }
        mp = &message[msgvec[0] - 1];
        dot = mp;
        }
        mp = &message[msgvec[0] - 1];
        dot = mp;

-       rcv = nameof(mp, 1);
-       replyto = skin(hfield("reply-to", mp));
-       strcpy(buf, "");
-       if (replyto != NOSTR)
-               strcpy(buf, replyto);
-       else {
-               cp = hfield("to", mp);
-               if (cp != NOSTR)
-                       strcpy(buf, cp);
-       }
-       np = elide(extract(buf, GTO));
-       /* rcv = rename(rcv); */
-       mapf(np, rcv);
+       if ((rcv = skin(hfield("from", mp))) == NOSTR)
+               rcv = skin(nameof(mp, 1));
+       if ((replyto = skin(hfield("reply-to", mp))) != NOSTR)
+               np = extract(replyto, GTO);
+       else if ((cp = skin(hfield("to", mp))) != NOSTR)
+               np = extract(cp, GTO);
+       else
+               np = NIL;
+       np = elide(np);

        /*
         * Delete my name from the reply list,
         * and with it, all my alternate names.
         */
        /*
         * Delete my name from the reply list,
         * and with it, all my alternate names.
         */

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

                for (ap = altnames; *ap; ap++)
                for (ap = altnames; *ap; ap++)

-                       np = delname(np, *ap);
-       head.h_seq = 1;
-       cp = detract(np, 0);
-       if (cp != NOSTR && replyto == NOSTR) {
-               strcpy(buf, cp);
-               strcat(buf, " ");
-               strcat(buf, rcv);
-       }
-       else {
-               if (cp == NOSTR && replyto != NOSTR)
+                       np = delname(np, *ap, icequal);
+       if (np != NIL && replyto == NOSTR)
+               np = cat(np, extract(rcv, GTO));
+       else if (np == NIL) {
+               if (replyto != NOSTR)

                        printf("Empty reply-to field -- replying to author\n");
                        printf("Empty reply-to field -- replying to author\n");

-               if (cp == NOSTR)
-                       strcpy(buf, rcv);
-               else
-                       strcpy(buf, cp);
+               np = extract(rcv, GTO);

        }
        }

-       head.h_to = buf;
-       head.h_subject = hfield("subject", mp);
-       if (head.h_subject == NOSTR)
+       head.h_to = np;
+       if ((head.h_subject = hfield("subject", mp)) == NOSTR)

                head.h_subject = hfield("subj", mp);
        head.h_subject = reedit(head.h_subject);
                head.h_subject = hfield("subj", mp);
        head.h_subject = reedit(head.h_subject);

-       head.h_cc = NOSTR;
-       if (replyto == NOSTR) {
-               cp = hfield("cc", mp);
-               if (cp != NOSTR) {
-                       np = elide(extract(cp, GCC));
-                       mapf(np, rcv);
-                       np = delname(np, myname);
-                       if (altnames != 0)
-                               for (ap = altnames; *ap; ap++)
-                                       np = delname(np, *ap);
-                       head.h_cc = detract(np, 0);
-               }
-       }
-       head.h_bcc = NOSTR;
-       mail1(&head);
+       if (replyto == NOSTR && (cp = skin(hfield("cc", mp))) != NOSTR) {
+               np = elide(extract(cp, GCC));
+               np = delname(np, myname, icequal);
+               if (altnames != 0)
+                       for (ap = altnames; *ap; ap++)
+                               np = delname(np, *ap, icequal);
+               head.h_cc = np;
+       } else
+               head.h_cc = NIL;
+       head.h_bcc = NIL;
+       head.h_smopts = NIL;
+       mail1(&head, 1);

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


@@ -262,23 +278,22 @@ respond(msgvec)
  * Modify the subject we are replying to to begin with Re: if
  * it does not already.
  */
  * Modify the subject we are replying to to begin with Re: if
  * it does not already.
  */

-

 char *
 reedit(subj)
 char *
 reedit(subj)

-       char *subj;
+       register char *subj;

 {
 {

-       char sbuf[10];
-       register char *newsubj;
+       char *newsubj;

 
        if (subj == NOSTR)
 
        if (subj == NOSTR)

-               return(NOSTR);
-       strncpy(sbuf, subj, 3);
-       sbuf[3] = 0;
-       if (icequal(sbuf, "re:"))
-               return(subj);
-       newsubj = salloc(strlen(subj) + 6);
-       sprintf(newsubj, "Re:  %s", subj);
-       return(newsubj);
+               return NOSTR;
+       if ((subj[0] == 'r' || subj[0] == 'R') &&
+           (subj[1] == 'e' || subj[1] == 'E') &&
+           subj[2] == ':')
+               return subj;
+       newsubj = salloc(strlen(subj) + 5);
+       strcpy(newsubj, "Re: ");
+       strcpy(newsubj + 4, subj);
+       return newsubj;

 }
 
 /*
 }
 
 /*


@@ -306,6 +321,22 @@ preserve(msgvec)
        return(0);
 }
 
        return(0);
 }
 

+/*
+ * Mark all given messages as unread.
+ */
+unread(msgvec)
+       int     msgvec[];
+{
+       register int *ip;
+
+       for (ip = msgvec; *ip != NULL; ip++) {
+               dot = &message[*ip-1];
+               dot->m_flag &= ~(MREAD|MTOUCH);
+               dot->m_flag |= MSTATUS;
+       }
+       return(0);
+}
+

 /*
  * Print the size of each message.
  */
 /*
  * Print the size of each message.
  */


@@ -319,7 +350,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: %d/%ld\n", mesg, mp->m_lines, mp->m_size);

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


@@ -333,9 +364,8 @@ rexit(e)
 {
        if (sourcing)
                return(1);
 {
        if (sourcing)
                return(1);

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

        exit(e);
        exit(e);

+       /*NOTREACHED*/

 }
 
 /*
 }
 
 /*


@@ -394,7 +424,6 @@ unset(arglist)
        char **arglist;
 {
        register struct var *vp, *vp2;
        char **arglist;
 {
        register struct var *vp, *vp2;

-       register char *cp;

        int errs, h;
        char **ap;
 
        int errs, h;
        char **ap;
 


@@ -412,7 +441,7 @@ unset(arglist)
                        variables[h] = variables[h]->v_link;
                        vfree(vp2->v_name);
                        vfree(vp2->v_value);
                        variables[h] = variables[h]->v_link;
                        vfree(vp2->v_name);
                        vfree(vp2->v_value);

-                       cfree(vp2);
+                       cfree((char *)vp2);

                        continue;
                }
                for (vp = variables[h]; vp->v_link != vp2; vp = vp->v_link)
                        continue;
                }
                for (vp = variables[h]; vp->v_link != vp2; vp = vp->v_link)


@@ -420,7 +449,7 @@ unset(arglist)
                vp->v_link = vp2->v_link;
                vfree(vp2->v_name);
                vfree(vp2->v_value);
                vp->v_link = vp2->v_link;
                vfree(vp2->v_name);
                vfree(vp2->v_value);

-               cfree(vp2);
+               cfree((char *) vp2);

        }
        return(errs);
 }
        }
        return(errs);
 }


@@ -496,7 +525,7 @@ sort(list)
                ;
        if (ap-list < 2)
                return;
                ;
        if (ap-list < 2)
                return;

-       qsort(list, ap-list, sizeof *list, diction);
+       qsort((char *)list, ap-list, sizeof *list, diction);

 }
 
 /*
 }
 
 /*


@@ -514,9 +543,10 @@ diction(a, b)
  * The do nothing command for comments.
  */
 
  * The do nothing command for comments.
  */
 

+/*ARGSUSED*/

 null(e)
 {
 null(e)
 {

-       return(0);
+       return 0;

 }
 
 /*
 }
 
 /*


@@ -526,104 +556,28 @@ null(e)
  */
 
 file(argv)
  */
 
 file(argv)

-       char **argv;
+       register char **argv;

 {
        register char *cp;
 {
        register char *cp;

-       char fname[BUFSIZ];

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

-               return(0);
+               return 0;

        }
        }

-
-       /*
-        * Acker's!  Must switch to the new file.
-        * We use a funny interpretation --
-        *      # -- gets the previous file
-        *      % -- gets the invoker's post office box
-        *      %user -- gets someone else's post office box
-        *      & -- gets invoker's mbox file
-        *      string -- reads the given file
-        */
-
-       cp = getfilename(argv[0]);
-       if (cp == NOSTR)
-               return(-1);
-       if (setfile(cp, 1))
-               return(-1);
-       newfileinfo();
-}
-
-/*
- * Evaluate the string given as a new mailbox name.
- * Ultimately, we want this to support a number of meta characters.
- * Possibly:
- *     % -- for my system mail box
- *     %user -- for user's system mail box
- *     # -- for previous file
- *     & -- get's invoker's mbox file
- *     file name -- for any other file
- */
-
-char   prevfile[PATHSIZE];
-
-char *
-getfilename(name)
-       char *name;
-{
-       register char *cp;
-       char savename[BUFSIZ];
-       char oldmailname[BUFSIZ];
-
-       switch (*name) {
-       case '%':
-               strcpy(prevfile, mailname);
-               if (name[1] != 0) {
-                       strcpy(savename, myname);
-                       strcpy(oldmailname, mailname);
-                       strncpy(myname, name+1, PATHSIZE-1);
-                       myname[PATHSIZE-1] = 0;
-                       findmail();
-                       cp = savestr(mailname);
-                       strcpy(myname, savename);
-                       strcpy(mailname, oldmailname);
-                       return(cp);
-               }
-               strcpy(oldmailname, mailname);
-               findmail();
-               cp = savestr(mailname);
-               strcpy(mailname, oldmailname);
-               return(cp);
-
-       case '#':
-               if (name[1] != 0)
-                       goto regular;
-               if (prevfile[0] == 0) {
-                       printf("No previous file\n");
-                       return(NOSTR);
-               }
-               cp = savestr(prevfile);
-               strcpy(prevfile, mailname);
-               return(cp);
-
-       case '&':
-               strcpy(prevfile, mailname);
-               if (name[1] == 0)
-                       return(mbox);
-               /* Fall into . . . */
-
-       default:
-regular:
-               strcpy(prevfile, mailname);
-               cp = expand(name);
-               return(cp);
+       if ((cp = expand(*argv)) == NOSTR)
+               return -1;
+       strcpy(prevfile, mailname);
+       if (setfile(cp, **argv != '%')) {
+               perror(cp);
+               return -1;

        }
        }

+       announce();
+       return 0;

 }
 
 /*
  * Expand file names like echo
  */
 }
 
 /*
  * Expand file names like echo
  */

-

 echo(argv)
        char **argv;
 {
 echo(argv)
        char **argv;
 {


@@ -632,10 +586,23 @@ echo(argv)
 
        for (ap = argv; *ap != NOSTR; ap++) {
                cp = *ap;
 
        for (ap = argv; *ap != NOSTR; ap++) {
                cp = *ap;

-               if ((cp = expand(cp)) != NOSTR)
-                       printf("%s ", cp);
+               if ((cp = expand(cp)) != NOSTR) {
+                       if (ap != argv)
+                               putchar(' ');
+                       printf("%s", cp);
+               }

        }
        }

-       return(0);
+       putchar('\n');
+       return 0;
+}
+
+Respond(msgvec)
+       int *msgvec;
+{
+       if (value("Replyall") == NOSTR)
+               return (_Respond(msgvec));
+       else
+               return (_respond(msgvec));

 }
 
 /*
 }
 
 /*


@@ -643,42 +610,33 @@ echo(argv)
  * and not messing around with the To: and Cc: lists as in normal
  * reply.
  */
  * and not messing around with the To: and Cc: lists as in normal
  * reply.
  */

-
-Respond(msgvec)
+_Respond(msgvec)

        int msgvec[];
 {
        struct header head;
        struct message *mp;
        int msgvec[];
 {
        struct header head;
        struct message *mp;

-       register int s, *ap;
-       register char *cp, *subject;
+       register int *ap;
+       register char *cp;

 
 

-       for (s = 0, ap = msgvec; *ap != 0; ap++) {
-               mp = &message[*ap - 1];
-               dot = mp;
-               s += strlen(nameof(mp, 2)) + 1;
-       }
-       if (s == 0)
-               return(0);
-       cp = salloc(s + 2);
-       head.h_to = cp;
+       head.h_to = NIL;

        for (ap = msgvec; *ap != 0; ap++) {
                mp = &message[*ap - 1];
        for (ap = msgvec; *ap != 0; ap++) {
                mp = &message[*ap - 1];

-               cp = copy(nameof(mp, 2), cp);
-               *cp++ = ' ';
+               dot = mp;
+               if ((cp = skin(hfield("from", mp))) == NOSTR)
+                       cp = skin(nameof(mp, 2));
+               head.h_to = cat(head.h_to, extract(cp, GTO));

        }
        }

-       *--cp = 0;
+       if (head.h_to == NIL)
+               return 0;

        mp = &message[msgvec[0] - 1];
        mp = &message[msgvec[0] - 1];

-       subject = hfield("subject", mp);
-       head.h_seq = 0;
-       if (subject == NOSTR)
-               subject = hfield("subj", mp);
-       head.h_subject = reedit(subject);
-       if (subject != NOSTR)
-               head.h_seq++;
-       head.h_cc = NOSTR;
-       head.h_bcc = NOSTR;
-       mail1(&head);
-       return(0);
+       if ((head.h_subject = hfield("subject", mp)) == NOSTR)
+               head.h_subject = hfield("subj", mp);
+       head.h_subject = reedit(head.h_subject);
+       head.h_cc = NIL;
+       head.h_bcc = NIL;
+       head.h_smopts = NIL;
+       mail1(&head, 1);
+       return 0;

 }
 
 /*
 }
 
 /*


@@ -777,9 +735,9 @@ alternates(namelist)
        }
        if (altnames != 0)
                cfree((char *) altnames);
        }
        if (altnames != 0)
                cfree((char *) altnames);

-       altnames = (char **) calloc(c, sizeof (char *));
+       altnames = (char **) calloc((unsigned) c, sizeof (char *));

        for (ap = namelist, ap2 = altnames; *ap; ap++, ap2++) {
        for (ap = namelist, ap2 = altnames; *ap; ap++, ap2++) {

-               cp = (char *) calloc(strlen(*ap) + 1, sizeof (char));
+               cp = (char *) calloc((unsigned) strlen(*ap) + 1, sizeof (char));

                strcpy(cp, *ap);
                *ap2 = cp;
        }
                strcpy(cp, *ap);
                *ap2 = cp;
        }