Merge pull request #1420 from mitza-oci/taoidl

[TAO2] TAO_IDL drv_preproc minor fixes

2 files changed, 16 insertions, 16 deletions

diff --git a/TAO/MPC/config/taobaseidldefaults.mpb b/TAO/MPC/config/taobaseidldefaults.mpb
index 391e6e6644f..d24379f56dc 100644
--- a/TAO/MPC/config/taobaseidldefaults.mpb
+++ b/TAO/MPC/config/taobaseidldefaults.mpb
@@ -2,10 +2,10 @@
 project: build_files {
   // Set the idl compiler and flags as template values
   specific {
-    tao_idl      = $(ACE_ROOT)/bin/tao_idl
+    tao_idl      = <%quote%>$(ACE_ROOT)/bin/tao_idl<%quote%>
     tao_idl_dep  = $(ACE_ROOT)/bin/tao_idl
     tao_idlflags = -Wb,pre_include=ace/pre.h \
-                   -Wb,post_include=ace/post.h -I$(TAO_ROOT)
+                   -Wb,post_include=ace/post.h -I<%quote%>$(TAO_ROOT)<%quote%>
   }
 
   Define_Custom(IDL) {
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index f23ea5c2d7d..51e9804590c 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -138,7 +138,7 @@ DRV_cpp_putarg (const char *str)
       throw Bailout ();
     }
 
-  if (str && ACE_OS::strchr (str, ' '))
+  if (str && ACE_OS::strchr (str, ' ') && !ACE_OS::strchr (str, '"'))
     {
       ACE_TCHAR *buf = 0;
       ACE_NEW_NORETURN (buf, ACE_TCHAR[ACE_OS::strlen (str) + 3]);
@@ -962,7 +962,7 @@ DRV_copy_input (FILE *fin,
   if (f == 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%C: cannot open temp file \"%C\" for copying from \"%C\": %p\n",
+                  "%C: cannot open temp file \"%C\" for copying from \"%C\": %m\n",
                   idl_global->prog_name (),
                   fn,
                   orig_filename));
@@ -1095,7 +1095,7 @@ DRV_pre_proc (const char *myfile)
   if (ti_fd == ACE_INVALID_HANDLE)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%C: Unable to create temporary file \"%C\": %p\n",
+                  "%C: Unable to create temporary file \"%C\": %m\n",
                   idl_global->prog_name (),
                   tmp_ifile));
 
@@ -1107,7 +1107,7 @@ DRV_pre_proc (const char *myfile)
   if (tf_fd == ACE_INVALID_HANDLE)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%C: Unable to create temporary file \"%C\": %p\n",
+                  "%C: Unable to create temporary file \"%C\": %m\n",
                   idl_global->prog_name (),
                   tmp_file));
 
@@ -1138,7 +1138,7 @@ DRV_pre_proc (const char *myfile)
   if (file == 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%C: Unable to open file : %p\n",
+                  "%C: Unable to open file : %m\n",
                   idl_global->prog_name (),
                   myfile));
 
@@ -1237,7 +1237,7 @@ DRV_pre_proc (const char *myfile)
     {
       ACE_ERROR ((LM_ERROR,
                   "%C: Unable to rename temporary "
-                  "file \"%C\" to \"%C\": %p\n",
+                  "file \"%C\" to \"%C\": %m\n",
                   idl_global->prog_name (),
                   tmp_file,
                   t_file));
@@ -1252,7 +1252,7 @@ DRV_pre_proc (const char *myfile)
     {
       ACE_ERROR ((LM_ERROR,
                   "%C: Unable to rename temporary "
-                  "file \"%C\" to \"%C\": %p\n",
+                  "file \"%C\" to \"%C\": %m\n",
                   idl_global->prog_name (),
                   tmp_ifile,
                   t_ifile));
@@ -1288,7 +1288,7 @@ DRV_pre_proc (const char *myfile)
         {
           ACE_ERROR ((LM_ERROR,
                       "%C: cannot open temp file"
-                      " \"%C\" for writing: %p\n",
+                      " \"%C\" for writing: %m\n",
                       idl_global->prog_name (),
                       t_file));
 
@@ -1299,7 +1299,7 @@ DRV_pre_proc (const char *myfile)
 
       if (cpp_options.set_handles (ACE_INVALID_HANDLE, fd) == -1)
         {
-          ACE_ERROR ((LM_ERROR, "%C: cannot set stdout for child process: %p\n",
+          ACE_ERROR ((LM_ERROR, "%C: cannot set stdout for child process: %m\n",
                       idl_global->prog_name ()));
 
           throw Bailout ();
@@ -1332,7 +1332,7 @@ DRV_pre_proc (const char *myfile)
       if (ACE_OS::close (fd) == -1)
         {
           ACE_ERROR ((LM_ERROR,
-            "%C: cannot close temp file \"%C\" on parent: %p\n",
+            "%C: cannot close temp file \"%C\" on parent: %m\n",
                       idl_global->prog_name (),
                       t_file));
 
@@ -1411,7 +1411,7 @@ DRV_pre_proc (const char *myfile)
     {
       ACE_ERROR ((LM_ERROR,
                   "%C: Could not open cpp "
-                  "output file \"%C\": %p\n",
+                  "output file \"%C\": %m\n",
                   idl_global->prog_name (),
                   t_file));
 
@@ -1432,7 +1432,7 @@ DRV_pre_proc (const char *myfile)
         {
           ACE_ERROR ((LM_ERROR,
                       "%C: Could not open cpp "
-                      "output file \"$C\": %p\n",
+                      "output file \"%C\": %m\n",
                       idl_global->prog_name (),
                       t_file));
 
@@ -1468,7 +1468,7 @@ DRV_pre_proc (const char *myfile)
     {
       ACE_ERROR ((LM_ERROR,
                   "%C: Could not remove cpp "
-                  "input file \"%C\": %p\n",
+                  "input file \"%C\": %m\n",
                   idl_global->prog_name (),
                   t_ifile));
 
@@ -1479,7 +1479,7 @@ DRV_pre_proc (const char *myfile)
     {
       ACE_ERROR ((LM_ERROR,
                   "%C: Could not remove cpp "
-                  "output file \"%C\": %p\n",
+                  "output file \"%C\": %m\n",
                   idl_global->prog_name (),
                   t_file));