*** empty log message ***

4 files changed, 73 insertions, 67 deletions

diff --git a/ChangeLog-98a b/ChangeLog-98a
index 37860f98108..0c5f83a0018 100644
--- a/ChangeLog-98a
+++ b/ChangeLog-98a
@@ -1,15 +1,18 @@
-Thu Apr 23 13:54:33 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Malloc.i (free): added ACE_UNUSED_ARG (ptr) if ACE_NDEBUG.
-
 Thu Apr 23 11:21:46 1998  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Activation_Queue.h: Extended ACE_Activation_Queue so that it
-          can be a proper base class by making the destructor virtual and
-          putting the methods into the protected section.  Thanks to Garry
-          Brother <gmbroth@romulus.ncsc.mil> for this.
+	* apps/Gateway/Gateway/gatewayd.cpp,
+	  apps/Gateway/Peer/peerd.cpp: Added a check to see if the
+	  svc.conf file exists before trying to parse the arguments.
+  	  Thanks to Dani Flexer <danif@ivory-sw.com> for reporting this.
 
-Thu Apr 23 06:38:15 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+	* apps/Gateway/Peer/Options.cpp (parse_args): Added the "C:"
+ 	  qualifier to the get_opt string.  Thanks to Dani Flexer
+ 	  <danif@ivory-sw.com> for reporting this.
+
+	* ace/Activation_Queue.h: Extended ACE_Activation_Queue so that it
+ 	  can be a proper base class by making the destructor virtual and
+ 	  putting the methods into the protected section.  Thanks to Garry
+ 	  Brother <gmbroth@romulus.ncsc.mil> for this.
 
         * ace/XtReactor.cpp: Commented out most of the logic if we're
           running on Win32 because (1) it doesn't work correctly since
@@ -20,7 +23,9 @@ Thu Apr 23 06:38:15 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
           Kirill Rybaltchenko <Kirill.Rybaltchenko@cern.ch> for reporting
           this.
 
-Thu Apr 23 06:11:27 1998  David L. Levine  <levine@cs.wustl.edu>
+Thu Apr 23 13:54:33 1998  David L. Levine  <levine@cs.wustl.edu>
+
+        * ace/Malloc.i (free): added ACE_UNUSED_ARG (ptr) if ACE_NDEBUG.
 
         * include/makeinclude/platform_chorus.GNU: include dtool/htgt-cf.rf
           from $(MERGEDIR) instead of $(CLASSIXDIR).  Thanks to
diff --git a/apps/Gateway/Gateway/gatewayd.cpp b/apps/Gateway/Gateway/gatewayd.cpp
index 98552b905c8..213400fcd60 100644
--- a/apps/Gateway/Gateway/gatewayd.cpp
+++ b/apps/Gateway/Gateway/gatewayd.cpp
@@ -24,38 +24,38 @@
 int
 main (int argc, char *argv[])
 {
-  if (ACE_Service_Config::open (argc, argv) == -1)
+  if (ACE_OS::access (ACE_DEFAULT_SVC_CONF, F_OK) != 0) 
     {
-      if (errno != ENOENT)
-	ACE_ERROR ((LM_ERROR,
-                    "%p\n%a",
-                    "open",
-                    1));
-      else // Use static linking.
-	{
-	  ACE_Service_Object_Ptr sp = ACE_SVC_INVOKE (Gateway);
-
-	  if (sp->init (argc - 1, argv + 1) == -1)
-	    ACE_ERROR ((LM_ERROR,
-                        "%p\n%a",
-                        "init",
-                        1));
-	  
-	  // Run forever, performing the configured services until we
-	  // are shut down by a SIGINT/SIGQUIT signal.
-
-	  ACE_Reactor::run_event_loop ();
-
-	  // Destructor of <ACE_Service_Object_Ptr> automagically call
-	  // <fini>.
-	}
-    }
-  else // Use dynamic linking.
+      // Use static linking.
+      ACE_Service_Object_Ptr sp = ACE_SVC_INVOKE (Gateway);
+
+      if (sp->init (argc - 1, argv + 1) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "init"),
+                          1);
 
