eliminate local version of glob (cf ftp)
[unix-history] / usr / src / libexec / ftpd / ftpcmd.y
index 7db456c..437e7c6 100644 (file)
@@ -1,24 +1,44 @@
+/*
+ * Copyright (c) 1985, 1988, 1993, 1994
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)ftpcmd.y    8.2 (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   4.8 83/02/21";
-#endif
+static char sccsid[] = "@(#)ftpcmd.y   8.2 (Berkeley) %G%";
+#endif /* not lint */
 
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
 
 #include <netinet/in.h>
 
 #include <netinet/in.h>
+#include <arpa/ftp.h>
 
 
-#include <stdio.h>
 #include <ctype.h>
 #include <ctype.h>
+#include <errno.h>
+#include <glob.h>
 #include <pwd.h>
 #include <setjmp.h>
 #include <pwd.h>
 #include <setjmp.h>
-#include "ftp.h"
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "extern.h"
 
 extern struct sockaddr_in data_dest;
 extern int logged_in;
 
 extern struct sockaddr_in data_dest;
 extern int logged_in;
@@ -28,74 +48,92 @@ extern      int logging;
 extern int type;
 extern int form;
 extern int debug;
 extern int type;
 extern int form;
 extern int debug;
-extern char hostname[];
-extern char *globerr;
+extern int timeout;
+extern int maxtimeout;
+extern  int pdata;
+extern char hostname[], remotehost[];
+extern char proctitle[];
 extern int usedefault;
 extern int usedefault;
-char   **glob();
+extern  int transflag;
+extern  char tmpline[];
 
 static int cmd_type;
 static int cmd_form;
 static int cmd_bytesz;
 
 static int cmd_type;
 static int cmd_form;
 static int cmd_bytesz;
+char   cbuf[512];
+char   *fromname;
 
 
-char   *index();
 %}
 
 %}
 
+%union {
+       int     i;
+       char   *s;
+}
+
 %token
        A       B       C       E       F       I
        L       N       P       R       S       T
 
 %token
        A       B       C       E       F       I
        L       N       P       R       S       T
 
-       SP      CRLF    COMMA   STRING  NUMBER
+       SP      CRLF    COMMA
 
        USER    PASS    ACCT    REIN    QUIT    PORT
        PASV    TYPE    STRU    MODE    RETR    STOR
        APPE    MLFL    MAIL    MSND    MSOM    MSAM
        MRSQ    MRCP    ALLO    REST    RNFR    RNTO
        ABOR    DELE    CWD     LIST    NLST    SITE
 
        USER    PASS    ACCT    REIN    QUIT    PORT
        PASV    TYPE    STRU    MODE    RETR    STOR
        APPE    MLFL    MAIL    MSND    MSOM    MSAM
        MRSQ    MRCP    ALLO    REST    RNFR    RNTO
        ABOR    DELE    CWD     LIST    NLST    SITE
-       STAT    HELP    NOOP    XMKD    XRMD    XPWD
-       XCUP
+       STAT    HELP    NOOP    MKD     RMD     PWD
+       CDUP    STOU    SMNT    SYST    SIZE    MDTM
+
+       UMASK   IDLE    CHMOD
 
        LEXERR
 
 
        LEXERR
 
+%token <s> STRING
+%token <i> NUMBER
+
+%type  <i> check_login octal_number byte_size
+%type  <i> struct_code mode_code type_code form_code
+%type  <s> pathstring pathname password username
+
 %start cmd_list
 
 %%
 
 %start cmd_list
 
 %%
 
-cmd_list:      /* empty */
-       |       cmd_list cmd
+cmd_list
+       : /* empty */
+       | cmd_list cmd
+               {
+                       fromname = (char *) 0;
+               }
+       | cmd_list rcmd
        ;
 
        ;
 
-cmd:           USER SP username CRLF
-               = {
-                       extern struct passwd *getpwnam();
-
-                       if (strcmp($3, "ftp") == 0 ||
-                         strcmp($3, "anonymous") == 0) {
-                               if ((pw = getpwnam("ftp")) != NULL) {
-                                       guest = 1;
-                                       reply(331,
-                                 "Guest login ok, send ident as password.");
-                               }
-                       } else if (checkuser($3)) {
-                               guest = 0;
-                               pw = getpwnam($3);
-                               reply(331, "Password required for %s.", $3);
-                       }
-                       if (pw == NULL)
-                               reply(530, "User %s unknown.", $3);
+cmd
+       : USER SP username CRLF
+               {
+                       user($3);
                        free($3);
                }
                        free($3);
                }
-       |       PASS SP password CRLF
-               {
+       | PASS SP password CRLF
+               {
                        pass($3);
                        free($3);
                }
                        pass($3);
                        free($3);
                }
