use shell="" instead of shell=none for no shell,

[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 3253579..7162704 100644 (file)
--- a/usr/src/usr.bin/mail/glob.h
+++ b/usr/src/usr.bin/mail/glob.h
@@ -1,9 +1,15 @@
 /*
  * 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.

  *
  *

- *     @(#)glob.h      5.1 (Berkeley) %G%
+ * 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.
+ *
+ *     @(#)glob.h      5.9 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -15,11 +21,8 @@ int  msgCount;                       /* Count of messages read in */
 int    mypid;                          /* Current process id */
 int    rcvmode;                        /* True if receiving mail */
 int    sawcom;                         /* Set after first command */
 int    mypid;                          /* Current process id */
 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 */

 char   *Tflag;                         /* -T temp file for netnews */
 char   nosrc;                          /* Don't source /usr/lib/Mail.rc */
 char   *Tflag;                         /* -T temp file for netnews */
 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    selfsent;                       /* User sent self something */
 int    senderr;                        /* An error while checking */
 int    edit;                           /* Indicates editing a file */


@@ -27,20 +30,15 @@ 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    noreset;                        /* String resets suspended */
 int    sourcing;                       /* Currently reading variant file */
 int    loading;                        /* Loading user definitions */

-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 */
 int    image;                          /* File descriptor for image of msg */
 FILE   *input;                         /* Current command input file */
 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 */
 int    image;                          /* File descriptor for image of msg */
 FILE   *input;                         /* Current command input file */

-char   *editfile;                      /* Name of file being edited */

 char   *sflag;                         /* Subject given from non 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   mailname[PATHSIZE];             /* Name of system mailbox */
+char   mailname[PATHSIZE];             /* Name of current file */
+char   prevfile[PATHSIZE];             /* Name of previous file */

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


@@ -57,13 +55,17 @@ 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 */
-struct ignore          *retain[HSHSIZE];/* Pointer to retained fields */
-int    nretained;                      /* Number of retained fields */
+struct ignoretab       ignore[2];      /* ignored and retained fields
+                                          0 is ignore, 1 is retain */
+struct ignoretab       saveignore[2];  /* ignored and retained fields
+                                          on save to folder */

 char   **altnames;                     /* List of alternate names for user */
 char   **localnames;                   /* List of aliases for our local host */
 int    debug;                          /* Debug flag set */
 char   **altnames;                     /* List of alternate names for user */
 char   **localnames;                   /* List of aliases for our local host */
 int    debug;                          /* Debug flag set */

-int    rmail;                          /* Being called as rmail */
+int    screenwidth;                    /* Screen width, or best guess */
+int    screenheight;                   /* Screen height, or best guess,
+                                          for "header" command */
+int    realscreenheight;               /* the real screen height */

 
 #include <setjmp.h>
 
 
 #include <setjmp.h>