[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-387-ga2f8be3

[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  a2f8be3feb4375098298d9d00dded7fa2895ba29 (commit)
       via  efe029b8a534ef0920180157a731e9ffc8e8da9b (commit)
       via  bf9d13b0649df69d24f5c7048064cb6caf361268 (commit)
       via  dbd89a9633fa114587b535c5e614a87d4880d44e (commit)
       via  b8548618700c90cf1868466d694db77b622e096c (commit)
      from  a31b099e0be9149abedea8b28e7f8ef9891c93a6 (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 a2f8be3feb4375098298d9d00dded7fa2895ba29
Author: Giuseppe Scrivano <address@hidden>
Date:   Mon Aug 30 02:07:30 2010 +0200

    Specify O_BINARY as flag to `open' when it is defined.

diff --git a/myserver/src/base/file/file.cpp b/myserver/src/base/file/file.cpp
index 1239b4f..4b4f2b0 100644
--- a/myserver/src/base/file/file.cpp
+++ b/myserver/src/base/file/file.cpp
@@ -150,6 +150,9 @@ int File::openFile (const char* nfilename, u_long opt, 
mode_t mask)
   if (opt & File::APPEND)
     flags |= O_APPEND;
 
+#ifdef O_BINARY
+  flags |= O_BINARY;
+#endif
 
   if (opt & (File::TEMPORARY_DELAYED | File::TEMPORARY))
     {



commit efe029b8a534ef0920180157a731e9ffc8e8da9b
Author: Giuseppe Scrivano <address@hidden>
Date:   Mon Aug 30 01:53:27 2010 +0200

    ListenThread: make clearer some error messages.

diff --git a/myserver/src/connections_scheduler/listen_threads.cpp 
b/myserver/src/connections_scheduler/listen_threads.cpp
index b2cbd2a..b8a8d9b 100644
--- a/myserver/src/connections_scheduler/listen_threads.cpp
+++ b/myserver/src/connections_scheduler/listen_threads.cpp
@@ -102,7 +102,7 @@ int ListenThreads::createServerAndListener (u_short port)
   catch (exception & e)
     {
       server->log (MYSERVER_LOG_MSG_ERROR,
-                   _E ("Error while creating the server socket"), &e);
+                   _E ("Error while creating the server socket : %e"), &e);
       delete serverSocketIPv4;
       serverSocketIPv4 = NULL;
     }
@@ -133,7 +133,7 @@ int ListenThreads::createServerAndListener (u_short port)
   catch (exception & e)
     {
       server->log (MYSERVER_LOG_MSG_ERROR,
-                   _("Error while creating the server socket"));
+                   _("Error while creating the IPv6 server socket : %e"), &e);
       delete serverSocketIPv6;
       serverSocketIPv6 = NULL;
     }



commit bf9d13b0649df69d24f5c7048064cb6caf361268
Author: Giuseppe Scrivano <address@hidden>
Date:   Mon Aug 30 01:42:14 2010 +0200

    Fix compiler warnings

diff --git a/myserver/tests/test_mutex.cpp b/myserver/tests/test_mutex.cpp
index 8a543db..2df78a9 100644
--- a/myserver/tests/test_mutex.cpp
+++ b/myserver/tests/test_mutex.cpp
@@ -49,7 +49,7 @@ static DEFINE_THREAD (test_mutex_incrementer, pParam)
     arg->mutex->unlock ();
   }
 
-  return NULL;
+  return 0;
 }
 
 
diff --git a/myserver/tests/test_thread.cpp b/myserver/tests/test_thread.cpp
index 04e6b48..29adb50 100644
--- a/myserver/tests/test_thread.cpp
+++ b/myserver/tests/test_thread.cpp
@@ -34,7 +34,7 @@ static DEFINE_THREAD (test_thread,pParam)
 
   *arg *= *arg;
 
-  return NULL;
+  return 0;
 }
 
 static DEFINE_THREAD (test_terminate_thread, pParam)
@@ -48,7 +48,7 @@ static DEFINE_THREAD (test_terminate_thread, pParam)
   /* Should never be here.  */
   *arg = 1;
 
-  return NULL;
+  return 0;
 }
 
 class TestThread : public CppUnit::TestFixture



commit dbd89a9633fa114587b535c5e614a87d4880d44e
Author: Giuseppe Scrivano <address@hidden>
Date:   Mon Aug 30 01:03:55 2010 +0200

    Do not protect "localedir.h"

diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index 698b2c1..2390b95 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -37,11 +37,8 @@
 # include <signal.h>
 #endif
 
-
-#ifdef HAVE_GETTEXT
-# include "localedir.h"
-#endif
-
+#include <libintl.h>
+#include "localedir.h"
 
 enum
 {



commit b8548618700c90cf1868466d694db77b622e096c
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Aug 29 21:23:50 2010 +0200

    Under W32, allow both back slash and forward slash in paths.

diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index 249554a..698b2c1 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -353,10 +353,10 @@ static void updateWorkingDirectory (const char 
*firstArgument)
   string path (firstArgument);
   size_t index;
 
-#ifdef WIN32
-  index = path.find_last_of ('\\');
-#else
   index = path.find_last_of ('/');
+
+#ifdef WIN32
+  index = max (index, path.find_last_of ('\\'));
 #endif
 
   if (index != string::npos)

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

Summary of changes:
 myserver/src/base/file/file.cpp                    |    3 +++
 .../src/connections_scheduler/listen_threads.cpp   |    4 ++--
 myserver/src/myserver.cpp                          |   13 +++++--------
 myserver/tests/test_mutex.cpp                      |    2 +-
 myserver/tests/test_thread.cpp                     |    4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
GNU MyServer