summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormcorino <mcorino@users.noreply.github.com>2010-03-01 12:36:24 +0000
committermcorino <mcorino@users.noreply.github.com>2010-03-01 12:36:24 +0000
commit34a3138a2a57ea81c28bb9c82c3b620cdca889c0 (patch)
tree149fa6716ff5723e6010c8f688d7af20115b8f2f
parentbbe55637bc3e6efb075797dfb3c6cc8c9a81fbee (diff)
downloadATCD-34a3138a2a57ea81c28bb9c82c3b620cdca889c0.tar.gz
Mon Mar 1 12:27:30 UTC 2010 Martin Corino <mcorino@remedy.nl>
* bin/PerlACE/Process_Unix.pm: Fixed 'ps' determination problems.
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/bin/PerlACE/Process_Unix.pm2
2 files changed, 8 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 94e83674f55..136cfec8a7b 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 1 12:27:30 UTC 2010 Martin Corino <mcorino@remedy.nl>
+
+ * bin/PerlACE/Process_Unix.pm:
+
+ Fixed 'ps' determination problems.
+
Fri Feb 26 19:32:06 UTC 2010 Adam Mitz <mitza@ociweb.com>
* ace/config-sunos5.5.h:
diff --git a/ACE/bin/PerlACE/Process_Unix.pm b/ACE/bin/PerlACE/Process_Unix.pm
index e1ddb7f8fde..db0d6a92587 100644
--- a/ACE/bin/PerlACE/Process_Unix.pm
+++ b/ACE/bin/PerlACE/Process_Unix.pm
@@ -542,6 +542,8 @@ sub kill_all ($)
my $first = 1;
my $ps_cmd = 'ps xw';
my $ps_file = `which ps`;
+ $ps_file =~ s/^\s+//;
+ $ps_file =~ s/\s+$//;
if ((-l $ps_file) and (readlink ($ps_file)) =~ /busybox/) {
## some embedded targets use BusyBox for base tools
## with different arguments