Added ``#include <whoami.h>'' if pdp11 is defined.

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

diff --git a/usr/src/usr.bin/mail/glob.h b/usr/src/usr.bin/mail/glob.h
index 14654e9..df5db51 100644 (file)
--- a/usr/src/usr.bin/mail/glob.h
+++ b/usr/src/usr.bin/mail/glob.h
@@ -4,7 +4,7 @@
  */
 
 /*
  */
 
 /*

- * Sccs Id = "@(#)glob.h       1.3 %G%";
+ * Sccs Id = "@(#)glob.h       2.8 %G%";

  */
 
 int    msgCount;                       /* Count of messages read in */
  */
 
 int    msgCount;                       /* Count of messages read in */


@@ -13,14 +13,18 @@ int rcvmode;                        /* True if receiving mail */
 int    sawcom;                         /* Set after first command */
 int    hflag;                          /* Sequence number for network -h */
 char   *rflag;                         /* -r address for network */
 int    sawcom;                         /* Set after first command */
 int    hflag;                          /* Sequence number for network -h */
 char   *rflag;                         /* -r address for network */

+char   *Tflag;                         /* -T temp file for netnews */

 char   nosrc;                          /* Don't source /usr/lib/Mail.rc */
 char   nosrc;                          /* Don't source /usr/lib/Mail.rc */

+char   noheader;                       /* Suprress initial header listing */

 int    selfsent;                       /* User sent self something */
 int    senderr;                        /* An error while checking */
 int    edit;                           /* Indicates editing a file */
 int    readonly;                       /* Will be unable to rewrite file */
 int    noreset;                        /* String resets suspended */
 int    sourcing;                       /* Currently reading variant file */
 int    selfsent;                       /* User sent self something */
 int    senderr;                        /* An error while checking */
 int    edit;                           /* Indicates editing a file */
 int    readonly;                       /* Will be unable to rewrite file */
 int    noreset;                        /* String resets suspended */
 int    sourcing;                       /* Currently reading variant file */

+int    loading;                        /* Loading user definitions */

 int    shudann;                        /* Print headers when possible */
 int    shudann;                        /* Print headers when possible */

+int    cond;                           /* Current state of conditional exc. */

 FILE   *itf;                           /* Input temp file buffer */
 FILE   *otf;                           /* Output temp file buffer */
 FILE   *pipef;                         /* Pipe file we have opened */
 FILE   *itf;                           /* Input temp file buffer */
 FILE   *otf;                           /* Output temp file buffer */
 FILE   *pipef;                         /* Pipe file we have opened */


@@ -30,14 +34,14 @@ char        *editfile;                      /* Name of file being edited */
 char   *sflag;                         /* Subject given from non tty */
 int    outtty;                         /* True if standard output a tty */
 int    intty;                          /* True if standard input a tty */
 char   *sflag;                         /* Subject given from non tty */
 int    outtty;                         /* True if standard output a tty */
 int    intty;                          /* True if standard input a tty */

+int    baud;                           /* Output baud rate */

 char   mbox[PATHSIZE];                 /* Name of mailbox file */
 char   mbox[PATHSIZE];                 /* Name of mailbox file */

-char   *mailname;                      /* Name of system mailbox */
-char   mailspace[PATHSIZE];            /* Space norm alloc'd for name */
+char   mailname[PATHSIZE];             /* Name of system mailbox */

 int    uid;                            /* The invoker's user id */
 char   mailrc[PATHSIZE];               /* Name of startup file */
 char   deadletter[PATHSIZE];           /* Name of #/dead.letter */
 char   homedir[PATHSIZE];              /* Path name of home directory */
 int    uid;                            /* The invoker's user id */
 char   mailrc[PATHSIZE];               /* Name of startup file */
 char   deadletter[PATHSIZE];           /* Name of #/dead.letter */
 char   homedir[PATHSIZE];              /* Path name of home directory */

-char   myname[9];                      /* My login id */
+char   myname[PATHSIZE];               /* My login id */

 off_t  mailsize;                       /* Size of system mailbox */
 int    lexnumber;                      /* Number of TNUMBER from scan() */
 char   lexstring[STRINGLEN];           /* String from TSTRING, scan() */
 off_t  mailsize;                       /* Size of system mailbox */
 int    lexnumber;                      /* Number of TNUMBER from scan() */
 char   lexstring[STRINGLEN];           /* String from TSTRING, scan() */


@@ -49,6 +53,8 @@ struct        message *dot;                   /* Pointer to current message */
 struct message *message;               /* The actual message structure */
 struct var     *variables[HSHSIZE];    /* Pointer to active var list */
 struct grouphead       *groups[HSHSIZE];/* Pointer to active groups */
 struct message *message;               /* The actual message structure */
 struct var     *variables[HSHSIZE];    /* Pointer to active var list */
 struct grouphead       *groups[HSHSIZE];/* Pointer to active groups */

+struct ignore          *ignore[HSHSIZE];/* Pointer to ignored fields */
+char   **altnames;                     /* List of alternate names for user */

 int    debug;                          /* Debug flag set */
 int    rmail;                          /* Being called as rmail */
 
 int    debug;                          /* Debug flag set */
 int    rmail;                          /* Being called as rmail */
 


@@ -64,7 +70,7 @@ jmp_buf       srbuf;
  * twice as much, and so on.
  */
 
  * twice as much, and so on.
  */
 

-#define        NSPACE  8                       /* Total number of string spaces */
+#define        NSPACE  25                      /* Total number of string spaces */

 struct strings {
        char    *s_topFree;             /* Beginning of this area */
        char    *s_nextFree;            /* Next alloctable place here */
 struct strings {
        char    *s_topFree;             /* Beginning of this area */
        char    *s_nextFree;            /* Next alloctable place here */