[myserver-commit] [SCM] GNU MyServer branch, master, updated. 7988b433085245768b52094ca966cca373805b64

[Giuseppe Scrivano]

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  7988b433085245768b52094ca966cca373805b64 (commit)
       via  096cf8afb39c099d5d563b663634fe5af76117bc (commit)
      from  557586ede10752cea13127767c93ac072d6f40ed (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 7988b433085245768b52094ca966cca373805b64
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Nov 1 14:43:18 2009 +0100

    Some minor aesthetic changes

diff --git a/myserver/src/protocol/gopher/engine.cpp 
b/myserver/src/protocol/gopher/engine.cpp
index c7ac396..4cf62a1 100644
--- a/myserver/src/protocol/gopher/engine.cpp
+++ b/myserver/src/protocol/gopher/engine.cpp
@@ -127,7 +127,7 @@ void GopherEngine::fileManagement (const string &fname, 
const string &path,Gophe
   else
     {
       MimeRecord *mime = getMIME (abs_name);
-      if (mime!=NULL)
+      if (mime != NULL)
         {
           string mymime = mime->mimeType;
           mymime = mymime.substr (0,mymime.find ('/',0));
@@ -262,7 +262,7 @@ void GopherEngine::gifFile (const string &fname, const 
string &path, GopherMenu
                           port.c_str ()));
 }
 
-void GopherEngine::infoFile (const string &fname, const string 
&path,GopherMenu &tmp)
+void GopherEngine::infoFile (const string &fname, const string &path, 
GopherMenu &tmp)
 {
   string file_path;
   file_path.append (abs_path);
@@ -275,7 +275,7 @@ void GopherEngine::infoFile (const string &fname, const 
string &path,GopherMenu
   int state;
   u_long fsize;
   state = f.openFile (file_path.c_str (), File::READ);
-  if(!state)
+  if (!state)
     {
       MemBuf buff;
       u_long real;
diff --git a/myserver/src/protocol/gopher/gopher.cpp 
b/myserver/src/protocol/gopher/gopher.cpp
index 14e978c..c694368 100644
--- a/myserver/src/protocol/gopher/gopher.cpp
+++ b/myserver/src/protocol/gopher/gopher.cpp
@@ -33,13 +33,15 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
  */
 
 Gopher::Gopher ()
-{}
+{
+}
 
 /*!
  * Destructor for the Gopher class.
  */
 Gopher::~Gopher ()
-{}
+{
+}
 
 /*!
  * Service method
@@ -48,9 +50,8 @@ Gopher::~Gopher ()
 char *Gopher::registerNameImpl (char* out, int len)
 {
   if (out)
-    {
-      myserver_strlcpy (out, "GOPHER", len);
-    }
+    myserver_strlcpy (out, "GOPHER", len);
+
   return (char*) "GOPHER";
 }
 
@@ -59,7 +60,8 @@ char *Gopher::registerNameImpl (char* out, int len)
  */
 
 int Gopher::loadProtocolStatic ()
-{}
+{
+}
 
 int Gopher::unLoadProtocolStatic ()
 {
@@ -84,20 +86,22 @@ int Gopher::controlConnection (ConnectionPtr pConnection,
 
   if (pConnection == NULL)
     return ClientsThread::DELETE_CONNECTION;
+
   Server *server = Server::getInstance ();
   if (server == NULL)
     return ClientsThread::DELETE_CONNECTION;
+
   string command (b1);
-  string::size_type loc = command.find ('\n',0);
-  while( loc == string::npos ){
-    pConnection->socket->read (buffer, sizeof (buffer), &nbr);
-    command+=buffer;
-    loc = command.find ('\n',0);
-  }
-  GopherContent &Gu = g.incoming (GopherRequest (command.substr (0,
-                                                                 ((int)loc)-1),
-                                                 pConnection)
-                                  ,pConnection->host);
+  string::size_type loc = command.find ('\n', 0);
+  while( loc == string::npos )
+    {
+      pConnection->socket->read (buffer, sizeof (buffer), &nbr);
+      command += buffer;
+      loc = command.find ('\n', 0);
+    }
+
+  GopherContent &Gu = g.incoming (GopherRequest (command.substr (0, loc - 1),
+                                            pConnection), pConnection->host);
   reply (pConnection,Gu);
 }
 



commit 096cf8afb39c099d5d563b663634fe5af76117bc
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Nov 1 14:37:07 2009 +0100

    Update AUTHORS.

diff --git a/myserver/AUTHORS b/myserver/AUTHORS
index bfe4ab4..92ebf99 100644
--- a/myserver/AUTHORS
+++ b/myserver/AUTHORS
@@ -8,6 +8,9 @@ Russ Bohnhoff <address@hidden>
 Original port to POSIX.
 Developed the first GUI control program.
 
+Domenico Chierico <address@hidden>
+Implemented the Gopher protocol.
+
 Alexandru Iancu <address@hidden>
 Implemented the IPv6 protocol.
 Implemented the FTP protocol.

-----------------------------------------------------------------------

Summary of changes:
 myserver/AUTHORS                        |    3 ++
 myserver/src/protocol/gopher/engine.cpp |    6 ++--
 myserver/src/protocol/gopher/gopher.cpp |   36 +++++++++++++++++-------------
 3 files changed, 26 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
GNU MyServer