i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* rearranged quoted C code such that the first reference of a token

Browse Source 
happens after the tokens have been declared - this fixes #3137 for good
  (without ftpcmd.y depending on itself)

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31401 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2009-07-03 21:31:28 +00:00
parent cc13762f11
commit 55108a8e90
1 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/network/ftpd/ftpcmd.y
+43 -43
View File
@@ -76,10 +76,6 @@ __FBSDID("$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.66 2007/04/18 22:43:39 yar Exp
#include "extern.h" #include "extern.h"
#include "pathnames.h" #include "pathnames.h"
#ifdef YYPULL
#include "ftpcmd.h"
#endif
extern union sockunion data_dest, his_addr; extern union sockunion data_dest, his_addr;
extern int hostinfo; extern int hostinfo;
extern int logged_in; extern int logged_in;
@@ -130,6 +126,49 @@ extern int epsvall;
#define MAXASIZE 10240 /* Deny ASCII SIZE on files larger than that */ #define MAXASIZE 10240 /* Deny ASCII SIZE on files larger than that */
%}
%union {
struct {
off_t o;
int i;
} u;
char *s;
}
%token
A B C E F I
L N P R S T
ALL
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
STAT HELP NOOP MKD RMD PWD
CDUP STOU SMNT SYST SIZE MDTM
LPRT LPSV EPRT EPSV FEAT
UMASK IDLE CHMOD MDFIVE
LEXERR NOTIMPL
%token <s> STRING
%token <u> NUMBER
%type <u.i> check_login octal_number byte_size
%type <u.i> check_login_ro check_login_epsv
%type <u.i> struct_code mode_code type_code form_code
%type <s> pathstring pathname password username
%type <s> ALL NOTIMPL
%start cmd_list
%{
struct tab { struct tab {
char *name; char *name;
short token; short token;
@@ -223,45 +262,6 @@ static int yylex(void);
%} %}
%union {
struct {
off_t o;
int i;
} u;
char *s;
}
%token
A B C E F I
L N P R S T
ALL
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
STAT HELP NOOP MKD RMD PWD
CDUP STOU SMNT SYST SIZE MDTM
LPRT LPSV EPRT EPSV FEAT
UMASK IDLE CHMOD MDFIVE
LEXERR NOTIMPL
%token <s> STRING
%token <u> NUMBER
%type <u.i> check_login octal_number byte_size
%type <u.i> check_login_ro check_login_epsv
%type <u.i> struct_code mode_code type_code form_code
%type <s> pathstring pathname password username
%type <s> ALL NOTIMPL
%start cmd_list
%% %%
cmd_list cmd_list