replaced !defined (ACE_WIN32) && !defined (VXWORKS) with !defined (ACE_LACKS_FORK)

1 files changed, 86 insertions, 86 deletions

diff --git a/tests/SOCK_Test.cpp b/tests/SOCK_Test.cpp
index 1f1c3324414..2c739466733 100644
--- a/tests/SOCK_Test.cpp
+++ b/tests/SOCK_Test.cpp
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    tests
-// 
+//
 // = FILENAME
 //    SOCK_Test.cpp
 //
@@ -17,7 +17,7 @@
 //
 // = AUTHOR
 //    Prashant Jain and Doug Schmidt
-// 
+//
 // ============================================================================
 
 #include "test_config.h"
@@ -25,7 +25,7 @@
 #include "ace/Thread.h"
 #include "ace/Thread_Manager.h"
 #include "ace/SOCK_Connector.h"
-#include "ace/SOCK_Acceptor.h"                             
+#include "ace/SOCK_Acceptor.h"
 #include "ace/Handle_Set.h"
 
 static void *
@@ -38,34 +38,34 @@ client (void *arg)
 
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) starting non-blocking connect\n")));
   // Initiate timed, non-blocking connection with server.
-  
+
   // Attempt a non-blocking connect to the server.
   if (con.connect (cli_stream, server_addr,
-		   (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
+                   (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
     {
       if (errno != EWOULDBLOCK)
-	ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("connection failed")));
+        ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("connection failed")));
 
       ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) starting timed connect\n")));
 
-      // Check if non-blocking connection is in progress, 
+      // Check if non-blocking connection is in progress,
       // and wait up to ACE_DEFAULT_TIMEOUT seconds for it to complete.
       ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT);
 
       if (con.complete (cli_stream, &server_addr, &tv) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("connection failed")), 0);
+        ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("connection failed")), 0);
       else
-	ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) connected to %s\n"), 
-		    server_addr.get_host_name ()));
+        ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) connected to %s\n"),
+                    server_addr.get_host_name ()));
     }
 
   if (cli_stream.disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("disable")));    
+    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("disable")));
 
   // Send data to server (correctly handles "incomplete writes").
-  
+
   for (char *c = ACE_ALPHABET; *c != '\0'; c++)
-    if (cli_stream.send_n (c, 1) == -1) 
+    if (cli_stream.send_n (c, 1) == -1)
       ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("send_n")));
 
   // Explicitly close the writer-side of the connection.
@@ -79,7 +79,7 @@ client (void *arg)
     ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("recv_n")));
 
   // Close the connection completely.
-  if (cli_stream.close () == -1) 
+  if (cli_stream.close () == -1)
     ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("close")));
 
   return 0;
@@ -95,21 +95,21 @@ server (void *arg)
 
   // Keep these objects out here to prevent excessive constructor
   // calls...
-  ACE_SOCK_Stream new_stream;                                   
+  ACE_SOCK_Stream new_stream;
   ACE_INET_Addr cli_addr;
   ACE_Handle_Set handle_set;
   const ACE_Time_Value def_timeout (ACE_DEFAULT_TIMEOUT);
   ACE_Time_Value tv (def_timeout);
 
-  char buf[BUFSIZ];                                     
+  char buf[BUFSIZ];
   char *t = ACE_ALPHABET;
-      
+
   handle_set.reset ();
   handle_set.set_bit (peer_acceptor->get_handle ());
-      
+
   int result = ACE_OS::select (int (peer_acceptor->get_handle ()) + 1,
-			       handle_set,
-			       0, 0, &tv);
+                               handle_set,
+                               0, 0, &tv);
   ACE_ASSERT (tv == def_timeout);
 
   if (result == -1)
@@ -122,64 +122,64 @@ server (void *arg)
 
   // Create a new ACE_SOCK_Stream endpoint (note automatic restart
   // if errno == EINTR).
-      
+
   while ((result = peer_acceptor->accept (new_stream, &cli_addr)) != -1)
     {
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) client %s connected from %d\n"), 
-		  cli_addr.get_host_name (), cli_addr.get_port_number ()));
-	  
+      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) client %s connected from %d\n"),
+                  cli_addr.get_host_name (), cli_addr.get_port_number ()));
+
       // Enable non-blocking I/O.
       if (new_stream.enable (ACE_NONBLOCK) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("enable")), 0);
-	  
+        ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("enable")), 0);
+
       handle_set.reset ();
       handle_set.set_bit (new_stream.get_handle ());
-	  
+
       // Read data from client (terminate on error).
-	  
+
       for (ssize_t r_bytes; ;)
