remove call of _fwalk

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

diff --git a/usr/src/usr.bin/mail/main.c b/usr/src/usr.bin/mail/main.c
index 93a2031..23c1d84 100644 (file)
--- a/usr/src/usr.bin/mail/main.c
+++ b/usr/src/usr.bin/mail/main.c
@@ -2,23 +2,18 @@
  * 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
+#ifndef lint

 char copyright[] =
 "@(#) Copyright (c) 1980 Regents of the University of California.\n\
  All rights reserved.\n";
 char copyright[] =
 "@(#) Copyright (c) 1980 Regents of the University of California.\n\
  All rights reserved.\n";

-#endif /* notdef */
+#endif /* not lint */

 
 

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

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


@@ -38,16 +33,19 @@ main(argc, argv)
        struct name *to, *cc, *bcc, *smopts;
        char *subject;
        char *ef;
        struct name *to, *cc, *bcc, *smopts;
        char *subject;
        char *ef;

-       int hdrstop(), (*prevint)();
+       char nosrc = 0;
+       int hdrstop();
+       sig_t prevint;
+       int sigchild();

        extern int getopt(), optind, opterr;
        extern char *optarg;
 
        /*
         * Set up a reasonable environment.
        extern int getopt(), optind, opterr;
        extern char *optarg;
 
        /*
         * Set up a reasonable environment.

-        * Figure out whether we are being run interactively, set up
-        * all the temporary files, buffer standard output, and so forth.
+        * Figure out whether we are being run interactively,
+        * start the SIGCHLD catcher, and so forth.

         */
         */

-       mypid = getpid();
+       (void) signal(SIGCHLD, sigchild);

        if (isatty(0))
                assign("interactive", "");
        image = -1;
        if (isatty(0))
                assign("interactive", "");
        image = -1;


@@ -82,7 +80,7 @@ main(argc, argv)
                        /*
                         * Next argument is person to pretend to be.
                         */
                        /*
                         * Next argument is person to pretend to be.
                         */

-                       strcpy(myname, optarg);
+                       myname = optarg;

                        break;
                case 'i':
                        /*
                        break;
                case 'i':
                        /*


@@ -181,9 +179,14 @@ Usage: mail [-iInv] [-s subject] [-c cc-addr] [-b bcc-addr] to-addr ...\n\
        setscreensize();
        input = stdin;
        rcvmode = !to;
        setscreensize();
        input = stdin;
        rcvmode = !to;

+       spreserve();

        if (!nosrc)
        if (!nosrc)

-               load(MASTER);
-       load(mailrc);
+               load(_PATH_MASTER_RC);
+       /*
+        * Expand returns a savestr, but load only uses the file name
+        * for fopen, so it's safe to do this.
+        */
+       load(expand("~/.mailrc"));

        if (!rcvmode) {
                mail(to, cc, bcc, smopts, subject);
                /*
        if (!rcvmode) {
                mail(to, cc, bcc, smopts, subject);
                /*


@@ -196,19 +199,10 @@ Usage: mail [-iInv] [-s subject] [-c cc-addr] [-b bcc-addr] to-addr ...\n\
         * Decide whether we are editing a mailbox or reading
         * the system mailbox, and open up the right stuff.
         */
         * Decide whether we are editing a mailbox or reading
         * the system mailbox, and open up the right stuff.
         */

-       if (ef != NOSTR)
-               edit++;
-       else
+       if (ef == NOSTR)

                ef = "%";
                ef = "%";

-       if ((ef = expand(ef)) == NOSTR)
+       if (setfile(ef) < 0)

                exit(1);                /* error already reported */
                exit(1);                /* error already reported */

-       if (setfile(ef, edit) < 0) {
-               if (edit)
-                       perror(ef);
-               else
-                       fprintf(stderr, "No mail for %s\n", myname);
-               exit(1);
-       }

        if (setjmp(hdrjmp) == 0) {
                extern char *version;
 
        if (setjmp(hdrjmp) == 0) {
                extern char *version;
 


@@ -221,18 +215,11 @@ Usage: mail [-iInv] [-s subject] [-c cc-addr] [-b bcc-addr] to-addr ...\n\
                fflush(stdout);
                signal(SIGINT, prevint);
        }
                fflush(stdout);
                signal(SIGINT, prevint);
        }

-       if (!edit && msgCount == 0) {
-               printf("No mail\n");
-               fflush(stdout);
-               exit(0);
-       }

        commands();
        commands();

-       if (!edit) {
-               signal(SIGHUP, SIG_IGN);
-               signal(SIGINT, SIG_IGN);
-               signal(SIGQUIT, SIG_IGN);
-               quit();
-       }
+       signal(SIGHUP, SIG_IGN);
+       signal(SIGINT, SIG_IGN);
+       signal(SIGQUIT, SIG_IGN);
+       quit();

        exit(0);
 }
 
        exit(0);
 }
 


@@ -258,13 +245,11 @@ hdrstop()
 setscreensize()
 {
        struct sgttyb tbuf;
 setscreensize()
 {
        struct sgttyb tbuf;

-#ifdef TIOCGWINSZ

        struct winsize ws;
 
        if (ioctl(1, TIOCGWINSZ, (char *) &ws) < 0)
        struct winsize ws;
 
        if (ioctl(1, TIOCGWINSZ, (char *) &ws) < 0)

-#endif

                ws.ws_col = ws.ws_row = 0;
                ws.ws_col = ws.ws_row = 0;

-       if (gtty(1, &tbuf) < 0)
+       if (ioctl(1, TIOCGETP, &tbuf) < 0)

                tbuf.sg_ospeed = B9600;
        if (tbuf.sg_ospeed < B1200)
                screenheight = 9;
                tbuf.sg_ospeed = B9600;
        if (tbuf.sg_ospeed < B1200)
                screenheight = 9;