summaryrefslogtreecommitdiff
path: root/noncore/net/opietooth/lib/device.cc
authorzecke <zecke>2002-06-01 12:46:35 (UTC)
committer zecke <zecke>2002-06-01 12:46:35 (UTC)
commit2815c0b50bd52d58022eb1d5f4364079a0e99e0a (patch) (side-by-side diff)
tree587120ac88d743cb2a4a160df5cbe747db879b38 /noncore/net/opietooth/lib/device.cc
parentf386b95e1c9763bb9c5ea404c0824b45a744e151 (diff)
downloadopie-2815c0b50bd52d58022eb1d5f4364079a0e99e0a.zip
opie-2815c0b50bd52d58022eb1d5f4364079a0e99e0a.tar.gz
opie-2815c0b50bd52d58022eb1d5f4364079a0e99e0a.tar.bz2
Small adjustments
Diffstat (limited to 'noncore/net/opietooth/lib/device.cc') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/lib/device.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc
index 0c552ea..468f191 100644
--- a/noncore/net/opietooth/lib/device.cc
+++ b/noncore/net/opietooth/lib/device.cc
@@ -1,13 +1,15 @@
+#include <signal.h>
+
#include "kprocess.h"
#include "device.h"
using namespace OpieTooth;
Device::Device(const QString &device, const QString &mode )
: QObject(0, "device" ) {
m_hci = 0;
m_process = 0;
m_attached = false;
m_device = device;
@@ -32,25 +34,25 @@ void Device::attach(){
if(!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput ) ){
delete m_process;
m_process = 0;
}
};
}
void Device::detach(){
delete m_hci;
delete m_process;
// kill the pid we got
if(m_attached )
//kill the pid
- ;
+ kill(pid, 9);
}
bool Device::isLoaded()const{
return m_attached;
}
QString Device::devName()const {
return QString::fromLatin1("hci0");
};
void Device::slotExited( KProcess* proc)
{
if(proc== m_process ){
if( m_process->normalExit() ){ // normal exit
int ret = m_process->exitStatus();
@@ -81,22 +83,22 @@ void Device::slotExited( KProcess* proc)
m_attached = false;
}
}// normal exit
delete m_hci;
m_hci = 0;
}
}
void Device::slotStdOut(KProcess* proc, char* chars, int len)
{
if( len <1 )
return;
if(proc == m_process ){
- QCString string( chars );
+ QCString string( chars, len+1 );
if(string.left(3) != "CSR" ){ // it's the pid
pid = string.toInt();
};
}
}
void Device::slotStdErr(KProcess*, char*, int )
{
}