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 83f19fc..a0bdc79 100644 (file)
--- a/usr/src/usr.bin/mail/def.h
+++ b/usr/src/usr.bin/mail/def.h
@@ -2,14 +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 this notice is preserved and that due credit is given
- * to the University of California at 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'' without express or implied warranty.
+ * 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.5 (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> */


@@ -17,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


@@ -26,13 +47,12 @@
  * 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 */

-#define        PATHSIZE        1024            /* Size of pathnames throughout */
-#define        NAMESIZE        32              /* Max size of user name */
+#define        PATHSIZE        MAXPATHLEN      /* Size of pathnames throughout */

 #define        HSHSIZE         59              /* Hash size for aliases and vars */
 #define        HSHSIZE         59              /* Hash size for aliases and vars */

-#define        HDRFIELDS       3               /* Number of header fields */

 #define        LINESIZE        BUFSIZ          /* max readable line width */
 #define        STRINGSIZE      ((unsigned) 128)/* Dynamic allocation units */
 #define        MAXARGC         1024            /* Maximum list of raw strings */
 #define        LINESIZE        BUFSIZ          /* max readable line width */
 #define        STRINGSIZE      ((unsigned) 128)/* Dynamic allocation units */
 #define        MAXARGC         1024            /* Maximum list of raw strings */


@@ -144,11 +164,11 @@ struct headline {
  */
 
 struct header {
  */
 
 struct header {

-       char    *h_to;                  /* Dynamic "To:" string */
-       char    *h_subject;             /* Subject string */
-       char    *h_cc;                  /* Carbon copies string */
-       char    *h_bcc;                 /* Blind carbon copies */
-       int     h_seq;                  /* Sequence for optimization */
+       struct name *h_to;              /* Dynamic "To:" string */
+       char *h_subject;                /* Subject string */
+       struct name *h_cc;              /* Carbon copies string */
+       struct name *h_bcc;             /* Blind carbon copies */
+       struct name *h_smopts;          /* Sendmail options */

 };
 
 /*
 };
 
 /*


@@ -196,9 +216,12 @@ struct grouphead {
 /*
  * Structure of the hash table of ignored header fields
  */
 /*
  * Structure of the hash table of ignored header fields
  */

-struct ignore {
-       struct ignore   *i_link;        /* Next ignored field in bucket */
-       char            *i_field;       /* This ignored field */
+struct ignoretab {
+       int i_count;                    /* Number of entries */
+       struct ignore {
+               struct ignore *i_link;  /* Next ignored field in bucket */
+               char *i_field;          /* This ignored field */
+       } *i_head[HSHSIZE];

 };
 
 /*
 };
 
 /*


@@ -217,6 +240,7 @@ struct ignore {
 #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 */


@@ -248,56 +272,52 @@ struct ignore {
  * 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   *Fdopen();

+FILE   *Popen();

 FILE   *collect();
 FILE   *infix();
 FILE   *collect();
 FILE   *infix();

-FILE   *mesedit();
-FILE   *mespipe();
-FILE   *popen();
+FILE   *run_editor();

 FILE   *setinput();
 char   **unpack();
 FILE   *setinput();
 char   **unpack();

-char   *addto();
-char   *arpafix();

 char   *calloc();
 char   *copy();
 char   *copyin();
 char   *detract();
 char   *expand();
 char   *calloc();
 char   *copy();
 char   *copyin();
 char   *detract();
 char   *expand();

+char   *getdeadletter();

 char   *gets();
 char   *hfield();
 char   *name1();
 char   *nameof();
 char   *nextword();
 char   *getenv();
 char   *gets();
 char   *hfield();
 char   *name1();
 char   *nameof();
 char   *nextword();
 char   *getenv();

-char   *getfilename();
+char   *getname();
+char   *fgets();

 char   *ishfield();
 char   *malloc();
 char   *ishfield();
 char   *malloc();

-char   *netmap();
-char   *netname();
+char   *mktemp();

 char   *readtty();
 char   *reedit();
 char   *readtty();
 char   *reedit();

-char   *revarpa();
-char   *rpair();

 char   *salloc();
 char   *savestr();
 char   *skin();
 char   *snarf();
 char   *salloc();
 char   *savestr();
 char   *skin();
 char   *snarf();

+char   *username();

 char   *value();
 char   *vcopy();
 char   *yankword();
 off_t  fsize();
 char   *value();
 char   *vcopy();
 char   *yankword();
 off_t  fsize();

+uid_t  getuid();

 struct cmd     *lex();
 struct grouphead       *findgroup();
 struct cmd     *lex();
 struct grouphead       *findgroup();

+struct name    *nalloc();

 struct name    *cat();
 struct name    *delname();
 struct name    *elide();
 struct name    *extract();
 struct name    *gexpand();
 struct name    *cat();
 struct name    *delname();
 struct name    *elide();
 struct name    *extract();
 struct name    *gexpand();

-struct name    *map();

 struct name    *outof();
 struct name    *put();
 struct name    *usermap();
 struct name    *outof();
 struct name    *put();
 struct name    *usermap();

-struct name    *verify();

 struct var     *lookup();
 struct var     *lookup();

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