Included Eric's branch changes to remove vax and vmunix

dependencies.

SCCS-vsn: usr.bin/mail/cmd1.c 2.6
SCCS-vsn: usr.bin/mail/collect.c 2.8
SCCS-vsn: usr.bin/mail/fio.c 2.8
SCCS-vsn: usr.bin/mail/lex.c 2.8
SCCS-vsn: usr.bin/mail/popen.c 1.3
SCCS-vsn: usr.bin/mail/tty.c 2.3

diff --git a/usr/src/usr.bin/mail/cmd1.c b/usr/src/usr.bin/mail/cmd1.c
index 733e892..fa3a55e 100644 (file)
--- a/usr/src/usr.bin/mail/cmd1.c
+++ b/usr/src/usr.bin/mail/cmd1.c
@@ -8,7 +8,7 @@
  * User commands.
  */
 
  * User commands.
  */
 

-static char *SccsId = "@(#)cmd1.c      2.2.1.1 %G%";
+static char *SccsId = "@(#)cmd1.c      2.6 %G%";

 
 /*
  * Print the current active headings.
 
 /*
  * Print the current active headings.

diff --git a/usr/src/usr.bin/mail/collect.c b/usr/src/usr.bin/mail/collect.c
index 9126912..a89360f 100644 (file)
--- a/usr/src/usr.bin/mail/collect.c
+++ b/usr/src/usr.bin/mail/collect.c
@@ -7,7 +7,7 @@
  * ~ escapes.
  */
 
  * ~ escapes.
  */
 

-static char *SccsId = "@(#)collect.c   2.7.1.2 %G%";
+static char *SccsId = "@(#)collect.c   2.8 %G%";

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

diff --git a/usr/src/usr.bin/mail/fio.c b/usr/src/usr.bin/mail/fio.c
index d95b181..a8d2a2e 100644 (file)
--- a/usr/src/usr.bin/mail/fio.c
+++ b/usr/src/usr.bin/mail/fio.c
@@ -10,7 +10,7 @@
  * File I/O.
  */
 
  * File I/O.
  */
 

-static char *SccsId = "@(#)fio.c       2.3.1.1 %G%";
+static char *SccsId = "@(#)fio.c       2.8 %G%";

 
 /*
  * Set up the input pointers while copying the mail file into
 
 /*
  * Set up the input pointers while copying the mail file into

diff --git a/usr/src/usr.bin/mail/lex.c b/usr/src/usr.bin/mail/lex.c
index 9501294..8938a73 100644 (file)
--- a/usr/src/usr.bin/mail/lex.c
+++ b/usr/src/usr.bin/mail/lex.c
@@ -8,7 +8,7 @@
  * Lexical processing of commands.
  */
 
  * Lexical processing of commands.
  */
 

-static char *SccsId = "@(#)lex.c       2.5.1.1 %G%";
+static char *SccsId = "@(#)lex.c       2.8 %G%";

 
 char   *prompt = "& ";
 
 
 char   *prompt = "& ";
 


@@ -126,6 +126,7 @@ commands()
                eofloop = 0;
 top:
                if (shudprompt) {
                eofloop = 0;
 top:
                if (shudprompt) {

+# ifdef VMUNIX

                        sigset(SIGCONT, contin);
 # endif VMUNIX
                        printf(prompt);
                        sigset(SIGCONT, contin);
 # endif VMUNIX
                        printf(prompt);

diff --git a/usr/src/usr.bin/mail/popen.c b/usr/src/usr.bin/mail/popen.c
index d8fdf01..8ac8a0c 100644 (file)
--- a/usr/src/usr.bin/mail/popen.c
+++ b/usr/src/usr.bin/mail/popen.c
@@ -5,7 +5,7 @@
 #define        RDR     0
 #define        WTR     1
 static int     popen_pid[20];
 #define        RDR     0
 #define        WTR     1
 static int     popen_pid[20];

-static char    *sccsid = "@(#)popen.c  1.2.1.2 %G%";
+static char    *sccsid = "@(#)popen.c  1.3 %G%";

 
 # ifndef VMUNIX
 # define vfork fork
 
 # ifndef VMUNIX
 # define vfork fork

diff --git a/usr/src/usr.bin/mail/tty.c b/usr/src/usr.bin/mail/tty.c
index c0816e5..c5c8275 100644 (file)
--- a/usr/src/usr.bin/mail/tty.c
+++ b/usr/src/usr.bin/mail/tty.c
@@ -8,7 +8,7 @@
 
 #include "rcv.h"
 
 
 #include "rcv.h"
 

-static char *SccsId = "@(#)tty.c       2.1.1.1 %G%";
+static char *SccsId = "@(#)tty.c       2.3 %G%";

 
 static int     c_erase;                /* Current erase char */
 static int     c_kill;                 /* Current kill char */
 
 static int     c_erase;                /* Current erase char */
 static int     c_kill;                 /* Current kill char */