BSD 4_3_Net_2 release

[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 5db1a9c..0a8cc7d 100644 (file)
--- a/usr/src/usr.bin/mail/main.c
+++ b/usr/src/usr.bin/mail/main.c
@@ -2,17 +2,33 @@
  * 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 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -22,7 +38,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.20 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.28 (Berkeley) 4/1/91";

 #endif /* not lint */
 
 #include "rcv.h"
 #endif /* not lint */
 
 #include "rcv.h"


@@ -44,11 +60,11 @@ main(argc, argv)
        char *subject;
        char *ef;
        char nosrc = 0;
        char *subject;
        char *ef;
        char nosrc = 0;

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

        extern int getopt(), optind, opterr;
        extern char *optarg;
        extern int getopt(), optind, opterr;
        extern char *optarg;

+       void sigchild();

 
        /*
         * Set up a reasonable environment.
 
        /*
         * Set up a reasonable environment.


@@ -191,10 +207,10 @@ Usage: mail [-iInv] [-s subject] [-c cc-addr] [-b bcc-addr] to-addr ...\n\
        rcvmode = !to;
        spreserve();
        if (!nosrc)
        rcvmode = !to;
        spreserve();
        if (!nosrc)

-               load(MASTER);
+               load(_PATH_MASTER_RC);

        /*
         * Expand returns a savestr, but load only uses the file name
        /*
         * Expand returns a savestr, but load only uses the file name

-        * for fopen, so it's save to do this.
+        * for fopen, so it's safe to do this.

         */
        load(expand("~/.mailrc"));
        if (!rcvmode) {
         */
        load(expand("~/.mailrc"));
        if (!rcvmode) {


@@ -209,16 +225,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)
-               isedit++;
-       else
+       if (ef == NOSTR)

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

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

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

-       if (!edit && msgCount == 0) {
-               fprintf(stderr, "No mail for %s\n", myname);
-               exit(1);
-       }

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


@@ -242,6 +252,7 @@ Usage: mail [-iInv] [-s subject] [-c cc-addr] [-b bcc-addr] to-addr ...\n\
 /*
  * Interrupt printing of the headers.
  */
 /*
  * Interrupt printing of the headers.
  */

+void

 hdrstop()
 {
 
 hdrstop()
 {
 


@@ -261,13 +272,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;