summaryrefslogtreecommitdiff
path: root/noncore/apps/opie-console
authorzecke <zecke>2002-10-15 01:14:17 (UTC)
committer zecke <zecke>2002-10-15 01:14:17 (UTC)
commite0efd37513192d9a17fa9a9f46bbaed0ca38029c (patch) (side-by-side diff)
tree04163d93fc4c4185d322912e9430eff9b36b71cc /noncore/apps/opie-console
parentb12b38a00c66ddc100f3fff75478539b8b797928 (diff)
downloadopie-e0efd37513192d9a17fa9a9f46bbaed0ca38029c.zip
opie-e0efd37513192d9a17fa9a9f46bbaed0ca38029c.tar.gz
opie-e0efd37513192d9a17fa9a9f46bbaed0ca38029c.tar.bz2
The right way to deal with the pipe
Diffstat (limited to 'noncore/apps/opie-console') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/MyPty.cpp10
-rw-r--r--noncore/apps/opie-console/MyPty.h2
2 files changed, 9 insertions, 3 deletions
diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp
index cacb4ce..ae01392 100644
--- a/noncore/apps/opie-console/MyPty.cpp
+++ b/noncore/apps/opie-console/MyPty.cpp
@@ -116,7 +116,9 @@ void MyPty::donePty()
if (m_cpid) {
qWarning("killing!!!");
kill(m_cpid, SIGHUP);
- waitpid(m_cpid, &status, 0);
+ //waitpid(m_cpid, &status, 0);
+ delete m_sn_e;
+ m_sn_e = 0l;
}
m_cpid = 0;
@@ -186,9 +188,10 @@ int MyPty::run(const char* cmd, QStrList &, const char*, int)
// parent - continue as a widget
QSocketNotifier* sn_r = new QSocketNotifier(m_fd,QSocketNotifier::Read,this);
-// QSocketNotifier* sn_e = new QSocketNotifier(m_fd,QSocketNotifier::Exception,this);
+ delete m_sn_e;
+ m_sn_e = new QSocketNotifier(m_fd,QSocketNotifier::Exception,this);
connect(sn_r,SIGNAL(activated(int)),this,SLOT(readPty()));
-// connect(sn_e,SIGNAL(activated(int)),this,SLOT(error()));
+ connect(m_sn_e,SIGNAL(activated(int)),this,SLOT(error()));
return 0;
}
@@ -232,6 +235,7 @@ int MyPty::openPty()
*/
MyPty::MyPty(const Profile&) : m_cpid(0)
{
+ m_sn_e = 0l;
m_fd = openPty();
ProcCtl* ctl = ProcCtl::self();
}
diff --git a/noncore/apps/opie-console/MyPty.h b/noncore/apps/opie-console/MyPty.h
index 9231a8a..3166fa0 100644
--- a/noncore/apps/opie-console/MyPty.h
+++ b/noncore/apps/opie-console/MyPty.h
@@ -28,6 +28,7 @@
#include "io_layer.h"
class Profile;
+class QSocketNotifier;
class MyPty : public IOLayer
{
Q_OBJECT
@@ -90,6 +91,7 @@ private:
char m_ttynam[16]; // "/dev/ttyxx" | "/dev/pts/########..."
int m_fd;
int m_cpid;
+ QSocketNotifier* m_sn_e;
};
#endif