Fix sccs.include.redist.sh line

[unix-history] / usr / src / libexec / ftpd / ftpcmd.y

diff --git a/usr/src/libexec/ftpd/ftpcmd.y b/usr/src/libexec/ftpd/ftpcmd.y
index 8531b7e..e25f049 100644 (file)
--- a/usr/src/libexec/ftpd/ftpcmd.y
+++ b/usr/src/libexec/ftpd/ftpcmd.y
@@ -2,45 +2,37 @@
  * Copyright (c) 1985, 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1985, 1988 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%

  *
  *

- *     @(#)ftpcmd.y    5.18 (Berkeley) %G%
+ *     @(#)ftpcmd.y    5.24 (Berkeley) %G%

  */
 
 /*
  * Grammar for FTP commands.
  */
 
 /*
  * Grammar for FTP commands.

- * See RFC 765.
+ * See RFC 959.

  */
 
 %{
 
 #ifndef lint
  */
 
 %{
 
 #ifndef lint

-static char sccsid[] = "@(#)ftpcmd.y   5.18    (Berkeley) %G%";
+static char sccsid[] = "@(#)ftpcmd.y   5.24 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/socket.h>
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/socket.h>

-
+#include <sys/stat.h>

 #include <netinet/in.h>
 #include <netinet/in.h>

-

 #include <arpa/ftp.h>
 #include <arpa/ftp.h>

-
-#include <stdio.h>

 #include <signal.h>
 #include <signal.h>

-#include <ctype.h>
-#include <pwd.h>

 #include <setjmp.h>
 #include <syslog.h>
 #include <setjmp.h>
 #include <syslog.h>

+#include <time.h>
+#include <pwd.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>

 
 extern struct sockaddr_in data_dest;
 extern int logged_in;
 
 extern struct sockaddr_in data_dest;
 extern int logged_in;


@@ -51,15 +43,15 @@ extern      int type;
 extern int form;
 extern int debug;
 extern int timeout;
 extern int form;
 extern int debug;
 extern int timeout;

+extern int maxtimeout;

 extern  int pdata;
 extern char hostname[], remotehost[];
 extern  int pdata;
 extern char hostname[], remotehost[];

+extern char proctitle[];

 extern char *globerr;
 extern int usedefault;
 extern  int transflag;
 extern  char tmpline[];
 extern char *globerr;
 extern int usedefault;
 extern  int transflag;
 extern  char tmpline[];

-char   **glob();
-
-off_t  restart_point;
+char   **ftpglob();

 
 static int cmd_type;
 static int cmd_form;
 
 static int cmd_type;
 static int cmd_form;


@@ -67,7 +59,6 @@ static        int cmd_bytesz;
 char   cbuf[512];
 char   *fromname;
 
 char   cbuf[512];
 char   *fromname;
 

-char   *index();

 %}
 
 %token
 %}
 
 %token


@@ -82,7 +73,9 @@ char  *index();
        MRSQ    MRCP    ALLO    REST    RNFR    RNTO
        ABOR    DELE    CWD     LIST    NLST    SITE
        STAT    HELP    NOOP    MKD     RMD     PWD
        MRSQ    MRCP    ALLO    REST    RNFR    RNTO
        ABOR    DELE    CWD     LIST    NLST    SITE
        STAT    HELP    NOOP    MKD     RMD     PWD

-       CDUP    STOU    SYST
+       CDUP    STOU    SMNT    SYST    SIZE    MDTM
+
+       UMASK   IDLE    CHMOD

 
        LEXERR
 
 
        LEXERR
 


@@ -94,7 +87,6 @@ cmd_list:     /* empty */
        |       cmd_list cmd
                = {
                        fromname = (char *) 0;
        |       cmd_list cmd
                = {
                        fromname = (char *) 0;

-                       restart_point = (off_t) 0;

                }
        |       cmd_list rcmd
        ;
                }
        |       cmd_list rcmd
        ;


@@ -145,14 +137,16 @@ cmd:              USER SP username CRLF
                                break;
 
                        case TYPE_L:
                                break;
 
                        case TYPE_L:

-                               if (cmd_bytesz == NBBY) {
+#if NBBY == 8
+                               if (cmd_bytesz == 8) {

                                        reply(200,
                                        reply(200,

-                                           "Type set to L (byte size %d).",
-                                           NBBY);
+                                           "Type set to L (byte size 8).");

                                        type = cmd_type;
                                } else
                                        type = cmd_type;
                                } else

-                                       reply(504, "Byte size must be %d.",
-                                           NBBY);
+                                       reply(504, "Byte size must be 8.");
+#else /* NBBY == 8 */
+                               UNIMPLEMENTED for NBBY != 8
+#endif /* NBBY == 8 */

                        }
                }
        |       STRU SP struct_code CRLF
                        }
                }
        |       STRU SP struct_code CRLF


