[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 445a99b22a
|
From: |
Giuseppe Scrivano |
|
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 445a99b22aea4649b754104185d43e717cbb8cb1 |
|
Date: |
Sun, 01 Nov 2009 00:04:11 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".
The branch, master has been updated
via 445a99b22aea4649b754104185d43e717cbb8cb1 (commit)
via 9a17c72d56791d9517bde1ce9d45d843b2d27031 (commit)
from 770c3f305cd6ca376e3152a27aa91a3e2da67402 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 445a99b22aea4649b754104185d43e717cbb8cb1
Author: Giuseppe Scrivano <address@hidden>
Date: Sun Nov 1 00:57:59 2009 +0100
Fix build problems under Windows.
diff --git a/myserver/include/base/hash_map/hash_map.h
b/myserver/include/base/hash_map/hash_map.h
index 13d0a03..fe9b7f9 100644
--- a/myserver/include/base/hash_map/hash_map.h
+++ b/myserver/include/base/hash_map/hash_map.h
@@ -1,7 +1,7 @@
/* -*- mode: c++ -*- */
/*
MyServer
-Copyright © 2005, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
@@ -24,6 +24,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#ifndef HASHMAP_H
# define HASHMAP_H
+# include "stdafx.h"
# include <list>
# include <vector>
# include <string>
diff --git a/myserver/include/base/process/fork_server.h
b/myserver/include/base/process/fork_server.h
index bed2832..2f1e9ca 100644
--- a/myserver/include/base/process/fork_server.h
+++ b/myserver/include/base/process/fork_server.h
@@ -15,12 +15,17 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef FORK_SERVER_H
+# define FORK_SERVER_H
+
+# include "stdafx.h"
+
+#ifndef WIN32
+# include <unistd.h>
+#endif
-#include <unistd.h>
#include <include/base/unix_socket/unix_socket.h>
-#ifndef FORK_SERVER_H
-# define FORK_SERVER_H
struct StartProcInfo;
diff --git a/myserver/include/base/process/process_server_manager.h
b/myserver/include/base/process/process_server_manager.h
index 0cb2502..cbcaa98 100644
--- a/myserver/include/base/process/process_server_manager.h
+++ b/myserver/include/base/process/process_server_manager.h
@@ -20,6 +20,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
# define PROCESS_SERVER_MANAGER_H
# include "stdafx.h"
+
# include <include/base/utility.h>
# include <include/base/socket/socket.h>
# include <include/connection/connection.h>
@@ -37,7 +38,7 @@ class ProcessServerManager
public:
struct Server
{
- /*! Server executable path. */
+ /* Server executable path. */
string path;
union
diff --git a/myserver/include/base/read_directory/read_directory.h
b/myserver/include/base/read_directory/read_directory.h
index 78a9ac3..794cc61 100644
--- a/myserver/include/base/read_directory/read_directory.h
+++ b/myserver/include/base/read_directory/read_directory.h
@@ -81,11 +81,11 @@ public:
private:
int find (const char *filename);
+ string dirName;
# ifdef WIN32
_finddata_t fd;
intptr_t ff;
# else
- string dirName;
DIR *dh;
struct stat stats;
diff --git a/myserver/include/base/socket/socket.h
b/myserver/include/base/socket/socket.h
index 70d2af0..4f1e495 100644
--- a/myserver/include/base/socket/socket.h
+++ b/myserver/include/base/socket/socket.h
@@ -57,7 +57,6 @@ typedef SOCKET SocketHandle;
typedef int SocketHandle;
# endif
-
# ifdef INET6_ADDRSTRLEN
# define MAX_IP_STRING_LEN INET6_ADDRSTRLEN
# else
diff --git a/myserver/include/log/log_manager.h
b/myserver/include/log/log_manager.h
index 218b2c9..494bf29 100644
--- a/myserver/include/log/log_manager.h
+++ b/myserver/include/log/log_manager.h
@@ -19,7 +19,8 @@
#ifndef LOG_MANAGER_H
# define LOG_MANAGER_H
-# include <algorithm>
+# include "stdafx.h"
+
# include <map>
# include <string>
@@ -29,6 +30,7 @@
# include <include/log/stream/log_stream_factory.h>
# include <cstdarg>
+# include <algorithm>
using namespace std;
diff --git a/myserver/include/protocol/ftp/ftp.h
b/myserver/include/protocol/ftp/ftp.h
index a930d17..581191b 100644
--- a/myserver/include/protocol/ftp/ftp.h
+++ b/myserver/include/protocol/ftp/ftp.h
@@ -32,6 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
# include <include/conf/security/security_token.h>
class Ftp;
+#undef stat
+
class FtpuserData:public ProtocolBuffer
{
public:
diff --git a/myserver/src/base/file/file.cpp b/myserver/src/base/file/file.cpp
index c973f7a..3d1783d 100644
--- a/myserver/src/base/file/file.cpp
+++ b/myserver/src/base/file/file.cpp
@@ -71,7 +71,7 @@ const u_long File::NO_INHERIT = (1<<8);
*/
File::File ()
{
- handle = -1;
+ handle = (FileHandle) -1;
}
/*!
@@ -114,7 +114,7 @@ int File::writeToFile (const char* buffer, u_long
buffersize, u_long* nbw)
*\param opt Specify how open the file.
*/
File::File (char *nfilename, int opt)
- : handle (-1)
+ : handle ((FileHandle)-1)
{
openFile (nfilename, opt);
}
@@ -319,7 +319,7 @@ int File::createTemporaryFile (const char* filename)
int File::close ()
{
int ret = 0;
- if (handle != -1)
+ if (handle != (FileHandle) -1)
{
#ifdef WIN32
ret = !FlushFileBuffers (handle);
@@ -330,7 +330,7 @@ int File::close ()
#endif
}
filename.clear ();
- handle = -1;
+ handle = (FileHandle) -1;
return ret;
}
diff --git a/myserver/src/base/pipe/pipe.cpp b/myserver/src/base/pipe/pipe.cpp
index 8c0f342..ff8498e 100644
--- a/myserver/src/base/pipe/pipe.cpp
+++ b/myserver/src/base/pipe/pipe.cpp
@@ -230,7 +230,7 @@ Pipe::Pipe ()
#ifndef WIN32
handles[0] = handles[1] = -1;
#else
- readHandle = writeHandle = -1;
+ readHandle = writeHandle = (HANDLE) -1;
#endif
}
@@ -252,7 +252,7 @@ void Pipe::closeRead ()
#else
if (readHandle >= 0)
CloseHandle (readHandle);
- readHandle = -1;
+ readHandle = (HANDLE) -1;
#endif
}
@@ -269,7 +269,7 @@ void Pipe::closeWrite ()
#else
if (writeHandle >= 0)
CloseHandle (writeHandle);
- writeHandle = -1;
+ writeHandle = (HANDLE) -1;
#endif
}
diff --git a/myserver/src/base/process/process_server_manager.cpp
b/myserver/src/base/process/process_server_manager.cpp
index 74e8c19..959989c 100644
--- a/myserver/src/base/process/process_server_manager.cpp
+++ b/myserver/src/base/process/process_server_manager.cpp
@@ -14,15 +14,18 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
+#include <include/base/process/process_server_manager.h>
+
#include <include/server/server.h>
#include <include/base/process/process.h>
-#include <include/base/process/process_server_manager.h>
#include <string>
#include <sstream>
+
using namespace std;
/*!
- *Default constructor.
+ * Default constructor.
*/
ProcessServerManager::ProcessServerManager ()
{
@@ -32,7 +35,7 @@ ProcessServerManager::ProcessServerManager ()
}
/*!
- *Default destructor.
+ * Default destructor.
*/
ProcessServerManager::~ProcessServerManager ()
{
@@ -40,7 +43,7 @@ ProcessServerManager::~ProcessServerManager ()
}
/*!
- *Load the class.
+ * Load the class.
*/
void ProcessServerManager::load ()
{
@@ -172,7 +175,7 @@ ProcessServerManager::createDomain (const char* name)
}
/*!
- *Clear the used memory.
+ * Clear the used memory.
*/
void ProcessServerManager::clear ()
{
@@ -213,10 +216,10 @@ void ProcessServerManager::clear ()
}
/*!
- *Get a server is running by its domain and name.
- *\param domain The domain name.
- *\param name The server name name.
- *\param seed Random seed to use for choosing a server.
+ * Get a server is running by its domain and name.
+ * \param domain The domain name.
+ * \param name The server name name.
+ * \param seed Random seed to use for choosing a server.
*/
ProcessServerManager::Server*
ProcessServerManager::getServer (const char* domain, const char* name, int
seed)
@@ -256,10 +259,10 @@ ProcessServerManager::getServer (const char* domain,
const char* name, int seed)
}
/*!
- *Add a server to the manager.
- *\param server The server object.
- *\param domain The server's domain.
- *\param name The server's name.
+ * Add a server to the manager.
+ * \param server The server object.
+ * \param domain The server's domain.
+ * \param name The server's name.
*/
void ProcessServerManager::addServer (ProcessServerManager::Server* server,
const char* domain, const char* name)
@@ -283,11 +286,11 @@ void ProcessServerManager::addServer
(ProcessServerManager::Server* server,
}
/*!
- *Add a remote server.
- *\param domain The server's domain name.
- *\param name The server name.
- *\param host The host name to connect to.
- *\param port The port number to use for the connection.
+ * Add a remote server.
+ * \param domain The server's domain name.
+ * \param name The server name.
+ * \param host The host name to connect to.
+ * \param port The port number to use for the connection.
*/
ProcessServerManager::Server*
ProcessServerManager::addRemoteServer (const char* domain, const char* name,
@@ -304,8 +307,8 @@ ProcessServerManager::addRemoteServer (const char* domain,
const char* name,
}
/*!
- *Remove a domain by its name.
- *\param domain The domain name.
+ * Remove a domain by its name.
+ * \param domain The domain name.
*/
void ProcessServerManager::removeDomain (const char* domain)
{
@@ -346,8 +349,8 @@ void ProcessServerManager::removeDomain (const char* domain)
}
/*!
- *Count how many servers are present in a domain.
- *\param domain The server domain.
+ * Count how many servers are present in a domain.
+ * \param domain The server domain.
*/
int ProcessServerManager::domainServers (const char* domain)
{
@@ -356,13 +359,13 @@ int ProcessServerManager::domainServers (const char*
domain)
}
/*!
- *Run and add a server to the collection.
- *\param domain The server's domain.
- *\param path The path to the executable.
- *\param chroot The new process chroot.
- *\param uid User id to use for the new process.
- *\param gid Group id to use for the new process.
- *\param port Port to use for the server.
+ * Run and add a server to the collection.
+ * \param domain The server's domain.
+ * \param path The path to the executable.
+ * \param chroot The new process chroot.
+ * \param uid User id to use for the new process.
+ * \param gid Group id to use for the new process.
+ * \param port Port to use for the server.
*/
ProcessServerManager::Server*
ProcessServerManager::runAndAddServer (const char *domain, const char *path,
@@ -381,13 +384,13 @@ ProcessServerManager::runAndAddServer (const char
*domain, const char *path,
}
/*!
- *Run a new server.
- *\param server The server object.
- *\param path The path to the executable.
- *\param port The listening port.
- *\param chroot The new process chroot.
- *\param uid User id to use for the new process.
- *\param gid Group id to use for the new process.
+ * Run a new server.
+ * \param server The server object.
+ * \param path The path to the executable.
+ * \param port The listening port.
+ * \param chroot The new process chroot.
+ * \param uid User id to use for the new process.
+ * \param gid Group id to use for the new process.
*/
int ProcessServerManager::runServer (ProcessServerManager::Server* server,
const char* path, u_short port,
@@ -510,9 +513,9 @@ int ProcessServerManager::runServer
(ProcessServerManager::Server* server,
}
/*!
- *Get a client socket in the fCGI context structure
- *\param sock The socket to connect.
- *\param server The server to connect to.
+ * Get a client socket in the fCGI context structure
+ * \param sock The socket to connect.
+ * \param server The server to connect to.
*/
int ProcessServerManager::connect (Socket* sock,
ProcessServerManager::Server* server )
@@ -525,11 +528,11 @@ int ProcessServerManager::connect (Socket* sock,
if (!serverSock.ss_family || serverSock.ss_family == AF_INET ||
!server->isLocal)
{
- /*! Try to create the socket. */
+ /* Try to create the socket. */
if (sock->socket (AF_INET, SOCK_STREAM, 0) == -1)
return -1;
- /*! If the socket was created try to connect. */
+ /* If the socket was created try to connect. */
if (sock->connect (server->host.c_str (), server->port) == -1)
{
sock->close ();
@@ -540,10 +543,10 @@ int ProcessServerManager::connect (Socket* sock,
#if ( HAVE_IPV6 && false )/* IPv6 communication not implemented yet by php. */
else if ( serverSock.ss_family == AF_INET6 )
{
- /*! Try to create the socket. */
+ /* Try to create the socket. */
if (sock->socket (AF_INET6, SOCK_STREAM, 0) == -1)
return -1;
- /*! If the socket was created try to connect. */
+ /* If the socket was created try to connect. */
if (sock->connect (server->host, server->port) == -1)
{
sock->close ();
diff --git a/myserver/src/base/socket/socket.cpp
b/myserver/src/base/socket/socket.cpp
index 6281af4..3c13aa3 100644
--- a/myserver/src/base/socket/socket.cpp
+++ b/myserver/src/base/socket/socket.cpp
@@ -32,6 +32,7 @@ extern "C"
# include <netinet/in.h>
# include <arpa/inet.h>
#endif
+
#include <errno.h>
}
@@ -223,8 +224,8 @@ int Socket::close ()
ret = ::closesocket (socketHandle);
#else
ret = ::close (socketHandle);
- }
#endif
+ }
socketHandle = -1;
return ret;
}
@@ -232,7 +233,7 @@ int Socket::close ()
/*!
*Returns an host by its address.
*/
-MYSERVER_HOSTENT *Socket::gethostbyaddr (char* addr,int len,int type)
+MYSERVER_HOSTENT *Socket::gethostbyaddr (char* addr, int len, int type)
{
#ifdef WIN32
HOSTENT *he = ::gethostbyaddr (addr,len,type);
diff --git a/myserver/src/base/unix_socket/unix_socket.cpp
b/myserver/src/base/unix_socket/unix_socket.cpp
index 16558b6..3dc4e46 100644
--- a/myserver/src/base/unix_socket/unix_socket.cpp
+++ b/myserver/src/base/unix_socket/unix_socket.cpp
@@ -121,9 +121,7 @@ Socket* UnixSocket::accept ()
socklen_t len = sizeof (addr);
return Socket::accept ((MYSERVER_SOCKADDR*)&addr, &len);
#else
- Socket s;
- s.setHandle (-1);
- return s;
+ return new Socket ((SocketHandle)-1);
#endif
}
diff --git a/myserver/src/conf/nodetree.cpp b/myserver/src/conf/nodetree.cpp
index df92532..9baea68 100644
--- a/myserver/src/conf/nodetree.cpp
+++ b/myserver/src/conf/nodetree.cpp
@@ -15,6 +15,7 @@ You should have received a copy of the GNU General Public
License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "stdafx.h"
#include <list>
#include <stdlib.h>
#include <string.h>
diff --git a/myserver/src/conf/vhost/vhost.cpp
b/myserver/src/conf/vhost/vhost.cpp
index 869459e..0249ba5 100644
--- a/myserver/src/conf/vhost/vhost.cpp
+++ b/myserver/src/conf/vhost/vhost.cpp
@@ -15,6 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "stdafx.h"
#include <include/conf/vhost/vhost.h>
#include <include/base/file/file.h>
#include <include/base/file/files_utility.h>
diff --git a/myserver/src/conf/xml_conf.cpp b/myserver/src/conf/xml_conf.cpp
index ee8979f..ab9952d 100644
--- a/myserver/src/conf/xml_conf.cpp
+++ b/myserver/src/conf/xml_conf.cpp
@@ -15,6 +15,7 @@ You should have received a copy of the GNU General Public
License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "stdafx.h"
#include <list>
#include <stdlib.h>
#include <string.h>
@@ -22,14 +23,13 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#include <include/conf/xml_conf.h>
-
/*!
- *Read a forest of trees (structured objects) from XML.
+ * Read a forest of trees (structured objects) from XML.
*
- *\param root The XML document root.
- *\param rootNodes All the stored top-level objects.
- *\param hashedData Access node by a name.
- *\return 0 on success.
+ * \param root The XML document root.
+ * \param rootNodes All the stored top-level objects.
+ * \param hashedData Access node by a name.
+ * \return 0 on success.
*/
int XmlConf::build (xmlNodePtr root,
list<NodeTree<string>*> *rootNodes,
diff --git a/myserver/src/connection/connection.cpp
b/myserver/src/connection/connection.cpp
index 3879ba6..d5bb4f0 100644
--- a/myserver/src/connection/connection.cpp
+++ b/myserver/src/connection/connection.cpp
@@ -15,6 +15,7 @@ You should have received a copy of the GNU General Public
License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "stdafx.h"
#include <include/connection/connection.h>
#include <include/conf/vhost/vhost.h>
diff --git a/myserver/src/filter/console.cpp b/myserver/src/filter/console.cpp
index 1c0a4b3..d1fc084 100644
--- a/myserver/src/filter/console.cpp
+++ b/myserver/src/filter/console.cpp
@@ -15,6 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "stdafx.h"
#include <include/filter/console.h>
Console::Console () : Stream ()
diff --git a/myserver/src/http_handler/isapi/isapi.cpp
b/myserver/src/http_handler/isapi/isapi.cpp
index a1f010f..1a0b81e 100644
--- a/myserver/src/http_handler/isapi/isapi.cpp
+++ b/myserver/src/http_handler/isapi/isapi.cpp
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public
License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+#include "stdafx.h"
#include <include/http_handler/isapi/isapi.h>
#include <include/protocol/http/http.h>
#include <include/server/server.h>
@@ -280,7 +280,7 @@ BOOL WINAPI ISAPI_WriteClientExport (HCONN hConn, LPVOID
Buffer, LPDWORD lpdwByt
}
}
else
- ConnInfo->td->response.connection.assign ("Close");
+ ConnInfo->td->response.setValue ("Connection", "Close");
u_long hdrLen = HttpHeaders::buildHTTPResponseHeader
((char*)ConnInfo->td->secondaryBuffer->getBuffer (),
&(ConnInfo->td->response));
@@ -293,7 +293,8 @@ BOOL WINAPI ISAPI_WriteClientExport (HCONN hConn, LPVOID
Buffer, LPDWORD lpdwByt
ConnInfo->headerSent=1;
/*! If only the header was requested return. */
- if (ConnInfo->headerSent && ConnInfo->onlyHeader ||
ConnInfo->td->response.getStatusType () == HttpResponseHeader::SUCCESSFUL)
+ if (ConnInfo->headerSent && ConnInfo->onlyHeader
+ || ConnInfo->td->response.getStatusType () ==
HttpResponseHeader::SUCCESSFUL)
return 0;
/*!Send the first chunk. */
@@ -932,9 +933,9 @@ int Isapi::send (HttpThreadContext* td,
appHnd.close ();
- ostringstream tmp;
- tmp << connTable[connIndex].dataSent;
- connTable[connIndex].td->response.contentLength.assign (tmp.str ());
+ ostringstream tmps;
+ tmps << connTable[connIndex].dataSent;
+ connTable[connIndex].td->response.contentLength.assign (tmps.str ());
connTable[connIndex].chain.clearAllFilters ();
connTable[connIndex].Allocated = 0;
return retvalue;
diff --git a/myserver/src/http_handler/wincgi/wincgi.cpp
b/myserver/src/http_handler/wincgi/wincgi.cpp
index d4a0d2b..f19b397 100644
--- a/myserver/src/http_handler/wincgi/wincgi.cpp
+++ b/myserver/src/http_handler/wincgi/wincgi.cpp
@@ -334,7 +334,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
}
if (td->request.isKeepAlive ())
- td->response.connection.assign ("keep-alive");
+ td->response.setValue ("Connection", "keep-alive");
HttpHeaders::buildHTTPResponseHeaderStruct (buffer, &td->response,
&(td->nBytesToRead));
diff --git a/myserver/src/log/log_manager.cpp b/myserver/src/log/log_manager.cpp
index 274ba6c..d6698e0 100644
--- a/myserver/src/log/log_manager.cpp
+++ b/myserver/src/log/log_manager.cpp
@@ -15,6 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "stdafx.h"
#include <include/log/log_manager.h>
#include <include/server/server.h>
diff --git a/myserver/src/log/stream/console_stream.cpp
b/myserver/src/log/stream/console_stream.cpp
index 643e293..8872e0f 100644
--- a/myserver/src/log/stream/console_stream.cpp
+++ b/myserver/src/log/stream/console_stream.cpp
@@ -15,6 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "stdafx.h"
#include <include/log/stream/console_stream.h>
#include <include/server/server.h>
diff --git a/myserver/src/log/stream/console_stream_creator.cpp
b/myserver/src/log/stream/console_stream_creator.cpp
index 5865765..de63a50 100644
--- a/myserver/src/log/stream/console_stream_creator.cpp
+++ b/myserver/src/log/stream/console_stream_creator.cpp
@@ -15,6 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "stdafx.h"
#include <include/log/stream/console_stream_creator.h>
LogStream*
diff --git a/myserver/src/log/stream/file_stream.cpp
b/myserver/src/log/stream/file_stream.cpp
index 447097b..4b77e72 100644
--- a/myserver/src/log/stream/file_stream.cpp
+++ b/myserver/src/log/stream/file_stream.cpp
@@ -15,6 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "stdafx.h"
#include <include/log/stream/file_stream.h>
int const FileStream::defaultFileMask =
diff --git a/myserver/src/log/stream/file_stream_creator.cpp
b/myserver/src/log/stream/file_stream_creator.cpp
index beffa15..e86a8f9 100644
--- a/myserver/src/log/stream/file_stream_creator.cpp
+++ b/myserver/src/log/stream/file_stream_creator.cpp
@@ -15,6 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "stdafx.h"
#include <include/log/stream/file_stream_creator.h>
LogStream*
diff --git a/myserver/src/log/stream/log_stream.cpp
b/myserver/src/log/stream/log_stream.cpp
index 3faee99..2fc156a 100644
--- a/myserver/src/log/stream/log_stream.cpp
+++ b/myserver/src/log/stream/log_stream.cpp
@@ -15,6 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "stdafx.h"
#include <include/log/stream/log_stream.h>
LogStream::LogStream (FiltersFactory* ff, u_long cycle, Stream* out,
diff --git a/myserver/src/log/stream/log_stream_creator.cpp
b/myserver/src/log/stream/log_stream_creator.cpp
index e006396..71c53cf 100644
--- a/myserver/src/log/stream/log_stream_creator.cpp
+++ b/myserver/src/log/stream/log_stream_creator.cpp
@@ -15,4 +15,5 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "stdafx.h"
#include <include/log/stream/log_stream_creator.h>
diff --git a/myserver/src/log/stream/log_stream_factory.cpp
b/myserver/src/log/stream/log_stream_factory.cpp
index af3c46c..0b4fc16 100644
--- a/myserver/src/log/stream/log_stream_factory.cpp
+++ b/myserver/src/log/stream/log_stream_factory.cpp
@@ -15,6 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "stdafx.h"
#include <include/log/stream/log_stream_factory.h>
LogStreamFactory::LogStreamFactory ()
diff --git a/myserver/src/log/stream/socket_stream.cpp
b/myserver/src/log/stream/socket_stream.cpp
index fb2821a..32b048f 100644
--- a/myserver/src/log/stream/socket_stream.cpp
+++ b/myserver/src/log/stream/socket_stream.cpp
@@ -15,6 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "stdafx.h"
#include <include/log/stream/socket_stream.h>
SocketStream::SocketStream (FiltersFactory* filtersFactory,
diff --git a/myserver/src/log/stream/socket_stream_creator.cpp
b/myserver/src/log/stream/socket_stream_creator.cpp
index bf3856a..4646cb9 100644
--- a/myserver/src/log/stream/socket_stream_creator.cpp
+++ b/myserver/src/log/stream/socket_stream_creator.cpp
@@ -15,6 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "stdafx.h"
#include <include/log/stream/socket_stream_creator.h>
LogStream*
diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index cc372c5..fd71507 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -493,7 +493,12 @@ int main (int argn, char **argv)
try
{
if (loadConfFilesLocation (mainConf, mimeConf, vhostConf, externPath,
- input.confFilesLocation))
+#ifdef WIN32
+ "."
+#else
+ input.confFilesLocation
+#endif
+ ))
{
cout << _("Cannot find the configuration files, be sure they exist")
<< endl;
@@ -652,7 +657,7 @@ void __stdcall myServerMainNT (u_long, LPTSTR*)
loadConfFilesLocation (mainConf, mimeConf, vhostConf, externPath, NULL);
- Server::getInstance ()->start (mainConf, mimeConf, vhostConf,
externPath);
+ Server::getInstance ()->start (mainConf, mimeConf, vhostConf,
externPath, &genMainConf);
MyServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
SetServiceStatus (MyServiceStatusHandle, &MyServiceStatus);
diff --git a/myserver/src/protocol/ftp/Makefile.am
b/myserver/src/protocol/ftp/Makefile.am
index bb36ba7..691f824 100644
--- a/myserver/src/protocol/ftp/Makefile.am
+++ b/myserver/src/protocol/ftp/Makefile.am
@@ -1,5 +1,6 @@
lib_LIBRARIES = libftp.a
libftp_a_SOURCES = ftp.cpp ftp_lexer.cpp ftp_parser.cpp
+EXTRA_DIST = ftp_lexer.out.cpp ftp_parser.ypp ftp_lexer.lpp
SUBDIRS =
AM_CPPFLAGS = $(all_includes)
@@ -7,4 +8,4 @@ build_parser: ftp_lexer.lpp ftp_parser.ypp
$(YACC) $(YFLAGS) --defines=../../../include/protocol/ftp/ftp_parser.h \
--output=ftp_parser.cpp ftp_parser.ypp
$(LEX) --header-file=../../../include/protocol/ftp/ftp_lexer.h \
- --outfile=ftp_lexer.cpp ftp_lexer.lpp
+ --outfile=ftp_lexer.out.cpp ftp_lexer.lpp
diff --git a/myserver/src/protocol/ftp/ftp.cpp
b/myserver/src/protocol/ftp/ftp.cpp
index 02c692a..597edfc 100644
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -16,6 +16,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "stdafx.h"
#include <include/protocol/ftp/ftp.h>
#include <include/protocol/ftp/ftp_common.h>
#include <include/protocol/ftp/ftp_parser.h>
diff --git a/myserver/src/protocol/ftp/ftp_lexer.cpp
b/myserver/src/protocol/ftp/ftp_lexer.cpp
index a612c9a..d34da81 100644
--- a/myserver/src/protocol/ftp/ftp_lexer.cpp
+++ b/myserver/src/protocol/ftp/ftp_lexer.cpp
@@ -1,2594 +1,2 @@
-#line 2 "ftp_lexer.cpp"
-
-#line 4 "ftp_lexer.cpp"
-
-#define YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types.
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX (4294967295U)
-#endif
-
-#endif /* ! C99 */
-
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else /* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif /* defined (__STDC__) */
-#endif /* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index. If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* An opaque pointer. */
-#ifndef YY_TYPEDEF_YY_SCANNER_T
-#define YY_TYPEDEF_YY_SCANNER_T
-typedef void* yyscan_t;
-#endif
-
-/* For convenience, these vars (plus the bison vars far below)
- are macros in the reentrant scanner. */
-#define yyin yyg->yyin_r
-#define yyout yyg->yyout_r
-#define yyextra yyg->yyextra_r
-#define yyleng yyg->yyleng_r
-#define yytext yyg->yytext_r
-#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
-#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
-#define yy_flex_debug yyg->yy_flex_debug_r
-
-/* Enter a start condition. This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yyg->yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state. The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((yyg->yy_start - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin ,yyscanner )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
-#define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
-#endif
-
-/* The state buf must be large enough to hold one state per character in the
main buffer.
- */
-#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
- #define YY_LESS_LINENO(n)
-
-/* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up yytext. */ \
- int yyless_macro_arg = (n); \
- YY_LESS_LINENO(yyless_macro_arg);\
- *yy_cp = yyg->yy_hold_char; \
- YY_RESTORE_YY_MORE_OFFSET \
- yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg -
YY_MORE_ADJ; \
- YY_DO_BEFORE_ACTION; /* set up yytext again */ \
- } \
- while ( 0 )
-
-#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
- {
- FILE *yy_input_file;
-
- char *yy_ch_buf; /* input buffer */
- char *yy_buf_pos; /* current position in input buffer */
-
- /* Size of input buffer in bytes, not including room for EOB
- * characters.
- */
- yy_size_t yy_buf_size;
-
- /* Number of characters read into yy_ch_buf, not including EOB
- * characters.
- */
- int yy_n_chars;
-
- /* Whether we "own" the buffer - i.e., we know we created it,
- * and can realloc() it to grow it, and should free() it to
- * delete it.
- */
- int yy_is_our_buffer;
-
- /* Whether this is an "interactive" input source; if so, and
- * if we're using stdio for input, then we want to use getc()
- * instead of fread(), to make sure we stop fetching input after
- * each newline.
- */
- int yy_is_interactive;
-
- /* Whether we're considered to be at the beginning of a line.
- * If so, '^' rules will be active on the next match, otherwise
- * not.
- */
- int yy_at_bol;
-
- int yy_bs_lineno; /**< The line count. */
- int yy_bs_column; /**< The column count. */
-
- /* Whether to try to fill the input buffer when we reach the
- * end of it.
- */
- int yy_fill_buffer;
-
- int yy_buffer_status;
-
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
- /* When an EOF's been seen but there's still some text to process
- * then we mark the buffer as YY_EOF_PENDING, to indicate that we
- * shouldn't try reading from the input source any more. We might
- * still have a bunch of tokens to match, though, because of
- * possible backing-up.
- *
- * When we actually see the EOF, we change the status to "new"
- * (via yyrestart()), so that the user can continue scanning by
- * just pointing yyin at a new input file.
- */
-#define YY_BUFFER_EOF_PENDING 2
-
- };
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- *
- * Returns the top of the stack, or NULL.
- */
-#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \
- ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \
- : NULL)
-
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top]
-
-void yyrestart (FILE *input_file ,yyscan_t yyscanner );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
-void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-void yypop_buffer_state (yyscan_t yyscanner );
-
-static void yyensure_buffer_stack (yyscan_t yyscanner );
-static void yy_load_buffer_state (yyscan_t yyscanner );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner );
-
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner)
-
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner
);
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner
);
-
-void *yyalloc (yy_size_t ,yyscan_t yyscanner );
-void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
-void yyfree (void * ,yyscan_t yyscanner );
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
- { \
- if ( ! YY_CURRENT_BUFFER ){ \
- yyensure_buffer_stack (yyscanner); \
- YY_CURRENT_BUFFER_LVALUE = \
- yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
- } \
- YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
- }
-
-#define yy_set_bol(at_bol) \
- { \
- if ( ! YY_CURRENT_BUFFER ){\
- yyensure_buffer_stack (yyscanner); \
- YY_CURRENT_BUFFER_LVALUE = \
- yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
- } \
- YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
- }
-
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-
-/* Begin user sect3 */
-
-#define yywrap(n) 1
-#define YY_SKIP_YYWRAP
-
-typedef unsigned char YY_CHAR;
-
-typedef int yy_state_type;
-
-#define yytext_ptr yytext_r
-
-static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t
yyscanner);
-static int yy_get_next_buffer (yyscan_t yyscanner );
-static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
- yyg->yytext_ptr = yy_bp; \
- yyleng = (size_t) (yy_cp - yy_bp); \
- yyg->yy_hold_char = *yy_cp; \
- *yy_cp = '\0'; \
- yyg->yy_c_buf_p = yy_cp;
-
-#define YY_NUM_RULES 44
-#define YY_END_OF_BUFFER 45
-/* This struct is not used in this scanner,
- but its presence is necessary. */
-struct yy_trans_info
- {
- flex_int32_t yy_verify;
- flex_int32_t yy_nxt;
- };
-static yyconst flex_int16_t yy_accept[137] =
- { 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 45, 44,
- 44, 40, 43, 43, 43, 43, 43, 43, 43, 43,
- 43, 43, 43, 43, 43, 43, 43, 41, 42, 37,
- 38, 39, 40, 43, 43, 43, 43, 43, 43, 43,
- 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
- 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
- 43, 43, 43, 41, 42, 42, 38, 43, 43, 43,
- 43, 10, 43, 43, 43, 21, 43, 43, 43, 43,
- 43, 12, 43, 43, 43, 22, 43, 43, 43, 43,
- 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-
- 43, 9, 20, 11, 43, 19, 25, 15, 6, 16,
- 28, 2, 5, 4, 3, 13, 14, 23, 24, 33,
- 36, 27, 17, 18, 8, 26, 7, 1, 43, 32,
- 29, 31, 30, 34, 35, 0
- } ;
-
-static yyconst flex_int32_t yy_ec[256] =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
- 1, 1, 3, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 4, 5, 5, 5, 5, 5, 5, 5, 5,
- 5, 5, 5, 6, 5, 5, 5, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 5, 5, 5,
- 5, 5, 5, 5, 8, 9, 10, 11, 12, 13,
- 5, 14, 15, 5, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 5, 5, 5, 5, 5, 5, 32, 33, 34, 35,
-
- 36, 37, 5, 38, 39, 5, 40, 41, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, 5, 5, 5, 5, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1
- } ;
-
-static yyconst flex_int32_t yy_meta[56] =
- { 0,
- 1, 1, 1, 2, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3
- } ;
-
-static yyconst flex_int16_t yy_base[144] =
- { 0,
- 0, 0, 55, 59, 63, 67, 69, 74, 277, 312,
- 274, 271, 0, 65, 68, 71, 72, 70, 71, 72,
- 94, 62, 81, 103, 65, 105, 122, 0, 270, 312,
- 266, 312, 101, 0, 77, 80, 101, 113, 123, 118,
- 119, 113, 128, 130, 120, 127, 124, 126, 139, 147,
- 151, 155, 157, 152, 172, 154, 158, 169, 169, 159,
- 171, 160, 171, 0, 0, 100, 87, 168, 181, 175,
- 177, 0, 186, 189, 189, 0, 206, 198, 203, 201,
- 201, 0, 202, 204, 207, 0, 208, 212, 221, 223,
- 211, 214, 213, 216, 231, 221, 227, 225, 247, 251,
-
- 255, 0, 0, 0, 260, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 260, 0,
- 0, 0, 0, 0, 0, 312, 296, 299, 302, 87,
- 304, 306, 308
- } ;
-
-static yyconst flex_int16_t yy_def[144] =
- { 0,
- 136, 1, 137, 137, 138, 138, 139, 139, 136, 136,
- 136, 136, 140, 140, 140, 140, 140, 140, 140, 140,
- 140, 140, 140, 140, 140, 140, 140, 141, 142, 136,
- 136, 136, 136, 140, 140, 140, 140, 140, 140, 140,
- 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
- 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
- 140, 140, 140, 141, 143, 142, 136, 140, 140, 140,
- 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
- 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
- 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-
- 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
- 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
- 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
- 140, 140, 140, 140, 140, 0, 136, 136, 136, 136,
- 136, 136, 136
- } ;
-
-static yyconst flex_int16_t yy_nxt[368] =
- { 0,
- 10, 10, 11, 12, 13, 13, 13, 14, 13, 15,
- 16, 13, 13, 17, 13, 13, 18, 19, 20, 13,
- 21, 22, 23, 24, 25, 26, 13, 13, 27, 13,
- 13, 14, 13, 15, 16, 13, 13, 17, 13, 13,
- 18, 19, 20, 13, 21, 22, 23, 24, 25, 26,
- 13, 13, 27, 13, 13, 10, 10, 11, 12, 10,
- 10, 11, 12, 10, 10, 11, 12, 10, 10, 11,
- 12, 11, 12, 35, 30, 31, 11, 12, 37, 30,
- 31, 38, 40, 41, 42, 36, 43, 50, 45, 34,
- 44, 46, 51, 67, 57, 39, 68, 35, 52, 53,
-
- 69, 47, 37, 65, 33, 38, 40, 41, 42, 36,
- 43, 50, 45, 48, 44, 46, 51, 54, 57, 39,
- 68, 49, 52, 53, 69, 47, 70, 55, 58, 59,
- 71, 60, 56, 72, 73, 74, 75, 48, 76, 61,
- 77, 54, 62, 78, 63, 49, 79, 80, 81, 82,
- 70, 55, 58, 59, 71, 60, 56, 72, 73, 74,
- 75, 83, 76, 61, 77, 86, 62, 78, 63, 87,
- 79, 80, 81, 82, 84, 85, 89, 94, 95, 91,
- 96, 88, 90, 97, 98, 83, 99, 100, 101, 86,
- 102, 92, 103, 87, 93, 104, 105, 106, 84, 85,
-
- 89, 94, 95, 91, 96, 88, 90, 97, 98, 107,
- 99, 100, 101, 108, 102, 92, 103, 109, 93, 104,
- 105, 106, 110, 111, 112, 114, 115, 113, 116, 117,
- 118, 119, 120, 107, 121, 122, 123, 108, 125, 124,
- 126, 109, 127, 128, 129, 130, 110, 111, 112, 114,
- 115, 113, 116, 117, 118, 119, 120, 131, 121, 122,
- 123, 132, 125, 124, 126, 133, 127, 128, 129, 130,
- 134, 135, 67, 65, 33, 32, 136, 136, 136, 136,
- 136, 131, 136, 136, 136, 132, 136, 136, 136, 133,
- 136, 136, 136, 136, 134, 135, 28, 28, 28, 29,
-
- 29, 29, 10, 10, 10, 64, 64, 66, 66, 65,
- 65, 9, 136, 136, 136, 136, 136, 136, 136, 136,
- 136, 136, 136, 136, 136, 136, 136, 136, 136, 136,
- 136, 136, 136, 136, 136, 136, 136, 136, 136, 136,
- 136, 136, 136, 136, 136, 136, 136, 136, 136, 136,
- 136, 136, 136, 136, 136, 136, 136, 136, 136, 136,
- 136, 136, 136, 136, 136, 136, 136
- } ;
-
-static yyconst flex_int16_t yy_chk[368] =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 3, 3, 3, 3, 4,
- 4, 4, 4, 5, 5, 5, 5, 6, 6, 6,
- 6, 7, 7, 14, 7, 7, 8, 8, 15, 8,
- 8, 15, 16, 17, 18, 14, 19, 22, 20, 140,
- 19, 20, 23, 67, 25, 15, 35, 14, 23, 23,
-
- 36, 21, 15, 66, 33, 15, 16, 17, 18, 14,
- 19, 22, 20, 21, 19, 20, 23, 24, 25, 15,
- 35, 21, 23, 23, 36, 21, 37, 24, 26, 26,
- 38, 27, 24, 39, 40, 41, 42, 21, 43, 27,
- 44, 24, 27, 45, 27, 21, 46, 47, 48, 49,
- 37, 24, 26, 26, 38, 27, 24, 39, 40, 41,
- 42, 50, 43, 27, 44, 52, 27, 45, 27, 53,
- 46, 47, 48, 49, 51, 51, 54, 56, 57, 55,
- 58, 53, 54, 59, 60, 50, 61, 62, 63, 52,
- 68, 55, 69, 53, 55, 70, 71, 73, 51, 51,
-
- 54, 56, 57, 55, 58, 53, 54, 59, 60, 74,
- 61, 62, 63, 75, 68, 55, 69, 77, 55, 70,
- 71, 73, 78, 79, 80, 81, 83, 80, 84, 85,
- 87, 88, 89, 74, 90, 91, 92, 75, 93, 92,
- 94, 77, 95, 96, 97, 98, 78, 79, 80, 81,
- 83, 80, 84, 85, 87, 88, 89, 99, 90, 91,
- 92, 100, 93, 92, 94, 101, 95, 96, 97, 98,
- 105, 129, 31, 29, 12, 11, 9, 0, 0, 0,
- 0, 99, 0, 0, 0, 100, 0, 0, 0, 101,
- 0, 0, 0, 0, 105, 129, 137, 137, 137, 138,
-
- 138, 138, 139, 139, 139, 141, 141, 142, 142, 143,
- 143, 136, 136, 136, 136, 136, 136, 136, 136, 136,
- 136, 136, 136, 136, 136, 136, 136, 136, 136, 136,
- 136, 136, 136, 136, 136, 136, 136, 136, 136, 136,
- 136, 136, 136, 136, 136, 136, 136, 136, 136, 136,
- 136, 136, 136, 136, 136, 136, 136, 136, 136, 136,
- 136, 136, 136, 136, 136, 136, 136
- } ;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-#line 1 "ftp_lexer.lpp"
-#line 2 "ftp_lexer.lpp"
-#include "../../../include/protocol/ftp/ftp_common.h"
-#include <string>
-#include "../../../include/protocol/ftp/ftp_parser.h"
-#include <ctype.h>
-/* %option header-file= "../../../include/protocol/ftp/ftp_lexer.h" */
-
-
-
-#line 577 "ftp_lexer.cpp"
-
-#define INITIAL 0
-#define SHORT_STRING 1
-#define STRING 2
-#define IPV4_ADDR 3
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-/* Holds the entire state of the reentrant scanner. */
-struct yyguts_t
- {
-
- /* User-defined. Not touched by flex. */
- YY_EXTRA_TYPE yyextra_r;
-
- /* The rest are the same as the globals declared in the non-reentrant
scanner. */
- FILE *yyin_r, *yyout_r;
- size_t yy_buffer_stack_top; /**< index of top of stack. */
- size_t yy_buffer_stack_max; /**< capacity of stack. */
- YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
- char yy_hold_char;
- int yy_n_chars;
- int yyleng_r;
- char *yy_c_buf_p;
- int yy_init;
- int yy_start;
- int yy_did_buffer_switch_on_eof;
- int yy_start_stack_ptr;
- int yy_start_stack_depth;
- int *yy_start_stack;
- yy_state_type yy_last_accepting_state;
- char* yy_last_accepting_cpos;
-
- int yylineno_r;
- int yy_flex_debug_r;
-
- char *yytext_r;
- int yy_more_flag;
- int yy_more_len;
-
- YYSTYPE * yylval_r;
-
- YYLTYPE * yylloc_r;
-
- }; /* end struct yyguts_t */
-
-static int yy_init_globals (yyscan_t yyscanner );
-
- /* This must go here because YYSTYPE and YYLTYPE are included
- * from bison output in section 1.*/
- # define yylval yyg->yylval_r
-
- # define yylloc yyg->yylloc_r
-
-int yylex_init (yyscan_t* scanner);
-
-int yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
-
-/* Accessor methods to globals.
- These are made visible to non-reentrant scanners for convenience. */
-
-int yylex_destroy (yyscan_t yyscanner );
-
-int yyget_debug (yyscan_t yyscanner );
-
-void yyset_debug (int debug_flag ,yyscan_t yyscanner );
-
-YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner );
-
-void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
-
-FILE *yyget_in (yyscan_t yyscanner );
-
-void yyset_in (FILE * in_str ,yyscan_t yyscanner );
-
-FILE *yyget_out (yyscan_t yyscanner );
-
-void yyset_out (FILE * out_str ,yyscan_t yyscanner );
-
-int yyget_leng (yyscan_t yyscanner );
-
-char *yyget_text (yyscan_t yyscanner );
-
-int yyget_lineno (yyscan_t yyscanner );
-
-void yyset_lineno (int line_number ,yyscan_t yyscanner );
-
-YYSTYPE * yyget_lval (yyscan_t yyscanner );
-
-void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
-
- YYLTYPE *yyget_lloc (yyscan_t yyscanner );
-
- void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap (yyscan_t yyscanner );
-#else
-extern int yywrap (yyscan_t yyscanner );
-#endif
-#endif
-
- static void yyunput (int c,char *buf_ptr ,yyscan_t yyscanner);
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
-#endif
-
-#ifndef YY_NO_INPUT
-
-#ifdef __cplusplus
-static int yyinput (yyscan_t yyscanner );
-#else
-static int input (yyscan_t yyscanner );
-#endif
-
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
-#define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
-#endif
-
-/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
- if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
- { \
- int c = '*'; \
- size_t n; \
- for ( n = 0; n < max_size && \
- (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
- buf[n] = (char) c; \
- if ( c == '\n' ) \
- buf[n++] = (char) c; \
- if ( c == EOF && ferror( yyin ) ) \
- YY_FATAL_ERROR( "input in flex scanner failed" ); \
- result = n; \
- } \
- else \
- { \
- errno=0; \
- while ( (result = fread(buf, 1, max_size, yyin))==0 &&
ferror(yyin)) \
- { \
- if( errno != EINTR) \
- { \
- YY_FATAL_ERROR( "input in flex scanner failed"
); \
- break; \
- } \
- errno=0; \
- clearerr(yyin); \
- } \
- }\
-\
-
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner)
-#endif
-
-/* end tables serialization structures and prototypes */
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int yylex \
- (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t
yyscanner);
-
-#define YY_DECL int yylex \
- (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t
yyscanner)
-#endif /* !YY_DECL */
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
- YY_USER_ACTION
-
-/** The main scanner function which does all the work.
- */
-YY_DECL
-{
- register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
- register int yy_act;
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-#line 19 "ftp_lexer.lpp"
-
- /* Login */
-#line 829 "ftp_lexer.cpp"
-
- yylval = yylval_param;
-
- yylloc = yylloc_param;
-
- if ( !yyg->yy_init )
- {
- yyg->yy_init = 1;
-
-#ifdef YY_USER_INIT
- YY_USER_INIT;
-#endif
-
- if ( ! yyg->yy_start )
- yyg->yy_start = 1; /* first start state */
-
- if ( ! yyin )
- yyin = stdin;
-
- if ( ! yyout )
- yyout = stdout;
-
- if ( ! YY_CURRENT_BUFFER ) {
- yyensure_buffer_stack (yyscanner);
- YY_CURRENT_BUFFER_LVALUE =
- yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
- }
-
- yy_load_buffer_state(yyscanner );
- }
-
- while ( 1 ) /* loops until end-of-file is reached */
- {
- yy_cp = yyg->yy_c_buf_p;
-
- /* Support of yytext. */
- *yy_cp = yyg->yy_hold_char;
-
- /* yy_bp points to the position in yy_ch_buf of the start of
- * the current run.
- */
- yy_bp = yy_cp;
-
- yy_current_state = yyg->yy_start;
-yy_match:
- do
- {
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
- if ( yy_accept[yy_current_state] )
- {
- yyg->yy_last_accepting_state = yy_current_state;
- yyg->yy_last_accepting_cpos = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] !=
yy_current_state )
- {
- yy_current_state = (int)
yy_def[yy_current_state];
- if ( yy_current_state >= 137 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] +
(unsigned int) yy_c];
- ++yy_cp;
- }
- while ( yy_base[yy_current_state] != 312 );
-
-yy_find_action:
- yy_act = yy_accept[yy_current_state];
- if ( yy_act == 0 )
- { /* have to back up */
- yy_cp = yyg->yy_last_accepting_cpos;
- yy_current_state = yyg->yy_last_accepting_state;
- yy_act = yy_accept[yy_current_state];
- }
-
- YY_DO_BEFORE_ACTION;
-
-do_action: /* This label is used only to access EOF actions. */
-
- switch ( yy_act )
- { /* beginning of action switch */
- case 0: /* must back up */
- /* undo the effects of YY_DO_BEFORE_ACTION */
- *yy_cp = yyg->yy_hold_char;
- yy_cp = yyg->yy_last_accepting_cpos;
- yy_current_state = yyg->yy_last_accepting_state;
- goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-#line 21 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return USER_FTP_COMMAND;
- }
- YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 28 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return PASS_FTP_COMMAND;
- }
- YY_BREAK
-/* Logout */
-case 3:
-YY_RULE_SETUP
-#line 36 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- return QUIT_FTP_COMMAND;
- }
- YY_BREAK
-/* Transfer parameters */
-case 4:
-YY_RULE_SETUP
-#line 43 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(IPV4_ADDR);
- return PORT_FTP_COMMAND;
- }
- YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 50 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- return PASV_FTP_COMMAND;
- }
- YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 56 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(SHORT_STRING);
- return MODE_FTP_COMMAND;
- }
- YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 63 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(SHORT_STRING);
- return TYPE_FTP_COMMAND;
- }
- YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 70 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- return STRU_FTP_COMMAND;
- }
- YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 76 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- return ABOR_FTP_COMMAND;
- }
- YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 82 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 3;
- return CWD_FTP_COMMAND;
- }
- YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 88 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- return CDUP_FTP_COMMAND;
- }
- YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 94 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 3;
- return PWD_FTP_COMMAND;
- }
- YY_BREAK
-/* File action commands */
-case 13:
-YY_RULE_SETUP
-#line 102 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return REST_FTP_COMMAND;
- }
- YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 109 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return RETR_FTP_COMMAND;
- }
- YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 116 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return LIST_FTP_COMMAND;
- }
- YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 123 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return NLST_FTP_COMMAND;
- }
- YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 130 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return STOR_FTP_COMMAND;
- }
- YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 137 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return STOU_FTP_COMMAND;
- }
- YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 144 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return DELE_FTP_COMMAND;
- }
- YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 151 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return APPE_FTP_COMMAND;
- }
- YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 158 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 3;
- BEGIN(STRING);
- return MKD_FTP_COMMAND;
- }
- YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 165 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 3;
- BEGIN(STRING);
- return RMD_FTP_COMMAND;
- }
- YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 172 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return RNFR_FTP_COMMAND;
- }
- YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 179 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return RNTO_FTP_COMMAND;
- }
- YY_BREAK
-/* Informational commands */
-case 25:
-YY_RULE_SETUP
-#line 187 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return HELP_FTP_COMMAND;
- }
- YY_BREAK
-case 26:
-YY_RULE_SETUP
-#line 194 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- return SYST_FTP_COMMAND;
- }
- YY_BREAK
-case 27:
-YY_RULE_SETUP
-#line 200 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return STAT_FTP_COMMAND;
- }
- YY_BREAK
-/* Miscellaneous commands*/
-case 28:
-YY_RULE_SETUP
-#line 208 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- return NOOP_FTP_COMMAND;
- }
- YY_BREAK
-/*add rfc 775 cmds(used by win32 ftp client)*/
-case 29:
-YY_RULE_SETUP
-#line 215 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return MKD_FTP_COMMAND;
- }
- YY_BREAK
-case 30:
-YY_RULE_SETUP
-#line 222 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return RMD_FTP_COMMAND;
- }
- YY_BREAK
-case 31:
-YY_RULE_SETUP
-#line 229 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- return PWD_FTP_COMMAND;
- }
- YY_BREAK
-case 32:
-YY_RULE_SETUP
-#line 235 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- return CDUP_FTP_COMMAND;
- }
- YY_BREAK
-/*SITE commands*/
-case 33:
-YY_RULE_SETUP
-#line 242 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- return SITE_FTP_COMMAND;// do the same as help
- }
- YY_BREAK
-case 34:
-YY_RULE_SETUP
-#line 248 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- return CHMOD_FTP_COMMAND;
- }
- YY_BREAK
-case 35:
-YY_RULE_SETUP
-#line 254 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- return UTIME_FTP_COMMAND;
- }
- YY_BREAK
-/*RFC 3659 commands*/
-case 36:
-YY_RULE_SETUP
-#line 261 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += 4;
- BEGIN(STRING);
- return SIZE_FTP_COMMAND;
- }
- YY_BREAK
-case 37:
-YY_RULE_SETUP
-#line 268 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += yyleng;
- if ( *yytext == ',' )
- return ',';
- }
- YY_BREAK
-case 38:
-YY_RULE_SETUP
-#line 275 "ftp_lexer.lpp"
-{
- yylval->m_nInt = atoi(yytext);
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += yyleng;
- return NUMBER_FTP_ARG;
- }
- YY_BREAK
-case 39:
-/* rule 39 can match eol */
-YY_RULE_SETUP
-#line 282 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_line = yylloc->first_line + 1;
- yylloc->last_column = 0;
- BEGIN(INITIAL);
- return CRLF_FTP_SEP;
- }
- YY_BREAK
-case 40:
-YY_RULE_SETUP
-#line 290 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += yyleng;
- return SPACE_FTP_SEP;
- }
- YY_BREAK
-case 41:
-YY_RULE_SETUP
-#line 297 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += yyleng;
-
- if ( yyleng == 1 )//one char
- return tolower(*yytext);
- else
- {
- memset(yylval->m_szStr, 0, PARSER_STR_LEN);
- strncpy(yylval->m_szStr, yytext, yyleng);
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += yyleng;
- return STRING_FTP_ARG;
- }
- }
- YY_BREAK
-case 42:
-YY_RULE_SETUP
-#line 315 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += yyleng;
- memset(yylval->m_szStr, 0, PARSER_STR_LEN);
- strncpy(yylval->m_szStr, yytext, yyleng);
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += yyleng;
- return STRING_FTP_ARG;
- }
- YY_BREAK
-case 43:
-YY_RULE_SETUP
-#line 327 "ftp_lexer.lpp"
-{
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += yyleng;
-
- BEGIN(STRING);
-
- memset(yylval->m_szStr, 0, PARSER_STR_LEN);
- strncpy(yylval->m_szStr, yytext, yyleng);
- yylloc->first_line = yylloc->last_line;
- yylloc->first_column = yylloc->last_column;
- yylloc->last_column += yyleng;
- return STRING_FTP_ARG;
- }
- YY_BREAK
-case 44:
-YY_RULE_SETUP
-#line 341 "ftp_lexer.lpp"
-ECHO;
- YY_BREAK
-#line 1410 "ftp_lexer.cpp"
-case YY_STATE_EOF(INITIAL):
-case YY_STATE_EOF(SHORT_STRING):
-case YY_STATE_EOF(STRING):
-case YY_STATE_EOF(IPV4_ADDR):
- yyterminate();
-
- case YY_END_OF_BUFFER:
- {
- /* Amount of text matched not including the EOB char. */
- int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr)
- 1;
-
- /* Undo the effects of YY_DO_BEFORE_ACTION. */
- *yy_cp = yyg->yy_hold_char;
- YY_RESTORE_YY_MORE_OFFSET
-
- if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status ==
YY_BUFFER_NEW )
- {
- /* We're scanning a new file or input source. It's
- * possible that this happened because the user
- * just pointed yyin at a new source and called
- * yylex(). If so, then we have to assure
- * consistency between YY_CURRENT_BUFFER and our
- * globals. Here is the right place to do so, because
- * this is the first action (other than possibly a
- * back-up) that will match for the new input source.
- */
- yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
- YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
- YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
YY_BUFFER_NORMAL;
- }
-
- /* Note that here we test for yy_c_buf_p "<=" to the position
- * of the first EOB in the buffer, since yy_c_buf_p will
- * already have been incremented past the NUL character
- * (since all states make transitions on EOB to the
- * end-of-buffer state). Contrast this with the test
- * in input().
- */
- if ( yyg->yy_c_buf_p <=
&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
- { /* This was really a NUL. */
- yy_state_type yy_next_state;
-
- yyg->yy_c_buf_p = yyg->yytext_ptr +
yy_amount_of_matched_text;
-
- yy_current_state = yy_get_previous_state( yyscanner );
-
- /* Okay, we're now positioned to make the NUL
- * transition. We couldn't have
- * yy_get_previous_state() go ahead and do it
- * for us because it doesn't know how to deal
- * with the possibility of jamming (and we don't
- * want to build jamming into it because then it
- * will run more slowly).
- */
-
- yy_next_state = yy_try_NUL_trans( yy_current_state ,
yyscanner);
-
- yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-
- if ( yy_next_state )
- {
- /* Consume the NUL. */
- yy_cp = ++yyg->yy_c_buf_p;
- yy_current_state = yy_next_state;
- goto yy_match;
- }
-
- else
- {
- yy_cp = yyg->yy_c_buf_p;
- goto yy_find_action;
- }
- }
-
- else switch ( yy_get_next_buffer( yyscanner ) )
- {
- case EOB_ACT_END_OF_FILE:
- {
- yyg->yy_did_buffer_switch_on_eof = 0;
-
- if ( yywrap(yyscanner ) )
- {
- /* Note: because we've taken care in
- * yy_get_next_buffer() to have set up
- * yytext, we can now set up
- * yy_c_buf_p so that if some total
- * hoser (like flex itself) wants to
- * call the scanner after we return the
- * YY_NULL, it'll still work - another
- * YY_NULL will get returned.
- */
- yyg->yy_c_buf_p = yyg->yytext_ptr +
YY_MORE_ADJ;
-
- yy_act = YY_STATE_EOF(YY_START);
- goto do_action;
- }
-
- else
- {
- if ( ! yyg->yy_did_buffer_switch_on_eof
)
- YY_NEW_FILE;
- }
- break;
- }
-
- case EOB_ACT_CONTINUE_SCAN:
- yyg->yy_c_buf_p =
- yyg->yytext_ptr +
yy_amount_of_matched_text;
-
- yy_current_state = yy_get_previous_state(
yyscanner );
-
- yy_cp = yyg->yy_c_buf_p;
- yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
- goto yy_match;
-
- case EOB_ACT_LAST_MATCH:
- yyg->yy_c_buf_p =
-
&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];
-
- yy_current_state = yy_get_previous_state(
yyscanner );
-
- yy_cp = yyg->yy_c_buf_p;
- yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
- goto yy_find_action;
- }
- break;
- }
-
- default:
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--no action found" );
- } /* end of action switch */
- } /* end of scanning one token */
-} /* end of yylex */
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- * EOB_ACT_LAST_MATCH -
- * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- * EOB_ACT_END_OF_FILE - end of file
- */
-static int yy_get_next_buffer (yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
- register char *source = yyg->yytext_ptr;
- register int number_to_move, i;
- int ret_val;
-
- if ( yyg->yy_c_buf_p >
&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--end of buffer missed" );
-
- if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
- { /* Don't try to fill the buffer, so this is an EOF. */
- if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 )
- {
- /* We matched a single character, the EOB, so
- * treat this as a final EOF.
- */
- return EOB_ACT_END_OF_FILE;
- }
-
- else
- {
- /* We matched some text prior to the EOB, first
- * process it.
- */
- return EOB_ACT_LAST_MATCH;
- }
- }
-
- /* Try to read more data. */
-
- /* First move last chars to start of buffer. */
- number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
-
- for ( i = 0; i < number_to_move; ++i )
- *(dest++) = *(source++);
-
- if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status ==
YY_BUFFER_EOF_PENDING )
- /* don't do the read, it's not guaranteed to return an EOF,
- * just force an EOF
- */
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0;
-
- else
- {
- int num_to_read =
- YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move
- 1;
-
- while ( num_to_read <= 0 )
- { /* Not enough room in the buffer - grow it. */
-
- /* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
-
- int yy_c_buf_p_offset =
- (int) (yyg->yy_c_buf_p - b->yy_ch_buf);
-
- if ( b->yy_is_our_buffer )
- {
- int new_size = b->yy_buf_size * 2;
-
- if ( new_size <= 0 )
- b->yy_buf_size += b->yy_buf_size / 8;
- else
- b->yy_buf_size *= 2;
-
- b->yy_ch_buf = (char *)
- /* Include room in for 2 EOB chars. */
- yyrealloc((void *)
b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner );
- }
- else
- /* Can't grow it, we don't own it. */
- b->yy_ch_buf = 0;
-
- if ( ! b->yy_ch_buf )
- YY_FATAL_ERROR(
- "fatal error - scanner input buffer overflow" );
-
- yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
- num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
- number_to_move - 1;
-
- }
-
- if ( num_to_read > YY_READ_BUF_SIZE )
- num_to_read = YY_READ_BUF_SIZE;
-
- /* Read in more data. */
- YY_INPUT(
(&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- yyg->yy_n_chars, (size_t) num_to_read );
-
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
- }
-
- if ( yyg->yy_n_chars == 0 )
- {
- if ( number_to_move == YY_MORE_ADJ )
- {
- ret_val = EOB_ACT_END_OF_FILE;
- yyrestart(yyin ,yyscanner);
- }
-
- else
- {
- ret_val = EOB_ACT_LAST_MATCH;
- YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
- YY_BUFFER_EOF_PENDING;
- }
- }
-
- else
- ret_val = EOB_ACT_CONTINUE_SCAN;
-
- if ((yy_size_t) (yyg->yy_n_chars + number_to_move) >
YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
- /* Extend the array by 50%, plus the number we really need. */
- yy_size_t new_size = yyg->yy_n_chars + number_to_move +
(yyg->yy_n_chars >> 1);
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void
*) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
- if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in
yy_get_next_buffer()" );
- }
-
- yyg->yy_n_chars += number_to_move;
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] =
YY_END_OF_BUFFER_CHAR;
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] =
YY_END_OF_BUFFER_CHAR;
-
- yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-
- return ret_val;
-}
-
-/* yy_get_previous_state - get the state just before the EOB char was reached
*/
-
- static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
-{
- register yy_state_type yy_current_state;
- register char *yy_cp;
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
- yy_current_state = yyg->yy_start;
-
- for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p;
++yy_cp )
- {
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] :
1);
- if ( yy_accept[yy_current_state] )
- {
- yyg->yy_last_accepting_state = yy_current_state;
- yyg->yy_last_accepting_cpos = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] !=
yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 137 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned
int) yy_c];
- }
-
- return yy_current_state;
-}
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- * next_state = yy_try_NUL_trans( current_state );
- */
- static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ,
yyscan_t yyscanner)
-{
- register int yy_is_jam;
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be
unused depending upon options. */
- register char *yy_cp = yyg->yy_c_buf_p;
-
- register YY_CHAR yy_c = 1;
- if ( yy_accept[yy_current_state] )
- {
- yyg->yy_last_accepting_state = yy_current_state;
- yyg->yy_last_accepting_cpos = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 137 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int)
yy_c];
- yy_is_jam = (yy_current_state == 136);
-
- return yy_is_jam ? 0 : yy_current_state;
-}
-
- static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner)
-{
- register char *yy_cp;
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
- yy_cp = yyg->yy_c_buf_p;
-
- /* undo effects of setting up yytext */
- *yy_cp = yyg->yy_hold_char;
-
- if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
- { /* need to shift things up to make room */
- /* +2 for EOB chars. */
- register int number_to_move = yyg->yy_n_chars + 2;
- register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
- YY_CURRENT_BUFFER_LVALUE->yy_buf_size +
2];
- register char *source =
-
&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
-
- while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
- *--dest = *--source;
-
- yy_cp += (int) (dest - source);
- yy_bp += (int) (dest - source);
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
- yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
-
- if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
- YY_FATAL_ERROR( "flex scanner push-back overflow" );
- }
-
- *--yy_cp = (char) c;
-
- yyg->yytext_ptr = yy_bp;
- yyg->yy_hold_char = *yy_cp;
- yyg->yy_c_buf_p = yy_cp;
-}
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
- static int yyinput (yyscan_t yyscanner)
-#else
- static int input (yyscan_t yyscanner)
-#endif
-
-{
- int c;
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
- *yyg->yy_c_buf_p = yyg->yy_hold_char;
-
- if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
- {
- /* yy_c_buf_p now points to the character we want to return.
- * If this occurs *before* the EOB characters, then it's a
- * valid NUL; if not, then we've hit the end of the buffer.
- */
- if ( yyg->yy_c_buf_p <
&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
- /* This was really a NUL. */
- *yyg->yy_c_buf_p = '\0';
-
- else
- { /* need more input */
- int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
- ++yyg->yy_c_buf_p;
-
- switch ( yy_get_next_buffer( yyscanner ) )
- {
- case EOB_ACT_LAST_MATCH:
- /* This happens because yy_g_n_b()
- * sees that we've accumulated a
- * token and flags that we need to
- * try matching the token before
- * proceeding. But for input(),
- * there's no matching to consider.
- * So convert the EOB_ACT_LAST_MATCH
- * to EOB_ACT_END_OF_FILE.
- */
-
- /* Reset buffer status. */
- yyrestart(yyin ,yyscanner);
-
- /*FALLTHROUGH*/
-
- case EOB_ACT_END_OF_FILE:
- {
- if ( yywrap(yyscanner ) )
- return EOF;
-
- if ( ! yyg->yy_did_buffer_switch_on_eof
)
- YY_NEW_FILE;
-#ifdef __cplusplus
- return yyinput(yyscanner);
-#else
- return input(yyscanner);
-#endif
- }
-
- case EOB_ACT_CONTINUE_SCAN:
- yyg->yy_c_buf_p = yyg->yytext_ptr +
offset;
- break;
- }
- }
- }
-
- c = *(unsigned char *) yyg->yy_c_buf_p; /* cast for 8-bit char's */
- *yyg->yy_c_buf_p = '\0'; /* preserve yytext */
- yyg->yy_hold_char = *++yyg->yy_c_buf_p;
-
- return c;
-}
-#endif /* ifndef YY_NO_INPUT */
-
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * @param yyscanner The scanner object.
- * @note This function does not reset the start condition to @c INITIAL .
- */
- void yyrestart (FILE * input_file , yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
- if ( ! YY_CURRENT_BUFFER ){
- yyensure_buffer_stack (yyscanner);
- YY_CURRENT_BUFFER_LVALUE =
- yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
- }
-
- yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner);
- yy_load_buffer_state(yyscanner );
-}
-
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * @param yyscanner The scanner object.
- */
- void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t
yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
- /* TODO. We should be able to replace this entire function body
- * with
- * yypop_buffer_state();
- * yypush_buffer_state(new_buffer);
- */
- yyensure_buffer_stack (yyscanner);
- if ( YY_CURRENT_BUFFER == new_buffer )
- return;
-
- if ( YY_CURRENT_BUFFER )
- {
- /* Flush out information for old buffer. */
- *yyg->yy_c_buf_p = yyg->yy_hold_char;
- YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
- }
-
- YY_CURRENT_BUFFER_LVALUE = new_buffer;
- yy_load_buffer_state(yyscanner );
-
- /* We don't actually know whether we did this switch during
- * EOF (yywrap()) processing, but the only time this flag
- * is looked at is after yywrap() is called, so it's safe
- * to go ahead and always set it.
- */
- yyg->yy_did_buffer_switch_on_eof = 1;
-}
-
-static void yy_load_buffer_state (yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
- yyg->yytext_ptr = yyg->yy_c_buf_p =
YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
- yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
- yyg->yy_hold_char = *yyg->yy_c_buf_p;
-}
-
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c
YY_BUF_SIZE.
- * @param yyscanner The scanner object.
- * @return the allocated buffer state.
- */
- YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t
yyscanner)
-{
- YY_BUFFER_STATE b;
-
- b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )
,yyscanner );
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
- b->yy_buf_size = size;
-
- /* yy_ch_buf has to be 2 characters longer than the size given because
- * we need to put in 2 end-of-buffer characters.
- */
- b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ,yyscanner );
- if ( ! b->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
- b->yy_is_our_buffer = 1;
-
- yy_init_buffer(b,file ,yyscanner);
-
- return b;
-}
-
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- * @param yyscanner The scanner object.
- */
- void yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
- if ( ! b )
- return;
-
- if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
- YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-
- if ( b->yy_is_our_buffer )
- yyfree((void *) b->yy_ch_buf ,yyscanner );
-
- yyfree((void *) b ,yyscanner );
-}
-
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
-
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a yyrestart() or at EOF.
- */
- static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t
yyscanner)
-
-{
- int oerrno = errno;
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
- yy_flush_buffer(b ,yyscanner);
-
- b->yy_input_file = file;
- b->yy_fill_buffer = 1;
-
- /* If b is the current buffer, then yy_init_buffer was _probably_
- * called from yyrestart() or through yy_get_next_buffer.
- * In that case, we don't want to reset the lineno or column.
- */
- if (b != YY_CURRENT_BUFFER){
- b->yy_bs_lineno = 1;
- b->yy_bs_column = 0;
- }
-
- b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-
- errno = oerrno;
-}
-
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * @param yyscanner The scanner object.
- */
- void yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- if ( ! b )
- return;
-
- b->yy_n_chars = 0;
-
- /* We always need two end-of-buffer characters. The first causes
- * a transition to the end-of-buffer state. The second causes
- * a jam in that state.
- */
- b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
- b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
- b->yy_buf_pos = &b->yy_ch_buf[0];
-
- b->yy_at_bol = 1;
- b->yy_buffer_status = YY_BUFFER_NEW;
-
- if ( b == YY_CURRENT_BUFFER )
- yy_load_buffer_state(yyscanner );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- * the current state. This function will allocate the stack
- * if necessary.
- * @param new_buffer The new state.
- * @param yyscanner The scanner object.
- */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- if (new_buffer == NULL)
- return;
-
- yyensure_buffer_stack(yyscanner);
-
- /* This block is copied from yy_switch_to_buffer. */
- if ( YY_CURRENT_BUFFER )
- {
- /* Flush out information for old buffer. */
- *yyg->yy_c_buf_p = yyg->yy_hold_char;
- YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
- }
-
- /* Only push if top exists. Otherwise, replace top. */
- if (YY_CURRENT_BUFFER)
- yyg->yy_buffer_stack_top++;
- YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
- /* copied from yy_switch_to_buffer. */
- yy_load_buffer_state(yyscanner );
- yyg->yy_did_buffer_switch_on_eof = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- * The next element becomes the new top.
- * @param yyscanner The scanner object.
- */
-void yypop_buffer_state (yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- if (!YY_CURRENT_BUFFER)
- return;
-
- yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner);
- YY_CURRENT_BUFFER_LVALUE = NULL;
- if (yyg->yy_buffer_stack_top > 0)
- --yyg->yy_buffer_stack_top;
-
- if (YY_CURRENT_BUFFER) {
- yy_load_buffer_state(yyscanner );
- yyg->yy_did_buffer_switch_on_eof = 1;
- }
-}
-
-/* Allocates the stack if it does not exist.
- * Guarantees space for at least one push.
- */
-static void yyensure_buffer_stack (yyscan_t yyscanner)
-{
- int num_to_alloc;
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
- if (!yyg->yy_buffer_stack) {
-
- /* First allocation is just for 2 elements, since we don't know
if this
- * scanner will even need a stack. We use 2 instead of 1 to
avoid an
- * immediate realloc on the next call.
- */
- num_to_alloc = 1;
- yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc
- (num_to_alloc *
sizeof(struct yy_buffer_state*)
- , yyscanner);
- if ( ! yyg->yy_buffer_stack )
- YY_FATAL_ERROR( "out of dynamic memory in
yyensure_buffer_stack()" );
-
- memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct
yy_buffer_state*));
-
- yyg->yy_buffer_stack_max = num_to_alloc;
- yyg->yy_buffer_stack_top = 0;
- return;
- }
-
- if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
-
- /* Increase the buffer to prepare for a possible push. */
- int grow_size = 8 /* arbitrary grow size */;
-
- num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
- yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc
-
(yyg->yy_buffer_stack,
- num_to_alloc *
sizeof(struct yy_buffer_state*)
- , yyscanner);
- if ( ! yyg->yy_buffer_stack )
- YY_FATAL_ERROR( "out of dynamic memory in
yyensure_buffer_stack()" );
-
- /* zero only the new slots.*/
- memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0,
grow_size * sizeof(struct yy_buffer_state*));
- yyg->yy_buffer_stack_max = num_to_alloc;
- }
-}
-
-/** Setup the input buffer state to scan directly from a user-specified
character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t
yyscanner)
-{
- YY_BUFFER_STATE b;
-
- if ( size < 2 ||
- base[size-2] != YY_END_OF_BUFFER_CHAR ||
- base[size-1] != YY_END_OF_BUFFER_CHAR )
- /* They forgot to leave room for the EOB's. */
- return 0;
-
- b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )
,yyscanner );
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
- b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
- b->yy_buf_pos = b->yy_ch_buf = base;
- b->yy_is_our_buffer = 0;
- b->yy_input_file = 0;
- b->yy_n_chars = b->yy_buf_size;
- b->yy_is_interactive = 0;
- b->yy_at_bol = 1;
- b->yy_fill_buffer = 0;
- b->yy_buffer_status = YY_BUFFER_NEW;
-
- yy_switch_to_buffer(b ,yyscanner );
-
- return b;
-}
-
-/** Setup the input buffer state to scan a string. The next call to yylex()
will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- * yy_scan_bytes() instead.
- */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
-{
-
- return yy_scan_bytes(yystr,strlen(yystr) ,yyscanner);
-}
-
-/** Setup the input buffer state to scan the given bytes. The next call to
yylex() will
- * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a
bytes.
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ,
yyscan_t yyscanner)
-{
- YY_BUFFER_STATE b;
- char *buf;
- yy_size_t n;
- int i;
-
- /* Get memory for full buffer, including space for trailing EOB's. */
- n = _yybytes_len + 2;
- buf = (char *) yyalloc(n ,yyscanner );
- if ( ! buf )
- YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
- for ( i = 0; i < _yybytes_len; ++i )
- buf[i] = yybytes[i];
-
- buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-
- b = yy_scan_buffer(buf,n ,yyscanner);
- if ( ! b )
- YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
- /* It's okay to grow etc. this buffer, and we should throw it
- * away when we're done.
- */
- b->yy_is_our_buffer = 1;
-
- return b;
-}
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
-{
- (void) fprintf( stderr, "%s\n", msg );
- exit( YY_EXIT_FAILURE );
-}
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up yytext. */ \
- int yyless_macro_arg = (n); \
- YY_LESS_LINENO(yyless_macro_arg);\
- yytext[yyleng] = yyg->yy_hold_char; \
- yyg->yy_c_buf_p = yytext + yyless_macro_arg; \
- yyg->yy_hold_char = *yyg->yy_c_buf_p; \
- *yyg->yy_c_buf_p = '\0'; \
- yyleng = yyless_macro_arg; \
- } \
- while ( 0 )
-
-/* Accessor methods (get/set functions) to struct members. */
-
-/** Get the user-defined data for this scanner.
- * @param yyscanner The scanner object.
- */
-YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- return yyextra;
-}
-
-/** Get the current line number.
- * @param yyscanner The scanner object.
- */
-int yyget_lineno (yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
- if (! YY_CURRENT_BUFFER)
- return 0;
-
- return yylineno;
-}
-
-/** Get the current column number.
- * @param yyscanner The scanner object.
- */
-int yyget_column (yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
- if (! YY_CURRENT_BUFFER)
- return 0;
-
- return yycolumn;
-}
-
-/** Get the input stream.
- * @param yyscanner The scanner object.
- */
-FILE *yyget_in (yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- return yyin;
-}
-
-/** Get the output stream.
- * @param yyscanner The scanner object.
- */
-FILE *yyget_out (yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- return yyout;
-}
-
-/** Get the length of the current token.
- * @param yyscanner The scanner object.
- */
-int yyget_leng (yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- return yyleng;
-}
-
-/** Get the current token.
- * @param yyscanner The scanner object.
- */
-
-char *yyget_text (yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- return yytext;
-}
-
-/** Set the user-defined data. This data is never touched by the scanner.
- * @param user_defined The data to be associated with this scanner.
- * @param yyscanner The scanner object.
- */
-void yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- yyextra = user_defined ;
-}
-
-/** Set the current line number.
- * @param line_number
- * @param yyscanner The scanner object.
- */
-void yyset_lineno (int line_number , yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
- /* lineno is only valid if an input buffer exists. */
- if (! YY_CURRENT_BUFFER )
- yy_fatal_error( "yyset_lineno called with no buffer" , yyscanner);
-
- yylineno = line_number;
-}
-
-/** Set the current column.
- * @param line_number
- * @param yyscanner The scanner object.
- */
-void yyset_column (int column_no , yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
- /* column is only valid if an input buffer exists. */
- if (! YY_CURRENT_BUFFER )
- yy_fatal_error( "yyset_column called with no buffer" , yyscanner);
-
- yycolumn = column_no;
-}
-
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * @param yyscanner The scanner object.
- * @see yy_switch_to_buffer
- */
-void yyset_in (FILE * in_str , yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- yyin = in_str ;
-}
-
-void yyset_out (FILE * out_str , yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- yyout = out_str ;
-}
-
-int yyget_debug (yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- return yy_flex_debug;
-}
-
-void yyset_debug (int bdebug , yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- yy_flex_debug = bdebug ;
-}
-
-/* Accessor methods for yylval and yylloc */
-
-YYSTYPE * yyget_lval (yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- return yylval;
-}
-
-void yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- yylval = yylval_param;
-}
-
-YYLTYPE *yyget_lloc (yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- return yylloc;
-}
-
-void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- yylloc = yylloc_param;
-}
-
-/* User-visible API */
-
-/* yylex_init is special because it creates the scanner itself, so it is
- * the ONLY reentrant function that doesn't take the scanner as the last
argument.
- * That's why we explicitly handle the declaration, instead of using our
macros.
- */
-
-int yylex_init(yyscan_t* ptr_yy_globals)
-
-{
- if (ptr_yy_globals == NULL){
- errno = EINVAL;
- return 1;
- }
-
- *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL );
-
- if (*ptr_yy_globals == NULL){
- errno = ENOMEM;
- return 1;
- }
-
- /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00
for releases. */
- memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-
- return yy_init_globals ( *ptr_yy_globals );
-}
-
-/* yylex_init_extra has the same functionality as yylex_init, but follows the
- * convention of taking the scanner as the last argument. Note however, that
- * this is a *pointer* to a scanner, as it will be allocated by this call (and
- * is the reason, too, why this function also must handle its own declaration).
- * The user defined value in the first argument will be available to yyalloc in
- * the yyextra field.
- */
-
-int yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals )
-
-{
- struct yyguts_t dummy_yyguts;
-
- yyset_extra (yy_user_defined, &dummy_yyguts);
-
- if (ptr_yy_globals == NULL){
- errno = EINVAL;
- return 1;
- }
-
- *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ),
&dummy_yyguts );
-
- if (*ptr_yy_globals == NULL){
- errno = ENOMEM;
- return 1;
- }
-
- /* By setting to 0xAA, we expose bugs in
- yy_init_globals. Leave at 0x00 for releases. */
- memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-
- yyset_extra (yy_user_defined, *ptr_yy_globals);
-
- return yy_init_globals ( *ptr_yy_globals );
-}
-
-static int yy_init_globals (yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- /* Initialization is the same as for the non-reentrant scanner.
- * This function is called from yylex_destroy(), so don't allocate here.
- */
-
- yyg->yy_buffer_stack = 0;
- yyg->yy_buffer_stack_top = 0;
- yyg->yy_buffer_stack_max = 0;
- yyg->yy_c_buf_p = (char *) 0;
- yyg->yy_init = 0;
- yyg->yy_start = 0;
-
- yyg->yy_start_stack_ptr = 0;
- yyg->yy_start_stack_depth = 0;
- yyg->yy_start_stack = NULL;
-
-/* Defined in main.c */
-#ifdef YY_STDINIT
- yyin = stdin;
- yyout = stdout;
-#else
- yyin = (FILE *) 0;
- yyout = (FILE *) 0;
-#endif
-
- /* For future reference: Set errno on error, since we are called by
- * yylex_init()
- */
- return 0;
-}
-
-/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy (yyscan_t yyscanner)
-{
- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
- /* Pop the buffer stack, destroying each element. */
- while(YY_CURRENT_BUFFER){
- yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner );
- YY_CURRENT_BUFFER_LVALUE = NULL;
- yypop_buffer_state(yyscanner);
- }
-
- /* Destroy the stack itself. */
- yyfree(yyg->yy_buffer_stack ,yyscanner);
- yyg->yy_buffer_stack = NULL;
-
- /* Destroy the start condition stack. */
- yyfree(yyg->yy_start_stack ,yyscanner );
- yyg->yy_start_stack = NULL;
-
- /* Reset the globals. This is important in a non-reentrant scanner so the
next time
- * yylex() is called, initialization will occur. */
- yy_init_globals( yyscanner);
-
- /* Destroy the main struct (reentrant only). */
- yyfree ( yyscanner , yyscanner );
- yyscanner = NULL;
- return 0;
-}
-
-/*
- * Internal utility routines.
- */
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t
yyscanner)
-{
- register int i;
- for ( i = 0; i < n; ++i )
- s1[i] = s2[i];
-}
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
-{
- register int n;
- for ( n = 0; s[n]; ++n )
- ;
-
- return n;
-}
-#endif
-
-void *yyalloc (yy_size_t size , yyscan_t yyscanner)
-{
- return (void *) malloc( size );
-}
-
-void *yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner)
-{
- /* The cast to (char *) in the following accommodates both
- * implementations that use char* generic pointers, and those
- * that use void* generic pointers. It works with the latter
- * because both ANSI C and C++ allow castless assignment from
- * any pointer type to void*, and deal with argument conversions
- * as though doing an assignment.
- */
- return (void *) realloc( (char *) ptr, size );
-}
-
-void yyfree (void * ptr , yyscan_t yyscanner)
-{
- free( (char *) ptr ); /* see yyrealloc() for (char *) cast */
-}
-
-#define YYTABLES_NAME "yytables"
-
-#line 341 "ftp_lexer.lpp"
-
-
-
+#include "stdafx.h"
+#include "ftp_lexer.out.cpp"
diff --git a/myserver/src/protocol/ftp/ftp_lexer.cpp
b/myserver/src/protocol/ftp/ftp_lexer.out.cpp
similarity index 99%
copy from myserver/src/protocol/ftp/ftp_lexer.cpp
copy to myserver/src/protocol/ftp/ftp_lexer.out.cpp
index a612c9a..c3cf0f6 100644
--- a/myserver/src/protocol/ftp/ftp_lexer.cpp
+++ b/myserver/src/protocol/ftp/ftp_lexer.out.cpp
@@ -1,6 +1,6 @@
-#line 2 "ftp_lexer.cpp"
+#line 2 "ftp_lexer.out.cpp"
-#line 4 "ftp_lexer.cpp"
+#line 4 "ftp_lexer.out.cpp"
#define YY_INT_ALIGNED short int
@@ -573,7 +573,7 @@ static yyconst flex_int16_t yy_chk[368] =
-#line 577 "ftp_lexer.cpp"
+#line 577 "ftp_lexer.out.cpp"
#define INITIAL 0
#define SHORT_STRING 1
@@ -825,7 +825,7 @@ YY_DECL
#line 19 "ftp_lexer.lpp"
/* Login */
-#line 829 "ftp_lexer.cpp"
+#line 829 "ftp_lexer.out.cpp"
yylval = yylval_param;
@@ -1406,7 +1406,7 @@ YY_RULE_SETUP
#line 341 "ftp_lexer.lpp"
ECHO;
YY_BREAK
-#line 1410 "ftp_lexer.cpp"
+#line 1410 "ftp_lexer.out.cpp"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(SHORT_STRING):
case YY_STATE_EOF(STRING):
diff --git a/myserver/stdafx.h b/myserver/stdafx.h
index b0b969e..8f60ac7 100644
--- a/myserver/stdafx.h
+++ b/myserver/stdafx.h
@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
#endif
#ifdef HAVE_CONFIG_H
+# include <cstdlib>
# include <config.h>
#endif
@@ -40,7 +41,6 @@ extern "C"
}
#endif
-
extern "C"
{
#include <stdlib.h>
@@ -48,6 +48,8 @@ extern "C"
#include <fcntl.h>
#include <math.h>
#include <time.h>
+#include <ctype.h>
+
#ifndef WIN32
# include <sys/types.h>
commit 9a17c72d56791d9517bde1ce9d45d843b2d27031
Author: Giuseppe Scrivano <address@hidden>
Date: Sat Oct 31 21:59:04 2009 +0100
Remove casts that are not needed.
diff --git a/myserver/src/http_handler/cgi/cgi.cpp
b/myserver/src/http_handler/cgi/cgi.cpp
index 57a011b..444c01e 100644
--- a/myserver/src/http_handler/cgi/cgi.cpp
+++ b/myserver/src/http_handler/cgi/cgi.cpp
@@ -58,8 +58,8 @@ int Cgi::send (HttpThreadContext* td, const char* scriptpath,
const char *cgipath, bool execute, bool onlyHeader)
{
/*
- *Use this flag to check if the CGI executable is
- *nph (Non Parsed Header).
+ * Use this flag to check if the CGI executable is
+ * nph (Non Parsed Header).
*/
bool nph = false;
ostringstream cmdLine;
@@ -343,11 +343,12 @@ int Cgi::sendData (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chain,
return 1;
/* Create the output filters chain. */
- if (td->mime && Server::getInstance ()->getFiltersFactory ()->chain (&chain,
-
td->mime->filters,
-
td->connection->socket,
- &nbw,
- 1))
+ if (td->mime
+ && Server::getInstance ()->getFiltersFactory ()->chain (&chain,
+ td->mime->filters,
+ td->connection->socket,
+ &nbw,
+ 1))
{
td->connection->host->warningsLogWrite (_("Cgi: internal error"));
return td->http->raiseHTTPError (500);
@@ -362,10 +363,12 @@ int Cgi::sendData (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chain,
int aliveProcess = 0;
u_long ticks = getTicks () - procStartTime;
u_long timeout = td->http->getTimeout ();
- if (ticks >= timeout ||
- stdOutFile.waitForData ((timeout - ticks) / 1000, (timeout - ticks)
% 1000) == 0)
+ if (timeout <= ticks
+ || stdOutFile.waitForData ((timeout - ticks) / 1000,
+ (timeout - ticks) % 1000) == 0)
{
- td->connection->host->warningsLogWrite (_("Cgi: process %i
timeout"), cgiProc.getPid ());
+ td->connection->host->warningsLogWrite (_("Cgi: process %i timeout"),
+ cgiProc.getPid ());
break;
}
@@ -416,6 +419,7 @@ int Cgi::sendHeader (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chai
u_long headerOffset = 0;
u_long nbw = 0;
u_long nBytesRead;
+
/* Parse initial chunks of data looking for the HTTP header. */
while (!headerCompleted && !nph)
{
@@ -424,19 +428,21 @@ int Cgi::sendHeader (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chai
bool term;
nBytesRead = 0;
+
/* Do not try to read using a small buffer as this has some
bad influence on the performances. */
if (td->secondaryBuffer->getRealLength () - headerOffset - 1 < 512)
break;
term = stdOutFile.pipeTerminated ();
-
- if (!term &&
- stdOutFile.waitForData ((timeout - ticks) / 1000, (timeout - ticks) %
1000) == 0)
- {
- td->connection->host->warningsLogWrite (_("Cgi: process %i timeout"),
cgiProc.getPid ());
- break;
- }
+ if (!term
+ && stdOutFile.waitForData ((timeout - ticks) / 1000,
+ (timeout - ticks) % 1000) == 0)
+ {
+ td->connection->host->warningsLogWrite (_("Cgi: process %i timeout"),
+ cgiProc.getPid ());
+ break;
+ }
if (stdOutFile.read (td->secondaryBuffer->getBuffer () + headerOffset,
td->secondaryBuffer->getRealLength () - headerOffset
- 1,
@@ -454,7 +460,6 @@ int Cgi::sendHeader (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chai
}
headerOffset += nBytesRead;
-
if (headerOffset > td->buffersize - 5)
(td->secondaryBuffer->getBuffer ())[headerOffset] = '\0';
@@ -464,17 +469,17 @@ int Cgi::sendHeader (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chai
return 1;
}
- for (u_long i = std::max (0, (int)headerOffset - (int)nBytesRead - 10);
+ for (u_long i = std::max (0UL, headerOffset - nBytesRead - 10);
i < headerOffset; i++)
{
char *buff = td->secondaryBuffer->getBuffer ();
- if ( (buff[i] == '\r') && (buff[i+1] == '\n')
- && (buff[i+2] == '\r') && (buff[i+3] == '\n') )
+ if ((buff[i] == '\r') && (buff[i+1] == '\n')
+ && (buff[i+2] == '\r') && (buff[i+3] == '\n'))
{
/*
- *The HTTP header ends with a \r\n\r\n sequence so
- *determine where it ends and set the header size
- *to i + 4.
+ * The HTTP header ends with a \r\n\r\n sequence so
+ * determine where it ends and set the header size
+ * to i + 4.
*/
headerSize = i + 4 ;
headerCompleted = true;
@@ -511,7 +516,8 @@ int Cgi::sendHeader (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chai
{
string* location = td->response.getValue ("Location", 0);
- /* If it is present Location: foo in the header send a redirect to
`foo'. */
+ /* If it is present "Location: foo" in the header then send a
redirect
+ * to `foo'. */
if (location && location->length ())
{
*ret = td->http->sendHTTPRedirect (location->c_str ());
@@ -537,7 +543,7 @@ int Cgi::sendHeader (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chai
{
/* Flush the buffer. Data from the header parsing can be present. */
if (HttpDataHandler::appendDataToHTTPChannel (td,
-
td->secondaryBuffer->getBuffer () + headerSize,
+ td->secondaryBuffer->getBuffer () + headerSize,
headerOffset - headerSize,
&(td->outputData),
&chain,
-----------------------------------------------------------------------
Summary of changes:
myserver/include/base/hash_map/hash_map.h | 3 +-
myserver/include/base/process/fork_server.h | 11 +-
.../include/base/process/process_server_manager.h | 3 +-
.../include/base/read_directory/read_directory.h | 2 +-
myserver/include/base/socket/socket.h | 1 -
myserver/include/log/log_manager.h | 4 +-
myserver/include/protocol/ftp/ftp.h | 2 +
myserver/src/base/file/file.cpp | 8 +-
myserver/src/base/pipe/pipe.cpp | 6 +-
.../src/base/process/process_server_manager.cpp | 89 +-
myserver/src/base/socket/socket.cpp | 5 +-
myserver/src/base/unix_socket/unix_socket.cpp | 4 +-
myserver/src/conf/nodetree.cpp | 1 +
myserver/src/conf/vhost/vhost.cpp | 1 +
myserver/src/conf/xml_conf.cpp | 12 +-
myserver/src/connection/connection.cpp | 1 +
myserver/src/filter/console.cpp | 1 +
myserver/src/http_handler/cgi/cgi.cpp | 58 +-
myserver/src/http_handler/isapi/isapi.cpp | 13 +-
myserver/src/http_handler/wincgi/wincgi.cpp | 2 +-
myserver/src/log/log_manager.cpp | 1 +
myserver/src/log/stream/console_stream.cpp | 1 +
myserver/src/log/stream/console_stream_creator.cpp | 1 +
myserver/src/log/stream/file_stream.cpp | 1 +
myserver/src/log/stream/file_stream_creator.cpp | 1 +
myserver/src/log/stream/log_stream.cpp | 1 +
myserver/src/log/stream/log_stream_creator.cpp | 1 +
myserver/src/log/stream/log_stream_factory.cpp | 1 +
myserver/src/log/stream/socket_stream.cpp | 1 +
myserver/src/log/stream/socket_stream_creator.cpp | 1 +
myserver/src/myserver.cpp | 9 +-
myserver/src/protocol/ftp/Makefile.am | 3 +-
myserver/src/protocol/ftp/ftp.cpp | 1 +
myserver/src/protocol/ftp/ftp_lexer.cpp | 2596 +-------------------
.../ftp/{ftp_lexer.cpp => ftp_lexer.out.cpp} | 10 +-
myserver/stdafx.h | 4 +-
36 files changed, 155 insertions(+), 2705 deletions(-)
copy myserver/src/protocol/ftp/{ftp_lexer.cpp => ftp_lexer.out.cpp} (99%)
hooks/post-receive
--
GNU MyServer
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. 445a99b22aea4649b754104185d43e717cbb8cb1,
Giuseppe Scrivano <=