install correct aliases file

[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 c62ebf8..65f6252 100644 (file)
--- a/usr/src/usr.bin/mail/def.h
+++ b/usr/src/usr.bin/mail/def.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.

  *
  *

- *     @(#)def.h       5.4 (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.
+ *
+ *     @(#)def.h       5.18 (Berkeley) %G%

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


@@ -23,10 +34,8 @@
 
 #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 */


@@ -138,11 +147,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 */

 };
 
 /*
 };
 
 /*


@@ -190,9 +199,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];

 };
 
 /*
 };
 
 /*


@@ -211,6 +223,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 */


@@ -243,55 +256,50 @@ struct ignore {
  */
 
 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();