From 55108a8e90e8a88f9ddab135aa7bbf2e38e8180c Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Fri, 3 Jul 2009 21:31:28 +0000
Subject: [PATCH] * rearranged quoted C code such that the first reference of a
 token   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
---
 src/bin/network/ftpd/ftpcmd.y | 86 +++++++++++++++++------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/bin/network/ftpd/ftpcmd.y b/src/bin/network/ftpd/ftpcmd.y
index 7a65a27d97..e081551b19 100644
--- a/src/bin/network/ftpd/ftpcmd.y
+++ b/src/bin/network/ftpd/ftpcmd.y
@@ -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 "pathnames.h"
 
-#ifdef YYPULL
-#include "ftpcmd.h"
-#endif
-
 extern	union sockunion data_dest, his_addr;
 extern	int hostinfo;
 extern	int logged_in;
@@ -130,6 +126,49 @@ extern int epsvall;
 
 #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 {
 	char	*name;
 	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