-       |       PORT SP host_port CRLF
-               {
+       | PORT SP host_port CRLF
+               {
                        usedefault = 0;
                        usedefault = 0;
-                       ack($1);
+                       if (pdata >= 0) {
+                               (void) close(pdata);
+                               pdata = -1;
+                       }
+                       reply(200, "PORT command successful.");
+               }
+       | PASV CRLF
+               {
+                       passive();
                }
                }
-       |       TYPE SP type_code CRLF
-               {
+       | TYPE SP type_code CRLF
+               {
                        switch (cmd_type) {
 
                        case TYPE_A:
                        switch (cmd_type) {
 
                        case TYPE_A:
@@ -117,16 +155,20 @@ cmd:              USER SP username CRLF
                                break;
 
                        case TYPE_L:
                                break;
 
                        case TYPE_L:
+#if NBBY == 8
                                if (cmd_bytesz == 8) {
                                        reply(200,
                                            "Type set to L (byte size 8).");
                                        type = cmd_type;
                                } else
                                        reply(504, "Byte size must be 8.");
                                if (cmd_bytesz == 8) {
                                        reply(200,
                                            "Type set to L (byte size 8).");
                                        type = cmd_type;
                                } else
                                        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
+               {
                        switch ($3) {
 
                        case STRU_F:
                        switch ($3) {
 
                        case STRU_F:
@@ -134,11 +176,11 @@ cmd:              USER SP username CRLF
                                break;
 
                        default:
                                break;
 
                        default:
-                               reply(502, "Unimplemented STRU type.");
+                               reply(504, "Unimplemented STRU type.");
                        }
                }
                        }
                }
-       |       MODE SP mode_code CRLF
-               {
+       | MODE SP mode_code CRLF
+               {
                        switch ($3) {
 
                        case MODE_S:
                        switch ($3) {
 
                        case MODE_S:
@@ -149,135 +191,329 @@ cmd:            USER SP username CRLF
                                reply(502, "Unimplemented MODE type.");
                        }
                }
                                reply(502, "Unimplemented MODE type.");
                        }
                }
-       |       ALLO SP NUMBER CRLF
-               = {
-                       ack($1);
+       | ALLO SP NUMBER CRLF
+               {
+                       reply(202, "ALLO command ignored.");
+               }
+       | ALLO SP NUMBER SP R SP NUMBER CRLF
+               {
+                       reply(202, "ALLO command ignored.");
                }
                }
-       |       RETR check_login SP pathname CRLF
-               {
+       | RETR check_login SP pathname CRLF
+               {
                        if ($2 && $4 != NULL)
                        if ($2 && $4 != NULL)
-                               retrieve(0, $4);
+                               retrieve((char *) 0, $4);
                        if ($4 != NULL)
                                free($4);
                }
                        if ($4 != NULL)
                                free($4);
                }
-       |       STOR check_login SP pathname CRLF
-               {
+       | STOR check_login SP pathname CRLF
+               {
                        if ($2 && $4 != NULL)
                        if ($2 && $4 != NULL)
-                               store($4, "w");
+                               store($4, "w", 0);
                        if ($4 != NULL)
                                free($4);
                }
                        if ($4 != NULL)
                                free($4);
                }
-       |       APPE check_login SP pathname CRLF
-               {
+       | APPE check_login SP pathname CRLF
+               {
                        if ($2 && $4 != NULL)
                        if ($2 && $4 != NULL)
-                               store($4, "a");
+                               store($4, "a", 0);
                        if ($4 != NULL)
                                free($4);
                }
                        if ($4 != NULL)
                                free($4);
                }
-       |       NLST check_login CRLF
-               {
+       | NLST check_login CRLF
+               {
                        if ($2)
                        if ($2)
-                               retrieve("/bin/ls", "");
+                               send_file_list(".");
                }
                }
-       |       NLST check_login SP pathname CRLF
-               {
+       | NLST check_login SP STRING CRLF
+               {
                        if ($2 && $4 != NULL)
                        if ($2 && $4 != NULL)
-                               retrieve("/bin/ls %s", $4);
+                               send_file_list($4);
                        if ($4 != NULL)
                                free($4);
                }
                        if ($4 != NULL)
                                free($4);
                }
-       |       LIST check_login CRLF
-               {
+       | LIST check_login CRLF
+               {
                        if ($2)
                        if ($2)
-                               retrieve("/bin/ls -lg", "");
+                               retrieve("/bin/ls -lgA", "");
                }
                }
-       |       LIST check_login SP pathname CRLF
-               {
+       | LIST check_login SP pathname CRLF
+               {
                        if ($2 && $4 != NULL)
                        if ($2 && $4 != NULL)
-                               retrieve("/bin/ls -lg %s", $4);
+                               retrieve("/bin/ls -lgA %s", $4);
                        if ($4 != NULL)
                                free($4);
                }
                        if ($4 != NULL)
                                free($4);
                }
-       |       DELE check_login SP pathname CRLF
-               = {
+       | STAT check_login SP pathname CRLF
+               {
+                       if ($2 && $4 != NULL)
+                               statfilecmd($4);
+                       if ($4 != NULL)
+                               free($4);
+               }
+       | STAT CRLF
+               {
+                       statcmd();
+               }
+       | DELE check_login SP pathname CRLF
+               {
                        if ($2 && $4 != NULL)
                                delete($4);
                        if ($4 != NULL)
                                free($4);
                }
                        if ($2 && $4 != NULL)
                                delete($4);
                        if ($4 != NULL)
                                free($4);
                }
-       |       CWD check_login CRLF
-               = {
+       | RNTO SP pathname CRLF
+               {
+                       if (fromname) {
+                               renamecmd(fromname, $3);
+                               free(fromname);
+                               fromname = (char *) 0;
+                       } else {
+                               reply(503, "Bad sequence of commands.");
+                       }
+                       free($3);
+               }
+       | ABOR CRLF
+               {
+                       reply(225, "ABOR command successful.");
+               }
+       | CWD check_login CRLF
+               {
                        if ($2)
                                cwd(pw->pw_dir);
                }
                        if ($2)
                                cwd(pw->pw_dir);
                }
-       |       CWD check_login SP pathname CRLF
-               {
+       | CWD check_login SP pathname CRLF
+               {
                        if ($2 && $4 != NULL)
                                cwd($4);
                        if ($4 != NULL)
                                free($4);
                }
                        if ($2 && $4 != NULL)
                                cwd($4);
                        if ($4 != NULL)
                                free($4);
                }
-       |       rename_cmd
-       |       HELP CRLF
-               = {
-                       help(0);
+       | HELP CRLF
+               {
+                       help(cmdtab, (char *) 0);
                }
                }
-       |       HELP SP STRING CRLF
-               = {
-                       help($3);
+       | HELP SP STRING CRLF
+               {
+                       char *cp = $3;
+
+                       if (strncasecmp(cp, "SITE", 4) == 0) {
+                               cp = $3 + 4;
+                               if (*cp == ' ')
+                                       cp++;
+                               if (*cp)
+                                       help(sitetab, cp);
+                               else
+                                       help(sitetab, (char *) 0);
+                       } else
+                               help(cmdtab, $3);
                }
                }
-       |       NOOP CRLF
-               {
-                       ack($1);
+       | NOOP CRLF
+               {
+                       reply(200, "NOOP command successful.");
                }
                }
-       |       XMKD check_login SP pathname CRLF
-               {
+       | MKD check_login SP pathname CRLF
+               {
                        if ($2 && $4 != NULL)
                                makedir($4);
                        if ($4 != NULL)
                                free($4);
                }
                        if ($2 && $4 != NULL)
                                makedir($4);
                        if ($4 != NULL)
                                free($4);
                }
-       |       XRMD check_login SP pathname CRLF
-               {
+       | RMD check_login SP pathname CRLF
+               {
                        if ($2 && $4 != NULL)
                                removedir($4);
                        if ($4 != NULL)
                                free($4);
                }
                        if ($2 && $4 != NULL)
                                removedir($4);
                        if ($4 != NULL)
                                free($4);
                }
-       |       XPWD check_login CRLF
-               {
+       | PWD check_login CRLF
+               {
                        if ($2)
                                pwd();
                }
                        if ($2)
                                pwd();
                }
-       |       XCUP check_login CRLF
-               {
+       | CDUP check_login CRLF
+               {
                        if ($2)
                                cwd("..");
                }
                        if ($2)
                                cwd("..");
                }
-       |       QUIT CRLF
-               = {
+       | SITE SP HELP CRLF
+               {
+                       help(sitetab, (char *) 0);
+               }
+       | SITE SP HELP SP STRING CRLF
+               {
+                       help(sitetab, $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($8, $6) < 0)
+                                       perror_reply(550, $8);
+                               else
+                                       reply(200, "CHMOD command successful.");
+                       }
+                       if ($8 != NULL)
+                               free($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)
+                               store($4, "w", 1);
+                       if ($4 != NULL)
+                               free($4);
+               }
+       | SYST CRLF
+               {
+#ifdef unix
+#ifdef 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($4);
+                       if ($4 != NULL)
+                               free($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($4, &stbuf) < 0)
+                                       reply(550, "%s: %s",
+                                           $4, strerror(errno));
+                               else if (!S_ISREG(stbuf.st_mode)) {
+                                       reply(550, "%s: not a plain file.", $4);
+                               } else {
+                                       struct tm *t;
+                                       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($4);
+               }
+       | QUIT CRLF
+               {
                        reply(221, "Goodbye.");
                        reply(221, "Goodbye.");
-                       exit(0);
+                       dologout(0);
                }
                }
-       |       error CRLF
-               {
+       | error CRLF
+               {
                        yyerrok;
                }
        ;
                        yyerrok;
                }
        ;
+rcmd
+       : RNFR check_login SP pathname CRLF
+               {
+                       char *renamefrom();
+
+                       if ($2 && $4) {
+                               fromname = renamefrom($4);
+                               if (fromname == (char *) 0 && $4) {
+                                       free($4);
+                               }
+                       }
+               }
+       ;
 
 
-username:      STRING
+username
+       : STRING
        ;
 
        ;
 
-password:      STRING
+password
+       : /* empty */
+               {
+                       $$ = (char *)calloc(1, sizeof(char));
+               }
+       | STRING
        ;
 
        ;
 
-byte_size:     NUMBER
+byte_size
+       : NUMBER
        ;
 
        ;
 
-host_port:     NUMBER COMMA NUMBER COMMA NUMBER COMMA NUMBER COMMA 
+host_port
+       : NUMBER COMMA NUMBER COMMA NUMBER COMMA NUMBER COMMA
                NUMBER COMMA NUMBER
                NUMBER COMMA NUMBER
-               {
-                       register char *a, *p;
+               {
+                       char *a, *p;
 
                        a = (char *)&data_dest.sin_addr;
                        a[0] = $1; a[1] = $3; a[2] = $5; a[3] = $7;
 
                        a = (char *)&data_dest.sin_addr;
                        a[0] = $1; a[1] = $3; a[2] = $5; a[3] = $7;
@@ -287,147 +523,161 @@ host_port:      NUMBER COMMA NUMBER COMMA NUMBER COMMA NUMBER COMMA
                }
        ;
 
                }
        ;
 
-form_code:     N
-       = {
-               $$ = FORM_N;
-       }
-       |       T
-       = {
-               $$ = FORM_T;
-       }
-       |       C
-       = {
-               $$ = FORM_C;
-       }
-       ;
-
-type_code:     A
-       = {
-               cmd_type = TYPE_A;
-               cmd_form = FORM_N;
-       }
-       |       A SP form_code
-       = {
-               cmd_type = TYPE_A;
-               cmd_form = $3;
-       }
-       |       E
-       = {
-               cmd_type = TYPE_E;
-               cmd_form = FORM_N;
-       }
-       |       E SP form_code
-       = {
-               cmd_type = TYPE_E;
-               cmd_form = $3;
-       }
-       |       I
-       = {
-               cmd_type = TYPE_I;
-       }
-       |       L
-       = {
-               cmd_type = TYPE_L;
-               cmd_bytesz = 8;
-       }
-       |       L SP byte_size
-       = {
-               cmd_type = TYPE_L;
-               cmd_bytesz = $3;
-       }
-       /* this is for a bug in the BBN ftp */
-       |       L byte_size
-       = {
-               cmd_type = TYPE_L;
-               cmd_bytesz = $2;
-       }
+form_code
+       : N
+               {
+                       $$ = FORM_N;
+               }
+       | T
+               {
+                       $$ = FORM_T;
+               }
+       | C
+               {
+                       $$ = FORM_C;
+               }
        ;
 
        ;
 
-struct_code:   F
-       = {
-               $$ = STRU_F;
-       }
-       |       R
-       = {
-               $$ = STRU_R;
-       }
-       |       P
-       = {
-               $$ = STRU_P;
-       }
+type_code
+       : A
+               {
+                       cmd_type = TYPE_A;
+                       cmd_form = FORM_N;
+               }
+       | A SP form_code
+               {
+                       cmd_type = TYPE_A;
+                       cmd_form = $3;
+               }
+       | E
+               {
+                       cmd_type = TYPE_E;
+                       cmd_form = FORM_N;
+               }
+       | E SP form_code
+               {
+                       cmd_type = TYPE_E;
+                       cmd_form = $3;
+               }
+       | I
+               {
+                       cmd_type = TYPE_I;
+               }
+       | L
+               {
+                       cmd_type = TYPE_L;
+                       cmd_bytesz = NBBY;
+               }
+       | L SP byte_size
+               {
+                       cmd_type = TYPE_L;
+                       cmd_bytesz = $3;
+               }
+               /* this is for a bug in the BBN ftp */
+       | L byte_size
+               {
+                       cmd_type = TYPE_L;
+                       cmd_bytesz = $2;
+               }
        ;
 
        ;
 
-mode_code:     S
-       = {
-               $$ = MODE_S;
-       }
-       |       B
-       = {
-               $$ = MODE_B;
-       }
-       |       C
-       = {
-               $$ = MODE_C;
-       }
+struct_code
+       : F
+               {
+                       $$ = STRU_F;
+               }
+       | R
+               {
+                       $$ = STRU_R;
+               }
+       | P
+               {
+                       $$ = STRU_P;
+               }
        ;
 
        ;
 
-pathname:      pathstring
-       = {
-               if ($1 && strncmp($1, "~", 1) == 0) {
-                       $$ = (int)*glob($1);
-                       if (globerr != NULL) {
-                               reply(550, globerr);
-                               $$ = NULL;
-                       }
-                       free($1);
-               } else
-                       $$ = $1;
-       }
+mode_code
+       : S
+               {
+                       $$ = MODE_S;
+               }
+       | B
+               {
+                       $$ = MODE_B;
+               }
+       | C
+               {
+                       $$ = MODE_C;
+               }
        ;
 
        ;
 
-pathstring:    STRING
+pathname
+       : pathstring
+               {
+                       /*
+                        * Problem: this production is used for all pathname
+                        * processing, but only gives a 550 error reply.
+                        * This is a valid reply in some cases but not in others.
+                        */
+                       if (logged_in && $1 && *$1 == '~') {
+                               glob_t gl;
+                               int flags = GLOB_BRACE|GLOB_QUOTE|GLOB_TILDE;
+
+                               memset(&gl, 0, sizeof(gl));
+                               if (glob($1, flags, NULL, &gl)) {
+                                       reply(550, "not found");
+                                       $$ = NULL;
+                               } else {
+                                       $$ = strdup(gl.gl_pathv[0]);
+                               }
+                               globfree(&gl);
+                               free($1);
+                       } else
+                               $$ = $1;
+               }
        ;
 
        ;
 
-rename_cmd:    rename_from rename_to
-       = {
-               if ($1 && $2)
-                       renamecmd($1, $2);
-               else
-                       reply(503, "Bad sequence of commands.");
-               if ($1)
-                       free($1);
-               if ($2)
-                       free($2);
-       }
+pathstring
+       : STRING
        ;
 
        ;
 
-rename_from:   RNFR check_login SP pathname CRLF
-       = {
-               char *from = 0, *renamefrom();
+octal_number
+       : NUMBER
+               {
+                       int ret, dec, multby, digit;
 
 
-               if ($2 && $4)
-                       from = renamefrom($4);
-               if (from == 0 && $4)
-                       free($4);
-               $$ = (int)from;
-       }
+                       /*
+                        * 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;
+               }
        ;
 
        ;
 
-rename_to:     RNTO SP pathname CRLF
-       = {
-               $$ = $3;
-       }
-       ;
 
 
-check_login:   /* empty */
-       = {
-               if (logged_in)
-                       $$ = 1;
-               else {
-                       reply(530, "Please login with USER and PASS.");
-                       $$ = 0;
+check_login
+       : /* empty */
+               {
+                       if (logged_in)
+                               $$ = 1;
+                       else {
+                               reply(530, "Please login with USER and PASS.");
+                               $$ = 0;
+                       }
                }
                }
-       }
        ;
 
 %%
        ;
 
 %%
@@ -438,7 +688,11 @@ extern jmp_buf errcatch;
 #define        ARGS    1       /* expect miscellaneous arguments */
 #define        STR1    2       /* expect SP followed by STRING */
 #define        STR2    3       /* expect STRING */
 #define        ARGS    1       /* expect miscellaneous arguments */
 #define        STR1    2       /* expect SP followed by STRING */
 #define        STR2    3       /* expect STRING */
-#define        OSTR    4       /* optional STRING */
+#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;
@@ -450,12 +704,13 @@ struct tab {
 
 struct tab cmdtab[] = {                /* In order defined in RFC 765 */
        { "USER", USER, STR1, 1,        "<sp> username" },
 
 struct tab cmdtab[] = {                /* In order defined in RFC 765 */
        { "USER", USER, STR1, 1,        "<sp> username" },
-       { "PASS", PASS, STR1, 1,        "<sp> password" },
+       { "PASS", PASS, ZSTR1, 1,       "<sp> password" },
        { "ACCT", ACCT, STR1, 0,        "(specify account)" },
        { "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" },
-       { "PASV", PASV, ARGS, 0,        "(set server in passive mode)" },
+       { "PASV", PASV, ARGS, 1,        "(set server in passive mode)" },
        { "TYPE", TYPE, ARGS, 1,        "<sp> [ A | E | I | L ]" },
        { "STRU", STRU, ARGS, 1,        "(specify file structure)" },
        { "MODE", MODE, ARGS, 1,        "(specify transfer mode)" },
        { "TYPE", TYPE, ARGS, 1,        "<sp> [ A | E | I | L ]" },
        { "STRU", STRU, ARGS, 1,        "(specify file structure)" },
        { "MODE", MODE, ARGS, 1,        "(specify transfer mode)" },
@@ -470,39 +725,63 @@ 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, STR1, 0,        "(restart command)" },
+       { "REST", REST, ARGS, 0,        "(restart command)" },
        { "RNFR", RNFR, STR1, 1,        "<sp> file-name" },
        { "RNTO", RNTO, STR1, 1,        "<sp> file-name" },
        { "RNFR", RNFR, STR1, 1,        "<sp> file-name" },
        { "RNTO", RNTO, STR1, 1,        "<sp> file-name" },
-       { "ABOR", ABOR, ARGS, 0,        "(abort operation)" },
+       { "ABOR", ABOR, ARGS, 1,        "(abort operation)" },
        { "DELE", DELE, STR1, 1,        "<sp> file-name" },
        { "DELE", DELE, STR1, 1,        "<sp> file-name" },
-       { "CWD",  CWD,  OSTR, 1,        "[ <sp> directory-name]" },
+       { "CWD",  CWD,  OSTR, 1,        "[ <sp> directory-name ]" },
        { "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)" },
-       { "STAT", STAT, OSTR, 0,        "(get server status)" },
+       { "SITE", SITE, SITECMD, 1,     "site-cmd [ <sp> arguments ]" },
+       { "SYST", SYST, ARGS, 1,        "(get type of operating system)" },
+       { "STAT", STAT, OSTR, 1,        "[ <sp> path-name ]" },
        { "HELP", HELP, OSTR, 1,        "[ <sp> <string> ]" },
        { "NOOP", NOOP, ARGS, 1,        "" },
        { "HELP", HELP, OSTR, 1,        "[ <sp> <string> ]" },
        { "NOOP", NOOP, ARGS, 1,        "" },
-       { "XMKD", XMKD, STR1, 1,        "<sp> path-name" },
-       { "XRMD", XRMD, STR1, 1,        "<sp> path-name" },
-       { "XPWD", XPWD, ARGS, 1,        "(return current directory)" },
-       { "XCUP", XCUP, ARGS, 1,        "(change to parent directory)" },
+       { "MKD",  MKD,  STR1, 1,        "<sp> path-name" },
+       { "XMKD", MKD,  STR1, 1,        "<sp> path-name" },
+       { "RMD",  RMD,  STR1, 1,        "<sp> path-name" },
+       { "XRMD", RMD,  STR1, 1,        "<sp> path-name" },
+       { "PWD",  PWD,  ARGS, 1,        "(return current directory)" },
+       { "XPWD", PWD,  ARGS, 1,        "(return current directory)" },
+       { "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 }
 };
 
        { NULL,   0,    0,    0,        0 }
 };
 
-struct tab *
-lookup(cmd)
+static char    *copy __P((char *));
+static void     help __P((struct tab *, char *));
+static struct tab *
+                lookup __P((struct tab *, char *));
+static void     sizecmd __P((char *));
+static void     toolong __P((int));
+static int      yylex __P((void));
+
+static struct tab *
+lookup(p, cmd)
+       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);
 }
 
-#include "../telnet/telnet.h"
+#include <arpa/telnet.h>
 
 /*
  * getline - a hacked up version of fgets to ignore TELNET escape codes.
 
 /*
  * getline - a hacked up version of fgets to ignore TELNET escape codes.
@@ -510,37 +789,98 @@ lookup(cmd)
 char *
 getline(s, n, iop)
        char *s;
 char *
 getline(s, n, iop)
        char *s;
-       register FILE *iop;
+       int n;
+       FILE *iop;
 {
 {
-       register c;
+       int c;
        register char *cs;
 
        cs = s;
        register char *cs;
 
        cs = s;
-       while (--n > 0 && (c = getc(iop)) >= 0) {
-               while (c == IAC) {
-                       c = getc(iop);  /* skip command */
-                       c = getc(iop);  /* try next char */
+/* tmpline may contain saved command from urgent mode interruption */
+       for (c = 0; tmpline[c] != '\0' && --n > 0; ++c) {
+               *cs++ = tmpline[c];
+               if (tmpline[c] == '\n') {
+                       *cs++ = '\0';
+                       if (debug)
+                               syslog(LOG_DEBUG, "command: %s", s);
+                       tmpline[0] = '\0';
+                       return(s);
+               }
+               if (c == 0)
+                       tmpline[0] = '\0';
+       }
+       while ((c = getc(iop)) != EOF) {
+               c &= 0377;
+               if (c == IAC) {
+                   if ((c = getc(iop)) != EOF) {
+                       c &= 0377;
+                       switch (c) {
+                       case WILL:
+                       case WONT:
+                               c = getc(iop);
+                               printf("%c%c%c", IAC, DONT, 0377&c);
+                               (void) fflush(stdout);
+                               continue;
+                       case DO:
+                       case DONT:
+                               c = getc(iop);
+                               printf("%c%c%c", IAC, WONT, 0377&c);
+                               (void) fflush(stdout);
+                               continue;
+                       case IAC:
+                               break;
+                       default:
+                               continue;       /* ignore command */
+                       }
+                   }
                }
                *cs++ = c;
                }
                *cs++ = c;
-               if (c=='\n')
+               if (--n <= 0 || c == '\n')
                        break;
        }
                        break;
        }
-       if (c < 0 && cs == s)
+       if (c == EOF && cs == s)
                return (NULL);
        *cs++ = '\0';
                return (NULL);
        *cs++ = '\0';
-       fprintf(stderr, "FTPD: command: %s", s);
-       if (c != '\n')
-               putc('\n', stderr);
-       fflush(stderr);
+       if (debug) {
+               if (!guest && strncasecmp("pass ", s, 5) == 0) {
+                       /* Don't syslog passwords */
+                       syslog(LOG_DEBUG, "command: %.5s ???", s);
+               } else {
+                       register char *cp;
+                       register int len;
+
+                       /* Don't syslog trailing CR-LF */
+                       len = strlen(s);
+                       cp = s + len - 1;
+                       while (cp >= s && (*cp == '\n' || *cp == '\r')) {
+                               --cp;
+                               --len;
+                       }
+                       syslog(LOG_DEBUG, "command: %.*s", len, s);
+               }
+       }
        return (s);
 }
 
        return (s);
 }
 
