Bell 32V release

[unix-history] / usr / src / cmd / mail.c

diff --git a/usr/src/cmd/mail.c b/usr/src/cmd/mail.c
index b43f498..41bdafa 100644 (file)
--- a/usr/src/cmd/mail.c
+++ b/usr/src/cmd/mail.c
@@ -5,7 +5,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <setjmp.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <setjmp.h>

-#include <whoami.h>

 
 /*copylet flags */
        /*remote mail, add rmtmsg */
 
 /*copylet flags */
        /*remote mail, add rmtmsg */


@@ -31,7 +30,8 @@ char  lettmp[] = "/tmp/maXXXXX";
 char   maildir[] = "/usr/spool/mail/";
 char   mailfile[] = "/usr/spool/mail/xxxxxxxxxxxxxxxxxxxxxxx";
 char   dead[] = "dead.letter";
 char   maildir[] = "/usr/spool/mail/";
 char   mailfile[] = "/usr/spool/mail/xxxxxxxxxxxxxxxxxxxxxxx";
 char   dead[] = "dead.letter";

-char   *thissys = sysname;
+char   *rmtmsg = " remote from vax135\n";              /*LOCAL*/
+char   *thissys = "vax135";            /*LOCAL*/

 char   forwmsg[] = " forwarded\n";
 char   *curlock;
 int    lockerror;
 char   forwmsg[] = " forwarded\n";
 char   *curlock;
 int    lockerror;


@@ -332,7 +332,7 @@ copylet(n, f, type) FILE *f;
        while(k-- > 1 && (ch=fgetc(tmpf))!='\n')
                if(type!=ZAP) fputc(ch,f);
        if(type==REMOTE)
        while(k-- > 1 && (ch=fgetc(tmpf))!='\n')
                if(type!=ZAP) fputc(ch,f);
        if(type==REMOTE)

-               fprintf(f, " remote from %s\n", thissys);
+               fprintf(f, rmtmsg);

        else if (type==FORWARD)
                fprintf(f, forwmsg);
        else if(type==ORDINARY)
        else if (type==FORWARD)
                fprintf(f, forwmsg);
        else if(type==ORDINARY)