Flush out the last dregs in the terminal before quitting when

[unix-history] / usr / src / usr.bin / mail / pathnames.h

diff --git a/usr/src/usr.bin/mail/pathnames.h b/usr/src/usr.bin/mail/pathnames.h
index cef0942..63e5dbf 100644 (file)
--- a/usr/src/usr.bin/mail/pathnames.h
+++ b/usr/src/usr.bin/mail/pathnames.h
@@ -1,9 +1,20 @@
 /*
  * Copyright (c) 1980 Regents of the University of California.
 /*
  * Copyright (c) 1980 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.

  *
  *

- *     @(#)pathnames.h 5.1 (Berkeley) %G%
+ * 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.
+ *
+ *     @(#)pathnames.h 5.6 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -12,14 +23,6 @@
  * Vax/Unix version 7.
  */
 
  * Vax/Unix version 7.
  */
 

-#define        GETHOST                         /* System has gethostname syscall */
-#ifdef GETHOST
-#define        LOCAL           EMPTYID         /* Dynamically determined local host */
-#else
-#define        LOCAL           'j'             /* Local host id */
-#endif GETHOST
-
-#define        MAIL            "/bin/mail"     /* Name of mail sender */

 #define SENDMAIL       "/usr/lib/sendmail"
                                        /* Name of classy mail deliverer */
 #define        EDITOR          "/usr/ucb/ex"   /* Name of text editor */
 #define SENDMAIL       "/usr/lib/sendmail"
                                        /* Name of classy mail deliverer */
 #define        EDITOR          "/usr/ucb/ex"   /* Name of text editor */


@@ -28,16 +31,9 @@
 #define        MORE            "/usr/ucb/more" /* Standard output pager */
 #define        HELPFILE        "/usr/lib/Mail.help"
                                        /* Name of casual help file */
 #define        MORE            "/usr/ucb/more" /* Standard output pager */
 #define        HELPFILE        "/usr/lib/Mail.help"
                                        /* Name of casual help file */

-#define        THELPFILE       "/usr/lib/Mail.help.~"
+#define        THELPFILE       "/usr/lib/Mail.tildehelp"
+                                       /* Name of casual tilde help */

 #define        POSTAGE         "/usr/adm/maillog"
                                        /* Where to audit mail sending */
 #define        POSTAGE         "/usr/adm/maillog"
                                        /* Where to audit mail sending */

-                                       /* Name of casual tilde help */
-#define        UIDMASK         0177777         /* Significant uid bits */

 #define        MASTER          "/usr/lib/Mail.rc"
 #define        APPEND                          /* New mail goes to end of mailbox */
 #define        MASTER          "/usr/lib/Mail.rc"
 #define        APPEND                          /* New mail goes to end of mailbox */

-#define CANLOCK                                /* Locking protocol actually works */
-#define        UTIME                           /* System implements utime(2) */
-
-#ifndef VMUNIX
-#include "sigretro.h"                  /* Retrofit signal defs */
-#endif VMUNIX