-	{
-	  if (ACE_OS::select (int (new_stream.get_handle ()) + 1,
-			      handle_set,
-			      0, 0, 0) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("select")), 0);
-	      
-	  while ((r_bytes = new_stream.recv (buf, 1)) > 0)
-	    {
-	      ACE_ASSERT (*t == buf[0]);
-	      t++;
-	    }
-	      
-	  if (r_bytes == 0)
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  ASYS_TEXT ("(%P|%t) reached end of input, connection closed by client\n")));
-
-	      // Handshake back with client.
-	      if (new_stream.send_n ("", 1) != 1)
-		ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("send_n")));
-
-	      // Close endpoint.
-	      if (new_stream.close () == -1) 
-		ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("close")));
-	      return 0;
-	    }
-	  else if (r_bytes == -1)
-	    {
-	      if (errno == EAGAIN || errno == EWOULDBLOCK)
-		ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) no input available, going back to reading\n")));
-	      else
-		ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("recv_n")), 0);
-	    }
-	}
+        {
+          if (ACE_OS::select (int (new_stream.get_handle ()) + 1,
+                              handle_set,
+                              0, 0, 0) == -1)
+            ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("select")), 0);
+
+          while ((r_bytes = new_stream.recv (buf, 1)) > 0)
+            {
+              ACE_ASSERT (*t == buf[0]);
+              t++;
+            }
+
+          if (r_bytes == 0)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          ASYS_TEXT ("(%P|%t) reached end of input, connection closed by client\n")));
+
+              // Handshake back with client.
+              if (new_stream.send_n ("", 1) != 1)
+                ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("send_n")));
+
+              // Close endpoint.
+              if (new_stream.close () == -1)
+                ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("close")));
+              return 0;
+            }
+          else if (r_bytes == -1)
+            {
+              if (errno == EAGAIN || errno == EWOULDBLOCK)
+                ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) no input available, going back to reading\n")));
+              else
+                ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("recv_n")), 0);
+            }
+        }
     }
 
   if (result == -1)
     {
       if (errno == EWOULDBLOCK)
-	ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) no connections available, shutting down\n")));
+        ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) no connections available, shutting down\n")));
       else
-	ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("accept")));
+        ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("accept")));
     }
 
   return 0;
@@ -198,39 +198,39 @@ spawn (void)
   if (peer_acceptor.open (ACE_Addr::sap_any) == -1
       || peer_acceptor.get_local_addr (server_addr) == -1)
     ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("open")));
-  else 
+  else
     {
       ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) starting server at port %d\n"),
-		  server_addr.get_port_number ()));
+                  server_addr.get_port_number ()));
 
-#if !defined (ACE_WIN32) && !defined (VXWORKS)
+#if !defined (ACE_LACKS_FORK)
       switch (ACE_OS::fork ("child"))
-	{
-	case -1:
-	  ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n%a"), ASYS_TEXT ("fork failed")));
-	  /* NOTREACHED */
-	case 0: 
-	  client (&server_addr);
-	  exit (0);
-	  /* NOTREACHED */
-	default:
-	  server ((void *) &peer_acceptor);
-	  ACE_OS::wait ();
-	}
+        {
+        case -1:
+          ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n%a"), ASYS_TEXT ("fork failed")));
+          /* NOTREACHED */
+        case 0:
+          client (&server_addr);
+          exit (0);
+          /* NOTREACHED */
+        default:
+          server ((void *) &peer_acceptor);
+          ACE_OS::wait ();
+        }
 #elif defined (ACE_HAS_THREADS)
-      if (ACE_Thread_Manager::instance ()->spawn 
-	  (ACE_THR_FUNC (server), (void *) &peer_acceptor, THR_NEW_LWP | THR_DETACHED) == -1)
-	ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n%a"), ASYS_TEXT ("thread create failed")));
+      if (ACE_Thread_Manager::instance ()->spawn
+          (ACE_THR_FUNC (server), (void *) &peer_acceptor, THR_NEW_LWP | THR_DETACHED) == -1)
+        ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n%a"), ASYS_TEXT ("thread create failed")));
 
-      if (ACE_Thread_Manager::instance ()->spawn 
-	  (ACE_THR_FUNC (client), (void *) &server_addr, THR_NEW_LWP | THR_DETACHED) == -1)
-	ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n%a"), ASYS_TEXT ("thread create failed")));
+      if (ACE_Thread_Manager::instance ()->spawn
+          (ACE_THR_FUNC (client), (void *) &server_addr, THR_NEW_LWP | THR_DETACHED) == -1)
+        ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n%a"), ASYS_TEXT ("thread create failed")));
 
       // Wait for the threads to exit.
       ACE_Thread_Manager::instance ()->wait ();
 #else
       ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"), 1));
-#endif /* ACE_HAS_THREADS */	
+#endif /* ACE_HAS_THREADS */
 
       peer_acceptor.close ();
     }