diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-05-01 18:17:32 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-05-01 18:17:32 +0000 |
commit | 465e868481e8b2c2e008c759f7a101c753c03b1b (patch) | |
tree | 9c3fc468c17d972457a3ce0e7e343de28f577c28 /ACE | |
parent | 84882f8cc1ec4f3a35b6698c4fe229ebb4365467 (diff) | |
download | ATCD-465e868481e8b2c2e008c759f7a101c753c03b1b.tar.gz |
Fri May 1 18:17:05 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/OS_NS_Thread.cpp:
Only add the arg from vx_execae when the string has data.
Diffstat (limited to 'ACE')
-rw-r--r-- | ACE/ChangeLog | 5 | ||||
-rw-r--r-- | ACE/ace/OS_NS_Thread.cpp | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 6951d3e73a9..98eaa909124 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Fri May 1 18:17:05 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_Thread.cpp: + Only add the arg from vx_execae when the string has data. + Fri May 1 17:46:05 2009 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Map_Manager_Test.cpp: diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index f057a42c859..019b30cc650 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -5176,7 +5176,7 @@ add_to_argv (int& argc, char** argv, int max_args, char* string) if (argc < max_args) { argv[argc] = string + previous; - argc++; + ++argc; } else { @@ -5194,7 +5194,7 @@ add_to_argv (int& argc, char** argv, int max_args, char* string) // Make sure we don't skip over a character due // to the above loop to skip over whitespace - i--; + --i; } } } @@ -5320,9 +5320,10 @@ vx_execae (FUNCPTR entry, char* arg, int prio, int opt, int stacksz, ...) int argc = 1; // Peel off arguments to run_main () and put into argv. - - if (arg) - add_to_argv(argc, argv, ACE_MAX_ARGS, arg); + if (arg && strlen (arg) > 0) + { + add_to_argv(argc, argv, ACE_MAX_ARGS, arg); + } // fill unused argv slots with 0 to get rid of leftovers // from previous invocations |