document distributed with 4.2BSD

[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 77f4ec4..218e349 100644 (file)
--- a/usr/src/usr.bin/mail/main.c
+++ b/usr/src/usr.bin/mail/main.c
@@ -11,7 +11,7 @@ char *copyright =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char *sccsid = "@(#)main.c      5.2 (Berkeley) %G%";
+static char *sccsid = "@(#)main.c      5.3 (Berkeley) %G%";

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


@@ -290,7 +290,7 @@ main(argc, argv)
                        fprintf(stderr, "No mail for %s\n", myname);
                exit(1);
        }
                        fprintf(stderr, "No mail for %s\n", myname);
                exit(1);
        }

-       if (!edit && !noheader && value("noheader") == NOSTR) {
+       if (!noheader && value("noheader") == NOSTR) {

                if (setjmp(hdrjmp) == 0) {
                        if ((prevint = sigset(SIGINT, SIG_IGN)) != SIG_IGN)
                                sigset(SIGINT, hdrstop);
                if (setjmp(hdrjmp) == 0) {
                        if ((prevint = sigset(SIGINT, SIG_IGN)) != SIG_IGN)
                                sigset(SIGINT, hdrstop);


@@ -299,8 +299,6 @@ main(argc, argv)
                        sigset(SIGINT, prevint);
                }
        }
                        sigset(SIGINT, prevint);
                }
        }

-       if (edit)
-               newfileinfo();

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