added in nifty changes from branch to make easier to compile

[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 cc5b9e5..fccc1ec 100644 (file)
--- a/usr/src/usr.bin/mail/def.h
+++ b/usr/src/usr.bin/mail/def.h
@@ -9,7 +9,7 @@
 #undef isdigit
 
 /*
 #undef isdigit
 
 /*

- * Sccs Id = "@(#)def.h        1.8 %G%";
+ * Sccs Id = "@(#)def.h        2.2 %G%";

  */
 
 /*
  */
 
 /*


@@ -38,7 +38,7 @@
 #define        NAMESIZE        20              /* Max size of user name */
 #define        HSHSIZE         19              /* Hash size for aliases and vars */
 #define        HDRFIELDS       3               /* Number of header fields */
 #define        NAMESIZE        20              /* Max size of user name */
 #define        HSHSIZE         19              /* Hash size for aliases and vars */
 #define        HDRFIELDS       3               /* Number of header fields */

-#define        LINESIZE        512             /* max readable line width */
+#define        LINESIZE        BUFSIZ          /* max readable line width */

 #define        SCREEN          18              /* screen size in lines (effective) */
 #define        STRINGSIZE      ((unsigned) 128)/* Dynamic allocation units */
 #define        MAXARGC         20              /* Maximum list of raw strings */
 #define        SCREEN          18              /* screen size in lines (effective) */
 #define        STRINGSIZE      ((unsigned) 128)/* Dynamic allocation units */
 #define        MAXARGC         20              /* Maximum list of raw strings */


@@ -58,16 +58,17 @@ struct message {
  * flag bits.
  */
 
  * flag bits.
  */
 

-#define        MUSED           1               /* entry is used, but this bit isn't */
-#define        MDELETED        2               /* entry has been deleted */
-#define        MSAVED          4               /* entry has been saved */
-#define        MTOUCH          8               /* entry has been noticed */
-#define        MPRESERVE       16              /* keep entry in sys mailbox */
-#define        MMARK           32              /* message is marked! */
-#define        MODIFY          64              /* message has been modified */
-#define        MNEW            128             /* message has never been seen */
-#define        MREAD           256             /* message has been read sometime. */
-#define        MSTATUS         512             /* message status has changed */
+#define        MUSED           (1<<0)          /* entry is used, but this bit isn't */
+#define        MDELETED        (1<<1)          /* entry has been deleted */
+#define        MSAVED          (1<<2)          /* entry has been saved */
+#define        MTOUCH          (1<<3)          /* entry has been noticed */
+#define        MPRESERVE       (1<<4)          /* keep entry in sys mailbox */
+#define        MMARK           (1<<5)          /* message is marked! */
+#define        MODIFY          (1<<6)          /* message has been modified */
+#define        MNEW            (1<<7)          /* message has never been seen */
+#define        MREAD           (1<<8)          /* message has been read sometime. */
+#define        MSTATUS         (1<<9)          /* message status has changed */
+#define        MBOX            (1<<10)         /* Send this to mbox, regardless */

 
 /*
  * Format of the command description table.
 
 /*
  * Format of the command description table.


@@ -257,6 +258,7 @@ char        *expand();
 char   *gets();
 char   *hfield();
 char   *index();
 char   *gets();
 char   *hfield();
 char   *index();

+char   *name1();

 char   *nameof();
 char   *nextword();
 char   *getenv();
 char   *nameof();
 char   *nextword();
 char   *getenv();


@@ -265,6 +267,7 @@ char        *hcontents();
 char   *netmap();
 char   *netname();
 char   *readtty();
 char   *netmap();
 char   *netname();
 char   *readtty();

+char   *reedit();

 char   *rename();
 char   *revarpa();
 char   *rindex();
 char   *rename();
 char   *revarpa();
 char   *rindex();


@@ -272,11 +275,13 @@ char      *rpair();
 char   *salloc();
 char   *savestr();
 char   *savestr();
 char   *salloc();
 char   *savestr();
 char   *savestr();

+char   *skin();

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

+int    (*sigset())();

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