fixed up some command argument types

SCCS-vsn: usr.bin/mail/cmdtab.c 5.8
SCCS-vsn: usr.bin/mail/cmd3.c 5.15
SCCS-vsn: usr.bin/mail/aux.c 5.13

diff --git a/usr/src/usr.bin/mail/aux.c b/usr/src/usr.bin/mail/aux.c
index e15b61b..f50d7be 100644 (file)
--- a/usr/src/usr.bin/mail/aux.c
+++ b/usr/src/usr.bin/mail/aux.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)aux.c      5.12 (Berkeley) %G%";
+static char sccsid[] = "@(#)aux.c      5.13 (Berkeley) %G%";

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


@@ -279,14 +279,13 @@ struct sstack {
  * Set the global flag "sourcing" so that others will realize
  * that they are no longer reading from a tty (in all probability).
  */
  * Set the global flag "sourcing" so that others will realize
  * that they are no longer reading from a tty (in all probability).
  */

-
-source(name)
-       char name[];
+source(arglist)
+       char **arglist;

 {
 {

-       register FILE *fi;
-       register char *cp;
+       FILE *fi;
+       char *cp;

 
 

-       if ((cp = expand(name)) == NOSTR)
+       if ((cp = expand(*arglist)) == NOSTR)

                return(1);
        if ((fi = fopen(cp, "r")) == NULL) {
                perror(cp);
                return(1);
        if ((fi = fopen(cp, "r")) == NULL) {
                perror(cp);

diff --git a/usr/src/usr.bin/mail/cmd3.c b/usr/src/usr.bin/mail/cmd3.c
index ef5a7f1..0c4d6fc 100644 (file)
--- a/usr/src/usr.bin/mail/cmd3.c
+++ b/usr/src/usr.bin/mail/cmd3.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)cmd3.c     5.14 (Berkeley) %G%";
+static char sccsid[] = "@(#)cmd3.c     5.15 (Berkeley) %G%";

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


@@ -147,24 +147,21 @@ help()
 /*
  * Change user's working directory.
  */
 /*
  * Change user's working directory.
  */

-
-schdir(str)
-       char *str;
+schdir(arglist)
+       char **arglist;

 {
 {

-       register char *cp;
+       char *cp;

 
 

-       for (cp = str; *cp == ' '; cp++)
-               ;
-       if (*cp == '\0')
+       if (*arglist == NOSTR)

                cp = homedir;
        else
                cp = homedir;
        else

-               if ((cp = expand(cp)) == NOSTR)
+               if ((cp = expand(*arglist)) == NOSTR)

                        return(1);
        if (chdir(cp) < 0) {
                perror(cp);
                return(1);
        }
                        return(1);
        if (chdir(cp) < 0) {
                perror(cp);
                return(1);
        }

-       return(0);
+       return 0;

 }
 
 respond(msgvec)
 }
 
 respond(msgvec)

diff --git a/usr/src/usr.bin/mail/cmdtab.c b/usr/src/usr.bin/mail/cmdtab.c
index eea760c..325e38b 100644 (file)
--- a/usr/src/usr.bin/mail/cmdtab.c
+++ b/usr/src/usr.bin/mail/cmdtab.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

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


@@ -66,10 +66,10 @@ struct cmd cmdtab[] = {
        "New",          unread,         MSGLIST,        0,      MMNDEL,
        "!",            shell,          I|STRLIST,      0,      0,
        "copy",         copycmd,        M|STRLIST,      0,      0,
        "New",          unread,         MSGLIST,        0,      MMNDEL,
        "!",            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 +78,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,7 +90,7 @@ 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",         edstop,         NOLIST,         0,      0,

        "list",         pcmdlist,       M|NOLIST,       0,      0,
        "local",        local,          M|RAWLIST,      0,      1000,
        "xit",          rexit,          M|NOLIST,       0,      0,
        "list",         pcmdlist,       M|NOLIST,       0,      0,
        "local",        local,          M|RAWLIST,      0,      1000,
        "xit",          rexit,          M|NOLIST,       0,      0,