diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-11-05 07:43:43 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-11-05 07:43:43 +0000 |
commit | 5f6dbf1444d9ae7c57012b51108f10e885c9d298 (patch) | |
tree | dfcde1a109b0200ce2f2191bfdbcd0925543da97 | |
parent | ba214e04e6a2af26acfd5d518cf0f265367d44ed (diff) | |
download | ATCD-5f6dbf1444d9ae7c57012b51108f10e885c9d298.tar.gz |
ChangeLogTag: Fri Nov 5 07:43:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r-- | TAO/TAO_IDL/be/be_global.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index 6c106a5ed8f..3198c520b51 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -138,19 +138,19 @@ be_change_idl_file_extension (UTL_String* idl_file, ".IDL", ".PIDL" }; - + static int nextensions = sizeof(extensions)/sizeof(extensions[0]); for (int k = 0; k < nextensions; ++k) { base = ACE_OS::strstr (string, extensions[k]); - + if (base != 0) { break; } } - + if (base == 0) { return 0; @@ -175,13 +175,13 @@ be_change_idl_file_extension (UTL_String* idl_file, // Turn '\' and '\\' into '/'. char* i = fname; - + for (char* j = fname; *j != 0; ++i, ++j) { if (*j == '\\') { *i = '/'; - + if (*(j+1) == '\\') { ++j; @@ -192,7 +192,7 @@ be_change_idl_file_extension (UTL_String* idl_file, *i = *j; } } - + *i = 0; // Append the newextension. @@ -1284,9 +1284,16 @@ BE_GlobalData::parse_args (long &i, char **av) if (av[i][2] == '\0') { idl_global->append_idl_flag (av[i + 1]); + int result = ACE_OS::mkdir (av[i + 1]); - - if (result != 0 && errno != EEXIST) + + #if !defined (__BORLANDC__) + if (result != 0 && errno != EEXIST) + #else + // The Borland RTL doesn't give EEXIST back, only EACCES in case + // the directory exists, reported to Borland as QC 9495 + if (result != 0 && errno != EEXIST && errno != EACCES) + #endif { ACE_ERROR (( LM_ERROR, |