@@ -183,10 +177,14 @@ cmd:              USER SP username CRLF
                = {
                        reply(202, "ALLO command ignored.");
                }
                = {
                        reply(202, "ALLO command ignored.");
                }

+       |       ALLO SP NUMBER SP R SP NUMBER CRLF
+               = {
+                       reply(202, "ALLO command ignored.");
+               }

        |       RETR check_login SP pathname CRLF
                = {
                        if ($2 && $4 != NULL)
        |       RETR check_login SP pathname CRLF
                = {
                        if ($2 && $4 != NULL)

-                               retrieve((char *) 0, (char *)$4);
+                               retrieve((char *) 0, (char *) $4);

                        if ($4 != NULL)
                                free((char *) $4);
                }
                        if ($4 != NULL)
                                free((char *) $4);
                }


@@ -228,6 +226,17 @@ cmd:               USER SP username CRLF
                        if ($4 != NULL)
                                free((char *) $4);
                }
                        if ($4 != NULL)
                                free((char *) $4);
                }

+       |       STAT check_login SP pathname CRLF
+               = {
+                       if ($2 && $4 != NULL)
+                               statfilecmd((char *) $4);
+                       if ($4 != NULL)
+                               free((char *) $4);
+               }
+       |       STAT CRLF
+               = {
+                       statcmd();
+               }

        |       DELE check_login SP pathname CRLF
                = {
                        if ($2 && $4 != NULL)
        |       DELE check_login SP pathname CRLF
                = {
                        if ($2 && $4 != NULL)


@@ -264,11 +273,22 @@ cmd:              USER SP username CRLF
                }
        |       HELP CRLF
                = {
                }
        |       HELP CRLF
                = {

-                       help((char *) 0);
+                       help(cmdtab, (char *) 0);

                }
        |       HELP SP STRING CRLF
                = {
                }
        |       HELP SP STRING CRLF
                = {

-                       help((char *) $3);
+                       register char *cp = (char *)$3;
+
+                       if (strncasecmp(cp, "SITE", 4) == 0) {
+                               cp = (char *)$3 + 4;
+                               if (*cp == ' ')
+                                       cp++;
+                               if (*cp)
+                                       help(sitetab, cp);
+                               else
+                                       help(sitetab, (char *) 0);
+                       } else
+                               help(cmdtab, (char *) $3);

                }
        |       NOOP CRLF
                = {
                }
        |       NOOP CRLF
                = {


@@ -298,6 +318,73 @@ cmd:               USER SP username CRLF
                        if ($2)
                                cwd("..");
                }
                        if ($2)
                                cwd("..");
                }

