BSD 4_4 release

[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 63e5dbf..13a7672 100644 (file)
--- a/usr/src/usr.bin/mail/pathnames.h
+++ b/usr/src/usr.bin/mail/pathnames.h
@@ -1,39 +1,42 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ *     The 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.

  *
  *

- *     @(#)pathnames.h 5.6 (Berkeley) %G%
- */
-
-/*
- * Declarations and constants specific to an installation.
+ * 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.

  *
  *

- * Vax/Unix version 7.
+ *     @(#)pathnames.h 8.1 (Berkeley) 6/6/93

  */
 
  */
 

-#define SENDMAIL       "/usr/lib/sendmail"
-                                       /* Name of classy mail deliverer */
-#define        EDITOR          "/usr/ucb/ex"   /* Name of text editor */
-#define        VISUAL          "/usr/ucb/vi"   /* Name of display editor */
-#define        SHELL           "/bin/csh"      /* Standard shell */
-#define        MORE            "/usr/ucb/more" /* Standard output pager */
-#define        HELPFILE        "/usr/lib/Mail.help"
-                                       /* Name of casual help file */
-#define        THELPFILE       "/usr/lib/Mail.tildehelp"
-                                       /* Name of casual tilde help */
-#define        POSTAGE         "/usr/adm/maillog"
-                                       /* Where to audit mail sending */
-#define        MASTER          "/usr/lib/Mail.rc"
-#define        APPEND                          /* New mail goes to end of mailbox */
+#include <paths.h>
+
+#define        _PATH_EX        "/usr/bin/ex"
+#define        _PATH_HELP      "/usr/share/misc/mail.help"
+#define        _PATH_TILDE     "/usr/share/misc/mail.tildehelp"
+#define        _PATH_MASTER_RC "/etc/mail.rc"
+#define        _PATH_MORE      "/usr/bin/more"