-    // Run forever, performing the configured services until we are
-    // shut down by a signal (e.g., SIGINT or SIGQUIT).
+      // Run forever, performing the configured services until we
+      // are shut down by a SIGINT/SIGQUIT signal.
 
-    ACE_Reactor::run_event_loop ();
+      ACE_Reactor::run_event_loop ();
 
+      // Destructor of <ACE_Service_Object_Ptr> automagically call
+      // <fini>.
+    }
+  else 
+    {
+      if (ACE_Service_Config::open (argc, argv) == -1) 
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "open"),
+                          1);
+      else // Use dynamic linking.
+
+        // Run forever, performing the configured services until we are
+        // shut down by a signal (e.g., SIGINT or SIGQUIT).
+
+        ACE_Reactor::run_event_loop ();
+    }
   return 0;
 }
diff --git a/apps/Gateway/Peer/Options.cpp b/apps/Gateway/Peer/Options.cpp
index f3fe8f119dd..1e6a2043784 100644
--- a/apps/Gateway/Peer/Options.cpp
+++ b/apps/Gateway/Peer/Options.cpp
@@ -1,3 +1,4 @@
+// $Id$
 #define ACE_BUILD_SVC_DLL
 
 #include "ace/Get_Opt.h"
@@ -97,7 +98,7 @@ Options::enabled (int option) const
 void
 Options::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "a:c:h:m:t:v", 0);
+  ACE_Get_Opt get_opt (argc, argv, "a:c:C:h:m:t:v", 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/apps/Gateway/Peer/peerd.cpp b/apps/Gateway/Peer/peerd.cpp
index 33444e4a78e..87b26ab5188 100644
--- a/apps/Gateway/Peer/peerd.cpp
+++ b/apps/Gateway/Peer/peerd.cpp
@@ -23,38 +23,38 @@
 int
 main (int argc, char *argv[])
 {
-  if (ACE_Service_Config::open (argc, argv) == -1)
+  if (ACE_OS::access (ACE_DEFAULT_SVC_CONF, F_OK) != 0) 
     {
-      if (errno != ENOENT)
-	ACE_ERROR_RETURN ((LM_ERROR,
+      // Use static linking.
+      ACE_Service_Object_Ptr sp = ACE_SVC_INVOKE (Peer_Factory);
+
+      if (sp->init (argc - 1, argv + 1) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n",
-                           "open"),
+                           "init"),
                           1);
-      else // Use static linking.
-	{
-	  ACE_Service_Object_Ptr sp = ACE_SVC_INVOKE (Peer_Factory);
-	  
-	  if (sp->init (argc - 1, argv + 1) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-                               "%p\n",
-                               "init"),
-                              1);
-	  
-	  // Run forever, performing the configured services until we
-	  // are shut down by a SIGINT/SIGQUIT signal.
-
-	  ACE_Reactor::run_event_loop ();
-
-	  // Destructor of <ACE_Service_Object_Ptr> automagically call
-	  // <fini>.
-	}
+
+      // Run forever, performing the configured services until we are
+      // shut down by a SIGINT/SIGQUIT signal.
+
+      ACE_Reactor::run_event_loop ();
+
+      // Destructor of <ACE_Service_Object_Ptr> automagically call
+      // <fini>.
     }
-  else // Use dynamic linking.
+  else 
+    {
+      if (ACE_Service_Config::open (argc, argv) == -1) 
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "open"),
+                          1);
+      else // Use dynamic linking.
 
-    // Run forever, performing the configured services until we are
-    // shut down by a signal (e.g., SIGINT or SIGQUIT).
-    
-    ACE_Reactor::run_event_loop ();
+        // Run forever, performing the configured services until we
+        // are shut down by a signal (e.g., SIGINT or SIGQUIT).
 
+        ACE_Reactor::run_event_loop ();
+    }
   return 0;
 }