+static void
+toolong(signo)
+       int signo;
+{
+
+       reply(421,
+           "Timeout (%d seconds): closing control connection.", timeout);
+       if (logging)
+               syslog(LOG_INFO, "User %s timed out after %d seconds",
+                   (pw ? pw -> pw_name : "unknown"), timeout);
+       dologout(1);
+}
+
+static int
 yylex()
 {
 yylex()
 {
-       static char cbuf[512];
        static int cpos, state;
        static int cpos, state;
-       register char *cp;
-       register struct tab *p;
+       char *cp, *cp2;
+       struct tab *p;
        int n;
        char c;
 
        int n;
        char c;
 
@@ -548,33 +888,67 @@ yylex()
                switch (state) {
 
                case CMD:
                switch (state) {
 
                case CMD:
+                       (void) signal(SIGALRM, toolong);
+                       (void) alarm((unsigned) timeout);
                        if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
                                reply(221, "You could at least say goodbye.");
                        if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
                                reply(221, "You could at least say goodbye.");
-                               exit(0);
+                               dologout(0);
                        }
                        }
-                       if (index(cbuf, '\r')) {
-                               cp = index(cbuf, '\r');
-                               cp[0] = '\n'; cp[1] = 0;
+                       (void) alarm(0);
+#ifdef SETPROCTITLE
+                       if (strncasecmp(cbuf, "PASS", 4) != NULL)
+                               setproctitle("%s: %s", proctitle, cbuf);
+#endif /* SETPROCTITLE */
+                       if ((cp = strchr(cbuf, '\r'))) {
+                               *cp++ = '\n';
+                               *cp = '\0';
                        }
                        }
-                       if (index(cbuf, ' '))
-                               cpos = index(cbuf, ' ') - cbuf;
-                       else
+                       if ((cp = strpbrk(cbuf, " \n")))
+                               cpos = cp - cbuf;
+                       if (cpos == 0)
                                cpos = 4;
                        c = cbuf[cpos];
                        cbuf[cpos] = '\0';
                        upper(cbuf);
                                cpos = 4;
                        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;
+                               yylval.s = 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);
                                        nack(p->name);
-                                       longjmp(errcatch);
+                                       longjmp(errcatch,0);
                                        /* NOTREACHED */
                                }
                                state = p->state;
                                        /* NOTREACHED */
                                }
                                state = p->state;
