bootstrap fixups and lint

[unix-history] / usr / src / usr.bin / mail / cmdtab.c

diff --git a/usr/src/usr.bin/mail/cmdtab.c b/usr/src/usr.bin/mail/cmdtab.c
index 9950ee5..5733fc1 100644 (file)
--- a/usr/src/usr.bin/mail/cmdtab.c
+++ b/usr/src/usr.bin/mail/cmdtab.c
@@ -8,21 +8,22 @@
  * Define all of the command names and bindings.
  */
 
  * Define all of the command names and bindings.
  */
 

-static char *SccsId = "@(#)cmdtab.c    1.2 %G%";
+static char *SccsId = "@(#)cmdtab.c    1.4 %G%";

 
 extern int type(), preserve(), delete(), undelete(), next(), shell(), schdir();
 extern int save(), help(), headers(), pdot(), strace(), respond(), editor();
 extern int edstop(), exit(), pcmdlist(), sendmail(), from();
 extern int messize(), psalloc(), deltype(), unset(), set(), source();
 extern int pversion(), group(), top(), core(), null(), stouch(), visual();
 
 extern int type(), preserve(), delete(), undelete(), next(), shell(), schdir();
 extern int save(), help(), headers(), pdot(), strace(), respond(), editor();
 extern int edstop(), exit(), pcmdlist(), sendmail(), from();
 extern int messize(), psalloc(), deltype(), unset(), set(), source();
 extern int pversion(), group(), top(), core(), null(), stouch(), visual();

-extern int swrite(), dosh(), file(), echo(), Respond(), scroll();
+extern int swrite(), dosh(), file(), echo(), Respond(), scroll(), ifcmd();
+extern int elsecmd(), endifcmd();

 
 struct cmd cmdtab[] = {
        "next",         next,           NDMLIST,        0,      MMNDEL,
        "alias",        group,          M|RAWLIST,      0,      1000,
        "print",        type,           MSGLIST,        0,      MMNDEL,
        "type",         type,           MSGLIST,        0,      MMNDEL,
 
 struct cmd cmdtab[] = {
        "next",         next,           NDMLIST,        0,      MMNDEL,
        "alias",        group,          M|RAWLIST,      0,      1000,
        "print",        type,           MSGLIST,        0,      MMNDEL,
        "type",         type,           MSGLIST,        0,      MMNDEL,

-       "visual",       visual,         W|I|MSGLIST,    0,      MMNORM,
+       "visual",       visual,         I|MSGLIST,      0,      MMNORM,

        "top",          top,            MSGLIST,        0,      MMNDEL,
        "touch",        stouch,         W|MSGLIST,      0,      MMNDEL,
        "preserve",     preserve,       W|MSGLIST,      0,      MMNDEL,
        "top",          top,            MSGLIST,        0,      MMNDEL,
        "touch",        stouch,         W|MSGLIST,      0,      MMNDEL,
        "preserve",     preserve,       W|MSGLIST,      0,      MMNDEL,


@@ -44,7 +45,7 @@ struct cmd cmdtab[] = {
        "group",        group,          M|RAWLIST,      0,      1000,
        "write",        swrite,         STRLIST,        0,      0,
        "from",         from,           MSGLIST,        0,      MMNORM,
        "group",        group,          M|RAWLIST,      0,      1000,
        "write",        swrite,         STRLIST,        0,      0,
        "from",         from,           MSGLIST,        0,      MMNORM,

-       "file",         file,           M|RAWLIST,      0,      1,
+       "file",         file,           T|M|RAWLIST,    0,      1,

        "?",            help,           M|NOLIST,       0,      0,
        "z",            scroll,         M|STRLIST,      0,      0,
        "headers",      headers,        MSGLIST,        0,      MMNDEL,
        "?",            help,           M|NOLIST,       0,      0,
        "z",            scroll,         M|STRLIST,      0,      0,
        "headers",      headers,        MSGLIST,        0,      MMNDEL,


@@ -54,7 +55,7 @@ struct cmd cmdtab[] = {
        "Respond",      Respond,        I|MSGLIST,      0,      MMNDEL,
        "reply",        respond,        I|MSGLIST,      0,      MMNDEL,
        "respond",      respond,        I|MSGLIST,      0,      MMNDEL,
        "Respond",      Respond,        I|MSGLIST,      0,      MMNDEL,
        "reply",        respond,        I|MSGLIST,      0,      MMNDEL,
        "respond",      respond,        I|MSGLIST,      0,      MMNDEL,

-       "edit",         editor,         W|I|MSGLIST,    0,      MMNORM,
+       "edit",         editor,         I|MSGLIST,      0,      MMNORM,

        "echo",         echo,           RAWLIST,        0,      1000,
        "quit",         edstop,         NOLIST,         0,      0,
        "list",         pcmdlist,       M|NOLIST,       0,      0,
        "echo",         echo,           RAWLIST,        0,      1000,
        "quit",         edstop,         NOLIST,         0,      0,
        "list",         pcmdlist,       M|NOLIST,       0,      0,


@@ -62,6 +63,9 @@ struct cmd cmdtab[] = {
        "exit",         exit,           M|NOLIST,       0,      0,
        "size",         messize,        MSGLIST,        0,      MMNDEL,
        "hold",         preserve,       W|MSGLIST,      0,      MMNDEL,
        "exit",         exit,           M|NOLIST,       0,      0,
        "size",         messize,        MSGLIST,        0,      MMNDEL,
        "hold",         preserve,       W|MSGLIST,      0,      MMNDEL,

+       "if",           ifcmd,          C|RAWLIST,      1,      1,
+       "else",         elsecmd,        C|RAWLIST,      0,      0,
+       "endif",        endifcmd,       C|RAWLIST,      0,      0,

        "core",         core,           M|NOLIST,       0,      0,
        "#",            null,           M|NOLIST,       0,      0,
        0,              0,              0,              0,      0
        "core",         core,           M|NOLIST,       0,      0,
        "#",            null,           M|NOLIST,       0,      0,
        0,              0,              0,              0,      0