remove call of _fwalk

[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 ef124fd..c890540 100644 (file)
--- a/usr/src/usr.bin/mail/cmd3.c
+++ b/usr/src/usr.bin/mail/cmd3.c
@@ -2,21 +2,14 @@
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1980 Regents of the University of California.
  * 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.
+ * %sccs.include.redist.c%

  */
 
  */
 

-#ifdef notdef
-static char sccsid[] = "@(#)cmd3.c     5.11 (Berkeley) %G%";
-#endif /* notdef */
+#ifndef lint
+static char sccsid[] = "@(#)cmd3.c     5.24 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "rcv.h"
 
 #include "rcv.h"

-#include <sys/stat.h>
-#include <sys/wait.h>

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


@@ -28,78 +21,40 @@ static char sccsid[] = "@(#)cmd3.c  5.11 (Berkeley) %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
  */

-

 shell(str)
        char *str;
 {
 shell(str)
        char *str;
 {

-       int (*sigint)(), (*sigquit)();
-       union wait stat;
-       register int t;
-       char *Shell;
+       sig_t sigint = signal(SIGINT, SIG_IGN);
+       char *shell;

        char cmd[BUFSIZ];
 
        char cmd[BUFSIZ];
 

-       strcpy(cmd, str);
+       (void) strcpy(cmd, str);

        if (bangexp(cmd) < 0)
        if (bangexp(cmd) < 0)

-               return(-1);
-       if ((Shell = value("SHELL")) == NOSTR)
-               Shell = SHELL;
-       sigint = signal(SIGINT, SIG_IGN);
-       sigquit = signal(SIGQUIT, SIG_IGN);
-       t = vfork();
-       if (t == 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);
-       }
-       while (wait(&stat) != t)
-               ;
-       if (t == -1)
-               perror("fork");
-       signal(SIGINT, sigint);
-       signal(SIGQUIT, sigquit);
+               return 1;
+       if ((shell = value("SHELL")) == NOSTR)
+               shell = _PATH_CSHELL;
+       (void) run_command(shell, 0, -1, -1, "-c", cmd, NOSTR);
+       (void) signal(SIGINT, sigint);

        printf("!\n");
        printf("!\n");

-       return(0);
+       return 0;

 }
 
 /*
  * Fork an interactive shell.
  */
 }
 
 /*
  * Fork an interactive shell.
  */

-

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

-       int (*sigint)(), (*sigquit)();
-       union wait stat;
-       register int t;
-       char *Shell;
-
-       if ((Shell = value("SHELL")) == NOSTR)
-               Shell = SHELL;
-       sigint = signal(SIGINT, SIG_IGN);
-       sigquit = signal(SIGQUIT, SIG_IGN);
-       t = vfork();
-       if (t == 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);
-       }
-       while (wait(&stat) != t)
-               ;
-       if (t == -1)
-               perror("fork");
-       signal(SIGINT, sigint);
-       signal(SIGQUIT, sigquit);
+       sig_t sigint = signal(SIGINT, SIG_IGN);
+       char *shell;
+
+       if ((shell = value("SHELL")) == NOSTR)
+               shell = _PATH_CSHELL;
+       (void) run_command(shell, 0, -1, -1, NOSTR);
+       (void) signal(SIGINT, sigint);

        putchar('\n');
        putchar('\n');

-       return(0);
+       return 0;

 }
 
 /*
 }
 
 /*


@@ -165,37 +120,34 @@ help()
        register c;
        register FILE *f;
 
        register c;
        register FILE *f;
 

-       if ((f = fopen(HELPFILE, "r")) == NULL) {
-               perror(HELPFILE);
+       if ((f = Fopen(_PATH_HELP, "r")) == NULL) {
+               perror(_PATH_HELP);

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

-       fclose(f);
+       Fclose(f);

        return(0);
 }
 
 /*
  * Change user's working directory.
  */
        return(0);
 }
 
 /*
  * Change user's working directory.
  */

-
-schdir(str)
-       char *str;
+schdir(arglist)
+       char **arglist;

 {
 {

-       register char *cp;
+       char *cp;

 
 

-       for (cp = str; *cp == ' '; cp++)
-               ;
-       if (*cp == '\0')
+       if (*arglist == NOSTR)

                cp = homedir;
        else
                cp = homedir;
        else

-               if ((cp = expand(cp)) == NOSTR)
+               if ((cp = expand(*arglist)) == NOSTR)

                        return(1);
        if (chdir(cp) < 0) {
                perror(cp);
                return(1);
        }
                        return(1);
        if (chdir(cp) < 0) {
                perror(cp);
                return(1);
        }

-       return(0);
+       return 0;

 }
 
 respond(msgvec)
 }
 
 respond(msgvec)


@@ -225,6 +177,7 @@ _respond(msgvec)
                return(1);
        }
        mp = &message[msgvec[0] - 1];
                return(1);
        }
        mp = &message[msgvec[0] - 1];

