diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 15 | ||||
| -rw-r--r-- | ace/FILE_Addr.cpp | 15 |
3 files changed, 32 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog index 433152c67e8..6986f5dac47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri Dec 6 16:26:49 2002 Krishnakumar B <kitty@cs.wustl.edu> + + * ace/FILE_Addr.cpp (set): Windows appends ASCII 'a' - 'z' and + 'A' - 'Z' to generate unique filenames and gives up if the + character in the template is a non-alphabetic character. In such + cases, it returns a NULL. Make sure that we supply a template + with a alphabetic character before XXXXXX as well as check for a + NULL return value. + Thu Dec 5 22:19:41 2002 Steve Huston <shuston@riverace.com> * ace/OS.{h i}: Added ACE_OS::sigwaitinfo() wrapper. @@ -23,7 +32,7 @@ Thu Dec 5 20:33:18 2002 Steve Huston <shuston@riverace.com> Thu Dec 5 14:35:50 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * netsvcs/clients/Naming/Client/Makefile: Do not build in static - builds. + builds. Thu Dec 5 07:39:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> @@ -32,9 +41,9 @@ Thu Dec 5 07:39:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderb Thu Dec 5 09:58:45 UTC 2002 Don Hinton <dhinton@ieee.org> - * ace/config-openbsd-pthread.h: Added + * ace/config-openbsd-pthread.h: Added ACE_LACKS_PERFECT_MULTICAST_FILTERING 1. This should - fix the errors in the test/Multicast_Test in the + fix the errors in the test/Multicast_Test in the nightly autobuilds. Wed Dec 4 21:53:28 2002 Steve Huston <shuston@riverace.com> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 433152c67e8..6986f5dac47 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,12 @@ +Fri Dec 6 16:26:49 2002 Krishnakumar B <kitty@cs.wustl.edu> + + * ace/FILE_Addr.cpp (set): Windows appends ASCII 'a' - 'z' and + 'A' - 'Z' to generate unique filenames and gives up if the + character in the template is a non-alphabetic character. In such + cases, it returns a NULL. Make sure that we supply a template + with a alphabetic character before XXXXXX as well as check for a + NULL return value. + Thu Dec 5 22:19:41 2002 Steve Huston <shuston@riverace.com> * ace/OS.{h i}: Added ACE_OS::sigwaitinfo() wrapper. @@ -23,7 +32,7 @@ Thu Dec 5 20:33:18 2002 Steve Huston <shuston@riverace.com> Thu Dec 5 14:35:50 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * netsvcs/clients/Naming/Client/Makefile: Do not build in static - builds. + builds. Thu Dec 5 07:39:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> @@ -32,9 +41,9 @@ Thu Dec 5 07:39:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderb Thu Dec 5 09:58:45 UTC 2002 Don Hinton <dhinton@ieee.org> - * ace/config-openbsd-pthread.h: Added + * ace/config-openbsd-pthread.h: Added ACE_LACKS_PERFECT_MULTICAST_FILTERING 1. This should - fix the errors in the test/Multicast_Test in the + fix the errors in the test/Multicast_Test in the nightly autobuilds. Wed Dec 4 21:53:28 2002 Steve Huston <shuston@riverace.com> diff --git a/ace/FILE_Addr.cpp b/ace/FILE_Addr.cpp index f8e03aa9e91..8a8357bf65e 100644 --- a/ace/FILE_Addr.cpp +++ b/ace/FILE_Addr.cpp @@ -27,22 +27,23 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa) ACE_OS::strcpy (this->filename_, ACE_DEFAULT_TEMP_FILE); #else /* ACE_DEFAULT_TEMP_FILE */ - if (ACE_Lib_Find::get_temp_dir (this->filename_, - MAXPATHLEN - 15) == -1) + if (ACE_Lib_Find::get_temp_dir (this->filename_, + MAXPATHLEN - 15) == -1) // -15 for ace-file-XXXXXX { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("Temporary path too long, ") ACE_LIB_TEXT ("defaulting to current directory\n"))); this->filename_[0] = 0; } // Add the filename to the end - ACE_OS::strcat (this->filename_, ACE_LIB_TEXT ("ace-file-XXXXXX")); - + ACE_OS::strcat (this->filename_, ACE_LIB_TEXT ("ace-fileXXXXXX")); + #endif /* ACE_DEFAULT_TEMP_FILE */ - - ACE_OS::mktemp (this->filename_); + + if (ACE_OS::mktemp (this->filename_) == 0) + return -1; this->base_set (AF_FILE, ACE_static_cast (int, ACE_OS::strlen (this->filename_) + 1)); |