summaryrefslogtreecommitdiff
authorzecke <zecke>2002-10-12 01:05:54 (UTC)
committer zecke <zecke>2002-10-12 01:05:54 (UTC)
commita92703ad1ed767713de21c2389b06434dc223eba (patch) (side-by-side diff)
treeef5368486c2c4472e41c78ec5c7e3c1821e4c88d
parent78eddaa8057462b0b8e94f10f8673bb9f555061b (diff)
downloadopie-a92703ad1ed767713de21c2389b06434dc223eba.zip
opie-a92703ad1ed767713de21c2389b06434dc223eba.tar.gz
opie-a92703ad1ed767713de21c2389b06434dc223eba.tar.bz2
missing commits
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/filetransfer.h7
-rw-r--r--noncore/apps/opie-console/procctl.cpp1
-rw-r--r--noncore/apps/opie-console/procctl.h3
3 files changed, 7 insertions, 4 deletions
diff --git a/noncore/apps/opie-console/filetransfer.h b/noncore/apps/opie-console/filetransfer.h
index 0829f16..9cc1e8d 100644
--- a/noncore/apps/opie-console/filetransfer.h
+++ b/noncore/apps/opie-console/filetransfer.h
@@ -31,6 +31,7 @@ private slots:
void setupChild();
void slotRead();
void slotProgress( const QStringList& );
+ void slotExec();
private:
/*
* FIXME? What does happen if we've
@@ -38,16 +39,16 @@ private:
* Have a procctl which does listen
* for termination and then send a signal
*/
- static pid_t m_pid;
+ pid_t m_pid;
int m_fd;
int m_prog;
int m_info[2];
int m_comm[2];
+ int m_term[2];
QString m_file;
Type m_type;
QSocketNotifier *m_not;
- static void signal_handler(int);
- static bool terminate;
+ QSocketNotifier* m_proc;
};
#endif
diff --git a/noncore/apps/opie-console/procctl.cpp b/noncore/apps/opie-console/procctl.cpp
index ff6bea8..b0b6846 100644
--- a/noncore/apps/opie-console/procctl.cpp
+++ b/noncore/apps/opie-console/procctl.cpp
@@ -71,6 +71,7 @@ int ProcCtl::status(pid_t pid )const{
return -1;
}
void ProcCtl::signal_handler(int) {
+ qWarning("signal handler");
int status;
signal( SIGCHLD, signal_handler );
pid_t pi = waitpid( -1, &status, WNOHANG );
diff --git a/noncore/apps/opie-console/procctl.h b/noncore/apps/opie-console/procctl.h
index 5e96423..1da7c6d 100644
--- a/noncore/apps/opie-console/procctl.h
+++ b/noncore/apps/opie-console/procctl.h
@@ -22,7 +22,7 @@ private:
public:
~ProcCtl();
- ProcCtl* self();
+ static ProcCtl* self();
int status(pid_t)const;
void add( pid_t, int fd );
void remove( pid_t );
@@ -31,6 +31,7 @@ private:
static void signal_handler(int);
static ProcContainer* m_last;
static ProcCtl* m_self;
+
};
#endif