+       touch(mp);

        dot = mp;
        if ((rcv = skin(hfield("from", mp))) == NOSTR)
                rcv = skin(nameof(mp, 1));
        dot = mp;
        if ((rcv = skin(hfield("from", mp))) == NOSTR)
                rcv = skin(nameof(mp, 1));


@@ -239,10 +192,10 @@ _respond(msgvec)
         * 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, icequal);
+       np = delname(np, myname);

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

-                       np = delname(np, *ap, icequal);
+                       np = delname(np, *ap);

        if (np != NIL && replyto == NOSTR)
                np = cat(np, extract(rcv, GTO));
        else if (np == NIL) {
        if (np != NIL && replyto == NOSTR)
                np = cat(np, extract(rcv, GTO));
        else if (np == NIL) {


@@ -256,10 +209,10 @@ _respond(msgvec)
        head.h_subject = reedit(head.h_subject);
        if (replyto == NOSTR && (cp = skin(hfield("cc", mp))) != NOSTR) {
                np = elide(extract(cp, GCC));
        head.h_subject = reedit(head.h_subject);
        if (replyto == NOSTR && (cp = skin(hfield("cc", mp))) != NOSTR) {
                np = elide(extract(cp, GCC));

-               np = delname(np, myname, icequal);
+               np = delname(np, myname);

                if (altnames != 0)
                        for (ap = altnames; *ap; ap++)
                if (altnames != 0)
                        for (ap = altnames; *ap; ap++)

-                               np = delname(np, *ap, icequal);
+                               np = delname(np, *ap);

                head.h_cc = np;
        } else
                head.h_cc = NIL;
                head.h_cc = np;
        } else
                head.h_cc = NIL;


@@ -287,7 +240,7 @@ reedit(subj)
                return subj;
        newsubj = salloc(strlen(subj) + 5);
        strcpy(newsubj, "Re: ");
                return subj;
        newsubj = salloc(strlen(subj) + 5);
        strcpy(newsubj, "Re: ");

-       strcpy(subj, newsubj + 4);
+       strcpy(newsubj + 4, subj);

        return newsubj;
 }
 
        return newsubj;
 }
 


@@ -376,7 +329,7 @@ set(arglist)
        char varbuf[BUFSIZ], **ap, **p;
        int errs, h, s;
 
        char varbuf[BUFSIZ], **ap, **p;
        int errs, h, s;
 

-       if (argcount(arglist) == 0) {
+       if (*arglist == NOSTR) {

                for (h = 0, s = 1; h < HSHSIZE; h++)
                        for (vp = variables[h]; vp != NOVAR; vp = vp->v_link)
                                s++;
                for (h = 0, s = 1; h < HSHSIZE; h++)
                        for (vp = variables[h]; vp != NOVAR; vp = vp->v_link)
                                s++;


@@ -462,7 +415,7 @@ group(argv)
        int s;
        char **ap, *gname, **p;
 
        int s;
        char **ap, *gname, **p;
 

-       if (argcount(argv) == 0) {
+       if (*argv == NOSTR) {

                for (h = 0, s = 1; h < HSHSIZE; h++)
                        for (gh = groups[h]; gh != NOGRP; gh = gh->g_link)
                                s++;
                for (h = 0, s = 1; h < HSHSIZE; h++)
                        for (gh = groups[h]; gh != NOGRP; gh = gh->g_link)
                                s++;


@@ -476,7 +429,7 @@ group(argv)
                        printgroup(*p);
                return(0);
        }
                        printgroup(*p);
                return(0);
        }

-       if (argcount(argv) == 1) {
+       if (argv[1] == NOSTR) {

                printgroup(*argv);
                return(0);
        }
                printgroup(*argv);
                return(0);
        }


@@ -545,27 +498,19 @@ null(e)
 }
 
 /*
 }
 
 /*

- * Print out the current edit file, if we are editing.
- * Otherwise, print the name of the person who's mail
- * we are reading.
+ * Change to another file.  With no argument, print information about
+ * the current file.

  */
  */

-

 file(argv)
        register char **argv;
 {
 file(argv)
        register char **argv;
 {

-       register char *cp;

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

-       if ((cp = expand(*argv)) == NOSTR)
-               return -1;
-       strcpy(prevfile, mailname);
-       if (setfile(cp, **argv != '%')) {
-               perror(cp);
-               return -1;
-       }
+       if (setfile(*argv) < 0)
+               return 1;

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


@@ -616,6 +561,7 @@ _Respond(msgvec)
        head.h_to = NIL;
        for (ap = msgvec; *ap != 0; ap++) {
                mp = &message[*ap - 1];
        head.h_to = NIL;
        for (ap = msgvec; *ap != 0; ap++) {
                mp = &message[*ap - 1];

+               touch(mp);

                dot = mp;
                if ((cp = skin(hfield("from", mp))) == NOSTR)
                        cp = skin(nameof(mp, 2));
                dot = mp;
                if ((cp = skin(hfield("from", mp))) == NOSTR)
                        cp = skin(nameof(mp, 2));