+       |       SITE SP HELP CRLF
+               = {
+                       help(sitetab, (char *) 0);
+               }
+       |       SITE SP HELP SP STRING CRLF
+               = {
+                       help(sitetab, (char *) $5);
+               }
+       |       SITE SP UMASK check_login CRLF
+               = {
+                       int oldmask;
+
+                       if ($4) {
+                               oldmask = umask(0);
+                               (void) umask(oldmask);
+                               reply(200, "Current UMASK is %03o", oldmask);
+                       }
+               }
+       |       SITE SP UMASK check_login SP octal_number CRLF
+               = {
+                       int oldmask;
+
+                       if ($4) {
+                               if (($6 == -1) || ($6 > 0777)) {
+                                       reply(501, "Bad UMASK value");
+                               } else {
+                                       oldmask = umask($6);
+                                       reply(200,
+                                           "UMASK set to %03o (was %03o)",
+                                           $6, oldmask);
+                               }
+                       }
+               }
+       |       SITE SP CHMOD check_login SP octal_number SP pathname CRLF
+               = {
+                       if ($4 && ($8 != NULL)) {
+                               if ($6 > 0777)
+                                       reply(501,
+                               "CHMOD: Mode value must be between 0 and 0777");
+                               else if (chmod((char *) $8, $6) < 0)
+                                       perror_reply(550, (char *) $8);
+                               else
+                                       reply(200, "CHMOD command successful.");
+                       }
+                       if ($8 != NULL)
+                               free((char *) $8);
+               }
+       |       SITE SP IDLE CRLF
+               = {
+                       reply(200,
+                           "Current IDLE time limit is %d seconds; max %d",
+                               timeout, maxtimeout);
+               }
+       |       SITE SP IDLE SP NUMBER CRLF
+               = {
+                       if ($5 < 30 || $5 > maxtimeout) {
+                               reply(501,
+                       "Maximum IDLE time must be between 30 and %d seconds",
+                                   maxtimeout);
+                       } else {
+                               timeout = $5;
+                               (void) alarm((unsigned) timeout);
+                               reply(200,
+                                   "Maximum IDLE time set to %d seconds",
+                                   timeout);
+                       }
+               }

        |       STOU check_login SP pathname CRLF
                = {
                        if ($2 && $4 != NULL)
        |       STOU check_login SP pathname CRLF
                = {
                        if ($2 && $4 != NULL)


@@ -307,8 +394,63 @@ cmd:               USER SP username CRLF
                }
        |       SYST CRLF
                = {
                }
        |       SYST CRLF
                = {

+#ifdef unix
+#ifdef BSD

                        reply(215, "UNIX Type: L%d Version: BSD-%d",
                                NBBY, BSD);
                        reply(215, "UNIX Type: L%d Version: BSD-%d",
                                NBBY, BSD);

+#else /* BSD */
+                       reply(215, "UNIX Type: L%d", NBBY);
+#endif /* BSD */
+#else /* unix */
+                       reply(215, "UNKNOWN Type: L%d", NBBY);
+#endif /* unix */
+               }
+
+               /*
+                * SIZE is not in RFC959, but Postel has blessed it and
+                * it will be in the updated RFC.
+                *
+                * Return size of file in a format suitable for
+                * using with RESTART (we just count bytes).
+                */
+       |       SIZE check_login SP pathname CRLF
+               = {
+                       if ($2 && $4 != NULL)
+                               sizecmd((char *) $4);
+                       if ($4 != NULL)
+                               free((char *) $4);
+               }
+
+               /*
+                * MDTM is not in RFC959, but Postel has blessed it and
+                * it will be in the updated RFC.
+                *
+                * Return modification time of file as an ISO 3307
+                * style time. E.g. YYYYMMDDHHMMSS or YYYYMMDDHHMMSS.xxx
+                * where xxx is the fractional second (of any precision,
+                * not necessarily 3 digits)
+                */
+       |       MDTM check_login SP pathname CRLF
+               = {
+                       if ($2 && $4 != NULL) {
+                               struct stat stbuf;
+                               if (stat((char *) $4, &stbuf) < 0)
+                                       perror_reply(550, "%s", (char *) $4);
+                               else if ((stbuf.st_mode&S_IFMT) != S_IFREG) {
+                                       reply(550, "%s: not a plain file.",
+                                               (char *) $4);
+                               } else {
+                                       register struct tm *t;
+                                       struct tm *gmtime();
+                                       t = gmtime(&stbuf.st_mtime);
+                                       reply(213,
+                                           "19%02d%02d%02d%02d%02d%02d",
+                                           t->tm_year, t->tm_mon+1, t->tm_mday,
+                                           t->tm_hour, t->tm_min, t->tm_sec);
+                               }
+                       }
+                       if ($4 != NULL)
+                               free((char *) $4);

                }
        |       QUIT CRLF
                = {
                }
        |       QUIT CRLF
                = {


@@ -324,7 +466,6 @@ rcmd:               RNFR check_login SP pathname CRLF
                = {
                        char *renamefrom();
 
                = {
                        char *renamefrom();
 

-                       restart_point = (off_t) 0;

                        if ($2 && $4) {
                                fromname = renamefrom((char *) $4);
                                if (fromname == (char *) 0 && $4) {
                        if ($2 && $4) {
                                fromname = renamefrom((char *) $4);
                                if (fromname == (char *) 0 && $4) {


@@ -332,14 +473,6 @@ rcmd:              RNFR check_login SP pathname CRLF
                                }
                        }
                }
                                }
                        }
                }

-       |       REST SP byte_size CRLF
-               = {
-                       long atol();
-
-                       fromname = (char *) 0;
-                       restart_point = $3;
-                       reply(350, "Restarting at %ld. Send STORE or RETRIEVE to initiate transfer.", restart_point);
-               }

        ;
                
 username:      STRING
        ;
                
 username:      STRING


@@ -347,7 +480,7 @@ username:   STRING
 
 password:      /* empty */
                = {
 
 password:      /* empty */
                = {

-                       $$ = (int) "";
+                       *(char **)&($$) = (char *)calloc(1, sizeof(char));

                }
        |       STRING
        ;
                }
        |       STRING
        ;


@@ -460,7 +593,7 @@ pathname:   pathstring
                 * This is a valid reply in some cases but not in others.
                 */
                if (logged_in && $1 && strncmp((char *) $1, "~", 1) == 0) {
                 * This is a valid reply in some cases but not in others.
                 */
                if (logged_in && $1 && strncmp((char *) $1, "~", 1) == 0) {

-                       $$ = (int)*glob((char *) $1);
+                       *(char **)&($$) = *ftpglob((char *) $1);

                        if (globerr != NULL) {
                                reply(550, globerr);
                                $$ = NULL;
                        if (globerr != NULL) {
                                reply(550, globerr);
                                $$ = NULL;


@@ -474,6 +607,31 @@ pathname:  pathstring
 pathstring:    STRING
        ;
 
 pathstring:    STRING
        ;
 

+octal_number:  NUMBER
+       = {
+               register int ret, dec, multby, digit;
+
+               /*
+                * Convert a number that was read as decimal number
+                * to what it would be if it had been read as octal.
+                */
+               dec = $1;
+               multby = 1;
+               ret = 0;
+               while (dec) {
+                       digit = dec%10;
+                       if (digit > 7) {
+                               ret = -1;
+                               break;
+                       }
+                       ret += digit * multby;
+                       multby *= 8;
+                       dec /= 10;
+               }
+               $$ = ret;
+       }
+       ;
+

 check_login:   /* empty */
        = {
                if (logged_in)
 check_login:   /* empty */
        = {
                if (logged_in)


@@ -496,6 +654,8 @@ extern jmp_buf errcatch;
 #define        OSTR    4       /* optional SP then STRING */
 #define        ZSTR1   5       /* SP then optional STRING */
 #define        ZSTR2   6       /* optional STRING after SP */
 #define        OSTR    4       /* optional SP then STRING */
 #define        ZSTR1   5       /* SP then optional STRING */
 #define        ZSTR2   6       /* optional STRING after SP */

+#define        SITECMD 7       /* SITE command */
+#define        NSTR    8       /* Number followed by a string */

 
 struct tab {
        char    *name;
 
 struct tab {
        char    *name;


@@ -509,6 +669,7 @@ struct tab cmdtab[] = {             /* In order defined in RFC 765 */
        { "USER", USER, STR1, 1,        "<sp> username" },
        { "PASS", PASS, ZSTR1, 1,       "<sp> password" },
        { "ACCT", ACCT, STR1, 0,        "(specify account)" },
        { "USER", USER, STR1, 1,        "<sp> username" },
        { "PASS", PASS, ZSTR1, 1,       "<sp> password" },
        { "ACCT", ACCT, STR1, 0,        "(specify account)" },

+       { "SMNT", SMNT, ARGS, 0,        "(structure mount)" },

        { "REIN", REIN, ARGS, 0,        "(reinitialize server state)" },
        { "QUIT", QUIT, ARGS, 1,        "(terminate service)", },
        { "PORT", PORT, ARGS, 1,        "<sp> b0, b1, b2, b3, b4" },
        { "REIN", REIN, ARGS, 0,        "(reinitialize server state)" },
        { "QUIT", QUIT, ARGS, 1,        "(terminate service)", },
        { "PORT", PORT, ARGS, 1,        "<sp> b0, b1, b2, b3, b4" },


@@ -527,7 +688,7 @@ struct tab cmdtab[] = {             /* In order defined in RFC 765 */
        { "MRSQ", MRSQ, OSTR, 0,        "(mail recipient scheme question)" },
        { "MRCP", MRCP, STR1, 0,        "(mail recipient)" },
        { "ALLO", ALLO, ARGS, 1,        "allocate storage (vacuously)" },
        { "MRSQ", MRSQ, OSTR, 0,        "(mail recipient scheme question)" },
        { "MRCP", MRCP, STR1, 0,        "(mail recipient)" },
        { "ALLO", ALLO, ARGS, 1,        "allocate storage (vacuously)" },

-       { "REST", REST, ARGS, 1,        "(restart command)" },
+       { "REST", REST, ARGS, 0,        "(restart command)" },

        { "RNFR", RNFR, STR1, 1,        "<sp> file-name" },
        { "RNTO", RNTO, STR1, 1,        "<sp> file-name" },
        { "ABOR", ABOR, ARGS, 1,        "(abort operation)" },
        { "RNFR", RNFR, STR1, 1,        "<sp> file-name" },
        { "RNTO", RNTO, STR1, 1,        "<sp> file-name" },
        { "ABOR", ABOR, ARGS, 1,        "(abort operation)" },


@@ -536,9 +697,9 @@ struct tab cmdtab[] = {             /* In order defined in RFC 765 */
        { "XCWD", CWD,  OSTR, 1,        "[ <sp> directory-name ]" },
        { "LIST", LIST, OSTR, 1,        "[ <sp> path-name ]" },
        { "NLST", NLST, OSTR, 1,        "[ <sp> path-name ]" },
        { "XCWD", CWD,  OSTR, 1,        "[ <sp> directory-name ]" },
        { "LIST", LIST, OSTR, 1,        "[ <sp> path-name ]" },
        { "NLST", NLST, OSTR, 1,        "[ <sp> path-name ]" },

-       { "SITE", SITE, STR1, 0,        "(get site parameters)" },
+       { "SITE", SITE, SITECMD, 1,     "site-cmd [ <sp> arguments ]" },

        { "SYST", SYST, ARGS, 1,        "(get type of operating system)" },
        { "SYST", SYST, ARGS, 1,        "(get type of operating system)" },

-       { "STAT", STAT, OSTR, 0,        "(get server status)" },
+       { "STAT", STAT, OSTR, 1,        "[ <sp> path-name ]" },

        { "HELP", HELP, OSTR, 1,        "[ <sp> <string> ]" },
        { "NOOP", NOOP, ARGS, 1,        "" },
        { "MKD",  MKD,  STR1, 1,        "<sp> path-name" },
        { "HELP", HELP, OSTR, 1,        "[ <sp> <string> ]" },
        { "NOOP", NOOP, ARGS, 1,        "" },
        { "MKD",  MKD,  STR1, 1,        "<sp> path-name" },


@@ -550,16 +711,26 @@ struct tab cmdtab[] = {           /* In order defined in RFC 765 */
        { "CDUP", CDUP, ARGS, 1,        "(change to parent directory)" },
        { "XCUP", CDUP, ARGS, 1,        "(change to parent directory)" },
        { "STOU", STOU, STR1, 1,        "<sp> file-name" },
        { "CDUP", CDUP, ARGS, 1,        "(change to parent directory)" },
        { "XCUP", CDUP, ARGS, 1,        "(change to parent directory)" },
        { "STOU", STOU, STR1, 1,        "<sp> file-name" },

+       { "SIZE", SIZE, OSTR, 1,        "<sp> path-name" },
+       { "MDTM", MDTM, OSTR, 1,        "<sp> path-name" },
+       { NULL,   0,    0,    0,        0 }
+};
+
+struct tab sitetab[] = {
+       { "UMASK", UMASK, ARGS, 1,      "[ <sp> umask ]" },
+       { "IDLE", IDLE, ARGS, 1,        "[ <sp> maximum-idle-time ]" },
+       { "CHMOD", CHMOD, NSTR, 1,      "<sp> mode <sp> file-name" },
+       { "HELP", HELP, OSTR, 1,        "[ <sp> <string> ]" },

        { NULL,   0,    0,    0,        0 }
 };
 
 struct tab *
        { NULL,   0,    0,    0,        0 }
 };
 
 struct tab *

-lookup(cmd)
+lookup(p, cmd)
+       register struct tab *p;

        char *cmd;
 {
        char *cmd;
 {

-       register struct tab *p;

 
 

-       for (p = cmdtab; p->name != NULL; p++)
+       for (; p->name != NULL; p++)

                if (strcmp(cmd, p->name) == 0)
                        return (p);
        return (0);
                if (strcmp(cmd, p->name) == 0)
                        return (p);
        return (0);


@@ -629,12 +800,10 @@ getline(s, n, iop)
        return (s);
 }
 
        return (s);
 }
 

-static int
+static void

 toolong()
 {
        time_t now;
 toolong()
 {
        time_t now;

-       extern char *ctime();
-       extern time_t time();

 
        reply(421,
          "Timeout (%d seconds): closing control connection.", timeout);
 
        reply(421,
          "Timeout (%d seconds): closing control connection.", timeout);


@@ -650,10 +819,10 @@ toolong()
 yylex()
 {
        static int cpos, state;
 yylex()
 {
        static int cpos, state;

-       register char *cp;
+       register char *cp, *cp2;

        register struct tab *p;
        int n;
        register struct tab *p;
        int n;

-       char c, *strpbrk();
+       char c, *copy();

 
        for (;;) {
                switch (state) {
 
        for (;;) {
                switch (state) {


@@ -667,9 +836,8 @@ yylex()
                        }
                        (void) alarm(0);
 #ifdef SETPROCTITLE
                        }
                        (void) alarm(0);
 #ifdef SETPROCTITLE

-                       if (strncasecmp(cbuf, "PASS", 4) != NULL) {
-                               setproctitle("%s: %s", remotehost, cbuf);
-                       }
+                       if (strncasecmp(cbuf, "PASS", 4) != NULL)
+                               setproctitle("%s: %s", proctitle, cbuf);

 #endif /* SETPROCTITLE */
                        if ((cp = index(cbuf, '\r'))) {
                                *cp++ = '\n';
 #endif /* SETPROCTITLE */
                        if ((cp = index(cbuf, '\r'))) {
                                *cp++ = '\n';


@@ -682,18 +850,45 @@ yylex()
                        c = cbuf[cpos];
                        cbuf[cpos] = '\0';
                        upper(cbuf);
                        c = cbuf[cpos];
                        cbuf[cpos] = '\0';
                        upper(cbuf);

-                       p = lookup(cbuf);
+                       p = lookup(cmdtab, cbuf);
+                       cbuf[cpos] = c;
+                       if (p != 0) {
+                               if (p->implemented == 0) {
+                                       nack(p->name);
+                                       longjmp(errcatch,0);
+                                       /* NOTREACHED */
+                               }
+                               state = p->state;
+                               *(char **)&yylval = p->name;
+                               return (p->token);
+                       }
+                       break;
+
+               case SITECMD:
+                       if (cbuf[cpos] == ' ') {
+                               cpos++;
+                               return (SP);
+                       }
+                       cp = &cbuf[cpos];
+                       if ((cp2 = strpbrk(cp, " \n")))
+                               cpos = cp2 - cbuf;
+                       c = cbuf[cpos];
+                       cbuf[cpos] = '\0';
+                       upper(cp);
+                       p = lookup(sitetab, cp);

                        cbuf[cpos] = c;
                        if (p != 0) {
                                if (p->implemented == 0) {
                        cbuf[cpos] = c;
                        if (p != 0) {
                                if (p->implemented == 0) {

+                                       state = CMD;

                                        nack(p->name);
                                        longjmp(errcatch,0);
                                        /* NOTREACHED */
                                }
                                state = p->state;
                                        nack(p->name);
                                        longjmp(errcatch,0);
                                        /* NOTREACHED */
                                }
                                state = p->state;

-                               yylval = (int) p->name;
+                               *(char **)&yylval = p->name;

                                return (p->token);
                        }
                                return (p->token);
                        }

+                       state = CMD;

                        break;
 
                case OSTR:
                        break;
 
                case OSTR:


@@ -705,6 +900,7 @@ yylex()
 
                case STR1:
                case ZSTR1:
 
                case STR1:
                case ZSTR1:

+               dostr1:

                        if (cbuf[cpos] == ' ') {
                                cpos++;
                                state = state == OSTR ? STR2 : ++state;
                        if (cbuf[cpos] == ' ') {
                                cpos++;
                                state = state == OSTR ? STR2 : ++state;


@@ -717,7 +913,7 @@ yylex()
                                state = CMD;
                                return (CRLF);
                        }
                                state = CMD;
                                return (CRLF);
                        }

-                       /* FALL THRU */
+                       /* FALLTHROUGH */

 
                case STR2:
                        cp = &cbuf[cpos];
 
                case STR2:
                        cp = &cbuf[cpos];


@@ -728,13 +924,32 @@ yylex()
                         */
                        if (n > 1 && cbuf[cpos] == '\n') {
                                cbuf[cpos] = '\0';
                         */
                        if (n > 1 && cbuf[cpos] == '\n') {
                                cbuf[cpos] = '\0';

-                               yylval = copy(cp);
+                               *(char **)&yylval = copy(cp);

                                cbuf[cpos] = '\n';
                                state = ARGS;
                                return (STRING);
                        }
                        break;
 
                                cbuf[cpos] = '\n';
                                state = ARGS;
                                return (STRING);
                        }
                        break;
 

+               case NSTR:
+                       if (cbuf[cpos] == ' ') {
+                               cpos++;
+                               return (SP);
+                       }
+                       if (isdigit(cbuf[cpos])) {
+                               cp = &cbuf[cpos];
+                               while (isdigit(cbuf[++cpos]))
+                                       ;
+                               c = cbuf[cpos];
+                               cbuf[cpos] = '\0';
+                               yylval = atoi(cp);
+                               cbuf[cpos] = c;
+                               state = STR1;
+                               return (NUMBER);
+                       }
+                       state = STR1;
+                       goto dostr1;
+

                case ARGS:
                        if (isdigit(cbuf[cpos])) {
                                cp = &cbuf[cpos];
                case ARGS:
                        if (isdigit(cbuf[cpos])) {
                                cp = &cbuf[cpos];


@@ -828,28 +1043,34 @@ upper(s)
        }
 }
 
        }
 }
 

+char *

 copy(s)
        char *s;
 {
        char *p;
 copy(s)
        char *s;
 {
        char *p;

-       extern char *malloc(), *strcpy();

 
        p = malloc((unsigned) strlen(s) + 1);
        if (p == NULL)
                fatal("Ran out of memory.");
        (void) strcpy(p, s);
 
        p = malloc((unsigned) strlen(s) + 1);
        if (p == NULL)
                fatal("Ran out of memory.");
        (void) strcpy(p, s);

-       return ((int)p);
+       return (p);

 }
 
 }
 

-help(s)
+help(ctab, s)
+       struct tab *ctab;

        char *s;
 {
        register struct tab *c;
        register int width, NCMDS;
        char *s;
 {
        register struct tab *c;
        register int width, NCMDS;

+       char *type;

 
 

+       if (ctab == sitetab)
+               type = "SITE ";
+       else
+               type = "";

        width = 0, NCMDS = 0;
        width = 0, NCMDS = 0;

-       for (c = cmdtab; c->name != NULL; c++) {
-               int len = strlen(c->name) + 1;
+       for (c = ctab; c->name != NULL; c++) {
+               int len = strlen(c->name);

 
                if (len > width)
                        width = len;
 
                if (len > width)
                        width = len;


@@ -860,8 +1081,8 @@ help(s)
                register int i, j, w;
                int columns, lines;
 
                register int i, j, w;
                int columns, lines;
 

-               lreply(214,
-         "The following commands are recognized (* =>'s unimplemented).");
+               lreply(214, "The following %scommands are recognized %s.",
+                   type, "(* =>'s unimplemented)");

                columns = 76 / width;
                if (columns == 0)
                        columns = 1;
                columns = 76 / width;
                if (columns == 0)
                        columns = 1;


@@ -869,10 +1090,10 @@ help(s)
                for (i = 0; i < lines; i++) {
                        printf("   ");
                        for (j = 0; j < columns; j++) {
                for (i = 0; i < lines; i++) {
                        printf("   ");
                        for (j = 0; j < columns; j++) {

-                               c = cmdtab + j * lines + i;
+                               c = ctab + j * lines + i;

                                printf("%s%c", c->name,
                                        c->implemented ? ' ' : '*');
                                printf("%s%c", c->name,
                                        c->implemented ? ' ' : '*');

-                               if (c + lines >= &cmdtab[NCMDS])
+                               if (c + lines >= &ctab[NCMDS])

                                        break;
                                w = strlen(c->name) + 1;
                                while (w < width) {
                                        break;
                                w = strlen(c->name) + 1;
                                while (w < width) {


@@ -887,13 +1108,59 @@ help(s)
                return;
        }
        upper(s);
                return;
        }
        upper(s);

-       c = lookup(s);
+       c = lookup(ctab, s);

        if (c == (struct tab *)0) {
                reply(502, "Unknown command %s.", s);
                return;
        }
        if (c->implemented)
        if (c == (struct tab *)0) {
                reply(502, "Unknown command %s.", s);
                return;
        }
        if (c->implemented)

-               reply(214, "Syntax: %s %s", c->name, c->help);
+               reply(214, "Syntax: %s%s %s", type, c->name, c->help);

        else
        else

-               reply(214, "%-*s\t%s; unimplemented.", width, c->name, c->help);
+               reply(214, "%s%-*s\t%s; unimplemented.", type, width,
+                   c->name, c->help);
+}
+
+sizecmd(filename)
+char *filename;
+{
+       switch (type) {
+       case TYPE_L:
+       case TYPE_I: {
+               struct stat stbuf;
+               if (stat(filename, &stbuf) < 0 ||
+                   (stbuf.st_mode&S_IFMT) != S_IFREG)
+                       reply(550, "%s: not a plain file.", filename);
+               else
+                       reply(213, "%lu", stbuf.st_size);
+               break;}
+       case TYPE_A: {
+               FILE *fin;
+               register int c;
+               register long count;
+               struct stat stbuf;
+               fin = fopen(filename, "r");
+               if (fin == NULL) {
+                       perror_reply(550, filename);
+                       return;
+               }
+               if (fstat(fileno(fin), &stbuf) < 0 ||
+                   (stbuf.st_mode&S_IFMT) != S_IFREG) {
+                       reply(550, "%s: not a plain file.", filename);
+                       (void) fclose(fin);
+                       return;
+               }
+
+               count = 0;
+               while((c=getc(fin)) != EOF) {
+                       if (c == '\n')  /* will get expanded to \r\n */
+                               count++;
+                       count++;
+               }
+               (void) fclose(fin);
+
+               reply(213, "%ld", count);
+               break;}
+       default:
+               reply(504, "SIZE not implemented for Type %c.", "?AEIL"[type]);
+       }

 }
 }