-rw-r--r-- | noncore/apps/opie-console/filetransfer.h | 7 | ||||
-rw-r--r-- | noncore/apps/opie-console/procctl.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/procctl.h | 3 |
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: | |||
31 | void setupChild(); | 31 | void setupChild(); |
32 | void slotRead(); | 32 | void slotRead(); |
33 | void slotProgress( const QStringList& ); | 33 | void slotProgress( const QStringList& ); |
34 | void slotExec(); | ||
34 | private: | 35 | private: |
35 | /* | 36 | /* |
36 | * FIXME? What does happen if we've | 37 | * FIXME? What does happen if we've |
@@ -38,16 +39,16 @@ private: | |||
38 | * Have a procctl which does listen | 39 | * Have a procctl which does listen |
39 | * for termination and then send a signal | 40 | * for termination and then send a signal |
40 | */ | 41 | */ |
41 | static pid_t m_pid; | 42 | pid_t m_pid; |
42 | int m_fd; | 43 | int m_fd; |
43 | int m_prog; | 44 | int m_prog; |
44 | int m_info[2]; | 45 | int m_info[2]; |
45 | int m_comm[2]; | 46 | int m_comm[2]; |
47 | int m_term[2]; | ||
46 | QString m_file; | 48 | QString m_file; |
47 | Type m_type; | 49 | Type m_type; |
48 | QSocketNotifier *m_not; | 50 | QSocketNotifier *m_not; |
49 | static void signal_handler(int); | 51 | QSocketNotifier* m_proc; |
50 | static bool terminate; | ||
51 | }; | 52 | }; |
52 | 53 | ||
53 | #endif | 54 | #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{ | |||
71 | return -1; | 71 | return -1; |
72 | } | 72 | } |
73 | void ProcCtl::signal_handler(int) { | 73 | void ProcCtl::signal_handler(int) { |
74 | qWarning("signal handler"); | ||
74 | int status; | 75 | int status; |
75 | signal( SIGCHLD, signal_handler ); | 76 | signal( SIGCHLD, signal_handler ); |
76 | pid_t pi = waitpid( -1, &status, WNOHANG ); | 77 | 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: | |||
22 | public: | 22 | public: |
23 | ~ProcCtl(); | 23 | ~ProcCtl(); |
24 | 24 | ||
25 | ProcCtl* self(); | 25 | static ProcCtl* self(); |
26 | int status(pid_t)const; | 26 | int status(pid_t)const; |
27 | void add( pid_t, int fd ); | 27 | void add( pid_t, int fd ); |
28 | void remove( pid_t ); | 28 | void remove( pid_t ); |
@@ -31,6 +31,7 @@ private: | |||
31 | static void signal_handler(int); | 31 | static void signal_handler(int); |
32 | static ProcContainer* m_last; | 32 | static ProcContainer* m_last; |
33 | static ProcCtl* m_self; | 33 | static ProcCtl* m_self; |
34 | |||
34 | }; | 35 | }; |
35 | 36 | ||
36 | #endif | 37 | #endif |