BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.bin/mail/def.h b/usr/src/usr.bin/mail/def.h
index 8b81cff..a0bdc79 100644 (file)
--- a/usr/src/usr.bin/mail/def.h
+++ b/usr/src/usr.bin/mail/def.h
@@ -2,19 +2,35 @@
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1980 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.

  *
  *

- *     @(#)def.h       5.15 (Berkeley) %G%
+ * 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.
+ *
+ *     @(#)def.h       5.22 (Berkeley) 6/25/90

  */
 
 #include <sys/param.h>         /* includes <sys/types.h> */
  */
 
 #include <sys/param.h>         /* includes <sys/types.h> */


@@ -22,8 +38,8 @@
 #include <stdio.h>
 #include <sgtty.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <sgtty.h>
 #include <ctype.h>

-#include <strings.h>
-#include "local.h"
+#include <string.h>
+#include "pathnames.h"

 
 /*
  * Mail -- a mail program
 
 /*
  * Mail -- a mail program


@@ -31,6 +47,7 @@
  * Author: Kurt Shoens (UCB) March 25, 1978
  */
 
  * Author: Kurt Shoens (UCB) March 25, 1978
  */
 

+#define        APPEND                          /* New mail goes to end of mailbox */

 
 #define        ESCAPE          '~'             /* Default escape for sending */
 #define        NMLSIZE         1024            /* max names in a message list */
 
 #define        ESCAPE          '~'             /* Default escape for sending */
 #define        NMLSIZE         1024            /* max names in a message list */


@@ -223,6 +240,7 @@ struct ignoretab {
 #define        TOPEN   8                       /* An '(' */
 #define        TCLOSE  9                       /* A ')' */
 #define TPLUS  10                      /* A '+' */
 #define        TOPEN   8                       /* An '(' */
 #define        TCLOSE  9                       /* A ')' */
 #define TPLUS  10                      /* A '+' */

+#define TERROR 11                      /* A lexical error */

 
 #define        REGDEP  2                       /* Maximum regret depth. */
 #define        STRINGLEN       1024            /* Maximum length of string token */
 
 #define        REGDEP  2                       /* Maximum regret depth. */
 #define        STRINGLEN       1024            /* Maximum length of string token */


@@ -254,6 +272,7 @@ struct ignoretab {
  * Forward declarations of routine types to keep lint and cc happy.
  */
 
  * Forward declarations of routine types to keep lint and cc happy.
  */
 

+FILE   *Fopen();

 FILE   *Fdopen();
 FILE   *Popen();
 FILE   *collect();
 FILE   *Fdopen();
 FILE   *Popen();
 FILE   *collect();


@@ -266,6 +285,7 @@ char        *copy();
 char   *copyin();
 char   *detract();
 char   *expand();
 char   *copyin();
 char   *detract();
 char   *expand();

+char   *getdeadletter();

 char   *gets();
 char   *hfield();
 char   *name1();
 char   *gets();
 char   *hfield();
 char   *name1();


@@ -301,5 +321,3 @@ struct      name    *outof();
 struct name    *put();
 struct name    *usermap();
 struct var     *lookup();
 struct name    *put();
 struct name    *usermap();
 struct var     *lookup();

-long   transmit();
-int    icequal();