mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10874] Update ACE to v5.8.3

Browse source 
(based on zergtmn's repo commit 3a8c259)
(based on zergtmn's repo commit 946c1a8)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
zerg 2010-12-14 17:14:34 +03:00 • committed by VladimirMangos
parent c38c876b1d
commit b8d773091a
343 changed files with 3060 additions and 7431 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dep/ACE_wrappers/ace/Process.cpp
View file

@ -1,4 +1,4 @@
// $Id: Process.cpp 91286 2010-08-05 09:04:31Z johnnyw $
// $Id: Process.cpp 92218 2010-10-14 13:18:15Z mcorino $
#include "ace/Process.h"
@ -796,7 +796,8 @@ ACE_Process::convert_env_buffer (const char* env) const
ACE_Process_Options::ACE_Process_Options (bool inherit_environment,
size_t command_line_buf_len,
size_t env_buf_len,
size_t max_env_args)
size_t max_env_args,
size_t max_cmdline_args)
:
#if !defined (ACE_HAS_WINCE)
inherit_environment_ (inherit_environment),
@ -830,6 +831,8 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment,
command_line_buf_ (0),
command_line_copy_ (0),
command_line_buf_len_ (command_line_buf_len),
max_command_line_args_ (max_cmdline_args),
command_line_argv_ (0),
process_group_ (ACE_INVALID_PID),
use_unicode_environment_ (false)
{
@ -859,6 +862,8 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment,
this->startup_info_.cb = sizeof this->startup_info_;
#endif /* ACE_WIN32 */
#endif /* !ACE_HAS_WINCE */
ACE_NEW (command_line_argv_,
ACE_TCHAR *[max_cmdline_args]);
}
#if !defined (ACE_HAS_WINCE)
@ -1178,6 +1183,7 @@ ACE_Process_Options::~ACE_Process_Options (void)
#endif /* !ACE_HAS_WINCE */
delete [] command_line_buf_;
ACE::strdelete (command_line_copy_);
delete [] command_line_argv_;
}
int
@ -1315,12 +1321,12 @@ ACE_Process_Options::command_line_argv (void)
parser.preserve_designators ('\"', '\"'); // "
parser.preserve_designators ('\'', '\'');
int x = 0;
unsigned int x = 0;
do
command_line_argv_[x] = parser.next ();
while (command_line_argv_[x] != 0
// substract one for the ending zero.
&& ++x < MAX_COMMAND_LINE_OPTIONS - 1);
&& ++x < max_command_line_args_ - 1);
command_line_argv_[x] = 0;
}