[myserver-commit] [2828] All tests are successful on `FreeBSD'.

[Giuseppe Scrivano]

Revision: 2828
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2828
Author:   gscrivano
Date:     2008-09-20 12:54:53 +0000 (Sat, 20 Sep 2008)

Log Message:
-----------
All tests are successful on `FreeBSD'.

Modified Paths:
--------------
    trunk/myserver/include/base/utility.h
    trunk/myserver/src/Makefile.am
    trunk/myserver/src/base/home_dir/home_dir.cpp
    trunk/myserver/src/base/sync/recursive_mutex.cpp
    trunk/myserver/src/base/utility.cpp
    trunk/myserver/tests/test_regex.cpp

Modified: trunk/myserver/include/base/utility.h
===================================================================
--- trunk/myserver/include/base/utility.h       2008-09-20 11:12:11 UTC (rev 
2827)
+++ trunk/myserver/include/base/utility.h       2008-09-20 12:54:53 UTC (rev 
2828)
@@ -35,11 +35,12 @@
 #define MYSERVER_KB(x) (x << 10)       //x * 1024
 #define MYSERVER_MB(x) (x << 20)       //x * 1024 * 1024
 #define MYSERVER_SEC(x) (x * 1000)
-#define OS_WINDOWS_9X            1
-#define OS_WINDOWS_2000                2
-#define OS_WINDOWS_NT3         3
-#define OS_WINDOWS_XP            4
-#define OS_LINUX               100  // Add room for future windows
+#define OS_WINDOWS_9X      1
+#define OS_WINDOWS_2000    2
+#define OS_WINDOWS_NT3     3
+#define OS_WINDOWS_XP      4
+#define OS_GNU_LINUX       100
+#define OS_FREEBSD         200
 
 int preparePrintError();
 int endPrintError();

Modified: trunk/myserver/src/Makefile.am
===================================================================
--- trunk/myserver/src/Makefile.am      2008-09-20 11:12:11 UTC (rev 2827)
+++ trunk/myserver/src/Makefile.am      2008-09-20 12:54:53 UTC (rev 2828)
@@ -25,4 +25,4 @@
 
 clean-local:
        rm -f libmyserver.a
-       find -iregex .*\\.$(OBJEXT) | xargs rm -f
+       find . | grep .*\\.$(OBJEXT)$ | xargs rm -f

Modified: trunk/myserver/src/base/home_dir/home_dir.cpp
===================================================================
--- trunk/myserver/src/base/home_dir/home_dir.cpp       2008-09-20 11:12:11 UTC 
(rev 2827)
+++ trunk/myserver/src/base/home_dir/home_dir.cpp       2008-09-20 12:54:53 UTC 
(rev 2828)
@@ -153,20 +153,28 @@
 
   usersFile.read(buffer, size, &read);
   buffer[read] = '\0';
-  
-  for(counter = 0; counter < read; counter++)
-    if(buffer[counter] == ':' || buffer[counter] == '\n')
-      buffer[counter] = '\0';
 
-  for(counter = 0; buffer[counter] != 0;)
+ for(counter = 0; counter < read; counter++)
+   if(buffer[counter] == ':')
+     buffer[counter] = '\0';
+
+
+  for(counter = 0; counter < size;)
   {
     char *username = 0;
     char *home = 0;
     string sUsername;
     string *sHome;
-     string *old;
-    /* Username.  */
- 
+    string *old;
+     
+    if(buffer[counter] == '#')
+      while(buffer[counter++] != '\n');
+
+    if(counter >= size)
+      break;
+
+     /* Username.  */
+
     username = &buffer[counter];
 
      while(buffer[counter++] != '\0');
@@ -183,7 +191,6 @@
 
      while(buffer[counter++] != '\0');
     /* Home.  */
-    
 
     home = &buffer[counter++];
     sUsername = string(username);
@@ -197,7 +204,7 @@
     while(buffer[counter++] != '\0');
     /* Shell.  */
 
-     while(buffer[counter++] != '\0');
+    while(buffer[counter++] != '\n');
     /* Next tuple.  */
   }
   delete [] buffer;

Modified: trunk/myserver/src/base/sync/recursive_mutex.cpp
===================================================================
--- trunk/myserver/src/base/sync/recursive_mutex.cpp    2008-09-20 11:12:11 UTC 
(rev 2827)
+++ trunk/myserver/src/base/sync/recursive_mutex.cpp    2008-09-20 12:54:53 UTC 
(rev 2828)
@@ -64,6 +64,7 @@
   }
 #ifdef HAVE_PTHREAD
   pthread_mutexattr_t mta;
+  pthread_mutexattr_init(&mta);
   pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_RECURSIVE);
   ret = pthread_mutex_init(&mutex, &mta);
 #else

Modified: trunk/myserver/src/base/utility.cpp
===================================================================
--- trunk/myserver/src/base/utility.cpp 2008-09-20 11:12:11 UTC (rev 2827)
+++ trunk/myserver/src/base/utility.cpp 2008-09-20 12:54:53 UTC (rev 2828)
@@ -86,13 +86,16 @@
     ret = OS_WINDOWS_XP;
     break;
   }
-#else
+#endif
+
 #ifdef __linux__
-  ret = OS_LINUX;
-#else
-  ret = 0;
+  ret = OS_GNU_LINUX;
 #endif
+
+#ifdef __FreeBSD__
+  ret = OS_FREEBSD;
 #endif
+
   return ret;
 }  
 

Modified: trunk/myserver/tests/test_regex.cpp
===================================================================
--- trunk/myserver/tests/test_regex.cpp 2008-09-20 11:12:11 UTC (rev 2827)
+++ trunk/myserver/tests/test_regex.cpp 2008-09-20 12:54:53 UTC (rev 2828)
@@ -55,8 +55,8 @@
     CPPUNIT_ASSERT_EQUAL(ret, 0);
 
 
-    CPPUNIT_ASSERT_EQUAL(pm[1].rm_so, 6);
-    CPPUNIT_ASSERT_EQUAL(pm[1].rm_eo, 11);
+    CPPUNIT_ASSERT_EQUAL((int)pm[1].rm_so, 6);
+    CPPUNIT_ASSERT_EQUAL((int)pm[1].rm_eo, 11);
   }
 
   void testStarMatch()