ChangeLogTag: Sun Mar 30 19:54:23 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>

1 files changed, 21 insertions, 3 deletions

diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp
index e0736f6abfc..1535a2f6612 100644
--- a/ACE/ace/OS_NS_unistd.cpp
+++ b/ACE/ace/OS_NS_unistd.cpp
@@ -46,13 +46,31 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv,
   if (argv == 0 || argv[0] == 0)
     return 0;
 
+  int argc;
+  for (argc = 0; argv[argc] != 0; ++argc)
+    continue;
+
+  return argv_to_string (argc,
+                         argv,
+                         buf,
+                         substitute_env_args,
+                         quote_args);
+}
+
+int
+ACE_OS::argv_to_string (int argc,
+                        ACE_TCHAR **argv,
+                        ACE_TCHAR *&buf,
+                        bool substitute_env_args,
+                        bool quote_args)
+{
+  if (argc <= 0 || argv == 0 || argv[0] == 0)
+    return 0;
+
   size_t buf_len = 0;
 
   // Determine the length of the buffer.
 
-  int argc;
-  for (argc = 0; argv[argc] != 0; ++argc)
-    continue;
   ACE_TCHAR **argv_p = argv;
 
   for (int i = 0; i < argc; ++i)