non-flexname portability fix (from Ian Darwin, darwin!ian)

[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 a4dc208..b256111 100644 (file)
--- a/usr/src/usr.bin/mail/glob.h
+++ b/usr/src/usr.bin/mail/glob.h
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)glob.h      5.15 (Berkeley) %G%
+ *     @(#)glob.h      5.18 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -40,8 +40,6 @@ int   image;                          /* File descriptor for image of msg */
 FILE   *input;                         /* Current command input file */
 char   mailname[PATHSIZE];             /* Name of current file */
 char   prevfile[PATHSIZE];             /* Name of previous file */
 FILE   *input;                         /* Current command input file */
 char   mailname[PATHSIZE];             /* Name of current file */
 char   prevfile[PATHSIZE];             /* Name of previous file */

-char   *mailrc;                        /* Name of startup file */
-char   *deadletter;                    /* Name of #/dead.letter */

 char   *homedir;                       /* Path name of home directory */
 char   *myname;                        /* My login name */
 off_t  mailsize;                       /* Size of system mailbox */
 char   *homedir;                       /* Path name of home directory */
 char   *myname;                        /* My login name */
 off_t  mailsize;                       /* Size of system mailbox */


@@ -49,7 +47,7 @@ int   lexnumber;                      /* Number of TNUMBER from scan() */
 char   lexstring[STRINGLEN];           /* String from TSTRING, scan() */
 int    regretp;                        /* Pointer to TOS of regret tokens */
 int    regretstack[REGDEP];            /* Stack of regretted tokens */
 char   lexstring[STRINGLEN];           /* String from TSTRING, scan() */
 int    regretp;                        /* Pointer to TOS of regret tokens */
 int    regretstack[REGDEP];            /* Stack of regretted tokens */

-char   *stringstack[REGDEP];           /* Stack of regretted strings */
+char   *string_stack[REGDEP];          /* Stack of regretted strings */

 int    numberstack[REGDEP];            /* Stack of regretted numbers */
 struct message *dot;                   /* Pointer to current message */
 struct message *message;               /* The actual message structure */
 int    numberstack[REGDEP];            /* Stack of regretted numbers */
 struct message *dot;                   /* Pointer to current message */
 struct message *message;               /* The actual message structure */