-                               yylval = (int) p->name;
+                               yylval.s = p->name;
                                return (p->token);
                        }
                                return (p->token);
                        }
+                       state = CMD;
                        break;
 
                case OSTR:
                        break;
 
                case OSTR:
@@ -582,16 +956,25 @@ yylex()
                                state = CMD;
                                return (CRLF);
                        }
                                state = CMD;
                                return (CRLF);
                        }
-                       /* FALL THRU */
+                       /* FALLTHROUGH */
 
                case STR1:
 
                case STR1:
+               case ZSTR1:
+               dostr1:
                        if (cbuf[cpos] == ' ') {
                                cpos++;
                        if (cbuf[cpos] == ' ') {
                                cpos++;
-                               state = STR2;
+                               state = state == OSTR ? STR2 : ++state;
                                return (SP);
                        }
                        break;
 
                                return (SP);
                        }
                        break;
 
+               case ZSTR2:
+                       if (cbuf[cpos] == '\n') {
+                               state = CMD;
+                               return (CRLF);
+                       }
+                       /* FALLTHROUGH */
+
                case STR2:
                        cp = &cbuf[cpos];
                        n = strlen(cp);
                case STR2:
                        cp = &cbuf[cpos];
                        n = strlen(cp);
@@ -601,13 +984,32 @@ yylex()
                         */
                        if (n > 1 && cbuf[cpos] == '\n') {
                                cbuf[cpos] = '\0';
                         */
                        if (n > 1 && cbuf[cpos] == '\n') {
                                cbuf[cpos] = '\0';
-                               yylval = copy(cp);
+                               yylval.s = 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.i = 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];
@@ -615,7 +1017,7 @@ yylex()
                                        ;
                                c = cbuf[cpos];
                                cbuf[cpos] = '\0';
                                        ;
                                c = cbuf[cpos];
                                cbuf[cpos] = '\0';
-                               yylval = atoi(cp);
+                               yylval.i = atoi(cp);
                                cbuf[cpos] = c;
                                return (NUMBER);
                        }
                                cbuf[cpos] = c;
                                return (NUMBER);
                        }
