4.4BSD snapshot (revision 8.1); add 1993 to copyright

[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 eea760c..92d7a5e 100644 (file)
--- a/usr/src/usr.bin/mail/cmdtab.c
+++ b/usr/src/usr.bin/mail/cmdtab.c
@@ -1,25 +1,16 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, 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'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)cmdtab.c   5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)cmdtab.c   8.1 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "def.h"
 #endif /* not lint */
 
 #include "def.h"

+#include "extern.h"

 
 /*
  * Mail -- a mail program
 
 /*
  * Mail -- a mail program


@@ -27,17 +18,6 @@ static char sccsid[] = "@(#)cmdtab.c 5.7 (Berkeley) %G%";
  * Define all of the command names and bindings.
  */
 
  * Define all of the command names and bindings.
  */
 

-extern int type(), preserve(), delete(), undelete(), next(), shell(), schdir();
-extern int save(), help(), headers(), pdot(), respond(), editor();
-extern int edstop(), rexit(), pcmdlist(), sendmail(), from(), copycmd();
-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(), ifcmd();
-extern int elsecmd(), endifcmd(), mboxit(), clobber(), alternates();
-extern int local(), folders(), igfield(), Type(), retfield(), more(), More();
-extern int saveigfield(), saveretfield();
-extern int unread();   /* , Header(); */
-

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


@@ -61,15 +41,12 @@ struct cmd cmdtab[] = {
        "More",         More,           MSGLIST,        0,      MMNDEL,
        "Page",         More,           MSGLIST,        0,      MMNDEL,
        "unread",       unread,         MSGLIST,        0,      MMNDEL,
        "More",         More,           MSGLIST,        0,      MMNDEL,
        "Page",         More,           MSGLIST,        0,      MMNDEL,
        "unread",       unread,         MSGLIST,        0,      MMNDEL,

-       "Unread",       unread,         MSGLIST,        0,      MMNDEL,
-       "new",          unread,         MSGLIST,        0,      MMNDEL,
-       "New",          unread,         MSGLIST,        0,      MMNDEL,

        "!",            shell,          I|STRLIST,      0,      0,
        "copy",         copycmd,        M|STRLIST,      0,      0,
        "!",            shell,          I|STRLIST,      0,      0,
        "copy",         copycmd,        M|STRLIST,      0,      0,

-       "chdir",        schdir,         M|STRLIST,      0,      0,
-       "cd",           schdir,         M|STRLIST,      0,      0,
+       "chdir",        schdir,         M|RAWLIST,      0,      1,
+       "cd",           schdir,         M|RAWLIST,      0,      1,

        "save",         save,           STRLIST,        0,      0,
        "save",         save,           STRLIST,        0,      0,

-       "source",       source,         M|STRLIST,      0,      0,
+       "source",       source,         M|RAWLIST,      1,      1,

        "set",          set,            M|RAWLIST,      0,      1000,
        "shell",        dosh,           I|NOLIST,       0,      0,
        "version",      pversion,       M|NOLIST,       0,      0,
        "set",          set,            M|RAWLIST,      0,      1000,
        "shell",        dosh,           I|NOLIST,       0,      0,
        "version",      pversion,       M|NOLIST,       0,      0,


@@ -78,7 +55,7 @@ struct cmd cmdtab[] = {
        "from",         from,           MSGLIST,        0,      MMNORM,
        "file",         file,           T|M|RAWLIST,    0,      1,
        "folder",       file,           T|M|RAWLIST,    0,      1,
        "from",         from,           MSGLIST,        0,      MMNORM,
        "file",         file,           T|M|RAWLIST,    0,      1,
        "folder",       file,           T|M|RAWLIST,    0,      1,

-       "folders",      folders,        T|M|RAWLIST,    0,      1,
+       "folders",      folders,        T|M|NOLIST,     0,      0,

        "?",            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,


@@ -90,9 +67,8 @@ struct cmd cmdtab[] = {
        "respond",      respond,        R|I|MSGLIST,    0,      MMNDEL,
        "edit",         editor,         I|MSGLIST,      0,      MMNORM,
        "echo",         echo,           M|RAWLIST,      0,      1000,
        "respond",      respond,        R|I|MSGLIST,    0,      MMNDEL,
        "edit",         editor,         I|MSGLIST,      0,      MMNORM,
        "echo",         echo,           M|RAWLIST,      0,      1000,

-       "quit",         edstop,         NOLIST,         0,      0,
+       "quit",         quitcmd,        NOLIST,         0,      0,

        "list",         pcmdlist,       M|NOLIST,       0,      0,
        "list",         pcmdlist,       M|NOLIST,       0,      0,

-       "local",        local,          M|RAWLIST,      0,      1000,

        "xit",          rexit,          M|NOLIST,       0,      0,
        "exit",         rexit,          M|NOLIST,       0,      0,
        "size",         messize,        MSGLIST,        0,      MMNDEL,
        "xit",          rexit,          M|NOLIST,       0,      0,
        "exit",         rexit,          M|NOLIST,       0,      0,
        "size",         messize,        MSGLIST,        0,      MMNDEL,