@@ -685,12 +1087,13 @@ yylex()
                default:
                        fatal("Unknown state in scanner.");
                }
                default:
                        fatal("Unknown state in scanner.");
                }
-               yyerror();
+               yyerror((char *) 0);
                state = CMD;
                state = CMD;
-               longjmp(errcatch);
+               longjmp(errcatch,0);
        }
 }
 
        }
 }
 
+void
 upper(s)
        char *s;
 {
 upper(s)
        char *s;
 {
@@ -701,55 +1104,60 @@ upper(s)
        }
 }
 
        }
 }
 
+static char *
 copy(s)
        char *s;
 {
        char *p;
 copy(s)
        char *s;
 {
        char *p;
-       extern char *malloc();
 
 
-       p = malloc(strlen(s) + 1);
+       p = malloc((unsigned) strlen(s) + 1);
        if (p == NULL)
                fatal("Ran out of memory.");
        if (p == NULL)
                fatal("Ran out of memory.");
-       strcpy(p, s);
-       return ((int)p);
+       (void) strcpy(p, s);
+       return (p);
 }
 
 }
 
-help(s)
+static void
+help(ctab, s)
+       struct tab *ctab;
        char *s;
 {
        char *s;
 {
-       register struct tab *c;
-       register int width, NCMDS;
+       struct tab *c;
+       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++) {
+       for (c = ctab; c->name != NULL; c++) {
                int len = strlen(c->name);
 
                int len = strlen(c->name);
 
-               if (c->implemented == 0)
-                       len++;
                if (len > width)
                        width = len;
                NCMDS++;
        }
        width = (width + 8) &~ 7;
        if (s == 0) {
                if (len > width)
                        width = len;
                NCMDS++;
        }
        width = (width + 8) &~ 7;
        if (s == 0) {
-               register int i, j, w;
+               int i, j, w;
                int columns, lines;
 
                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;
                lines = (NCMDS + columns - 1) / columns;
                for (i = 0; i < lines; i++) {
                columns = 76 / width;
                if (columns == 0)
                        columns = 1;
                lines = (NCMDS + columns - 1) / columns;
                for (i = 0; i < lines; i++) {
-                       printf("    ");
+                       printf("   ");
                        for (j = 0; j < columns; j++) {
                        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;
                                        break;
-                               w = strlen(c->name);
+                               w = strlen(c->name) + 1;
                                while (w < width) {
                                        putchar(' ');
                                        w++;
                                while (w < width) {
                                        putchar(' ');
                                        w++;
@@ -757,18 +1165,63 @@ help(s)
                        }
                        printf("\r\n");
                }
                        }
                        printf("\r\n");
                }
-               fflush(stdout);
+               (void) fflush(stdout);
                reply(214, "Direct comments to ftp-bugs@%s.", hostname);
                return;
        }
        upper(s);
                reply(214, "Direct comments to ftp-bugs@%s.", hostname);
                return;
        }
        upper(s);
-       c = lookup(s);
+       c = lookup(ctab, s);
        if (c == (struct tab *)0) {
        if (c == (struct tab *)0) {
-               reply(504, "Unknown command %s.", s);
+               reply(502, "Unknown command %s.", s);
                return;
        }
        if (c->implemented)
                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);
+}
+
+static void
+sizecmd(filename)
+       char *filename;
+{
+       switch (type) {
+       case TYPE_L:
+       case TYPE_I: {
+               struct stat stbuf;
+               if (stat(filename, &stbuf) < 0 || !S_ISREG(stbuf.st_mode))
+                       reply(550, "%s: not a plain file.", filename);
+               else
+                       reply(213, "%qu", stbuf.st_size);
+               break; }
+       case TYPE_A: {
+               FILE *fin;
+               int c;
+               off_t count;
+               struct stat stbuf;
+               fin = fopen(filename, "r");
+               if (fin == NULL) {
+                       perror_reply(550, filename);
+                       return;
+               }
+               if (fstat(fileno(fin), &stbuf) < 0 || !S_ISREG(stbuf.st_mode)) {
+                       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, "%qd", count);
+               break; }
+       default:
+               reply(504, "SIZE not implemented for Type %c.", "?AEIL"[type]);
+       }
 }
 }