From 6a9726437a59cf3b18bf57d6e20fb2dfaaa2fc34 Mon Sep 17 00:00:00 2001 From: zecke Date: Sun, 13 Oct 2002 15:31:12 +0000 Subject: Move some stuff in filetransfer around make pid == 0 after a finished process. Introduce the FileReceive class it does not parse progress though --- (limited to 'noncore/apps') diff --git a/noncore/apps/opie-console/filereceive.cpp b/noncore/apps/opie-console/filereceive.cpp new file mode 100644 index 0000000..26b3dec --- a/dev/null +++ b/noncore/apps/opie-console/filereceive.cpp @@ -0,0 +1,159 @@ +#include +#include +#include +#include + +#include + +#include "io_layer.h" +#include "procctl.h" +#include "filereceive.h" + +FileReceive::FileReceive( Type t, IOLayer* lay, const QString& dir ) + : ReceiveLayer(lay, dir ), m_type( t ) +{ + m_fd = -1; + m_not = 0l; + m_proc = 0l; +} +FileReceive::~FileReceive() { +} +void FileReceive::receive() { + receive( currentDir() ); +} +void FileReceive::receive( const QString& dir ) { + m_prog = -1; + m_fd = layer()->rawIO(); + m_curDir = dir; + + if (pipe( m_comm ) < 0 ) + m_comm[0] = m_comm[1] = 0; + if (pipe( m_info ) < 0 ) + m_info[0] = m_info[1] = 0; + + m_pid = fork(); + switch( m_pid ) { + case -1: + //emit error + slotExec(); + break; + /* child */ + case 0: { + setupChild(); + char* typus = NULL; + switch(m_type ) { + case SZ: + break; + case SX: + typus = "-X"; + break; + case SY: + typus = "--ymodem"; + break; + } + + /* we should never return from here */ + execlp("rz", "rz", typus, NULL ); + + char resultByte = 1; + if (m_info[1] ) + ::write(m_info[1], &resultByte, 1 ); + + _exit( -1 ); + break; + } + default: { + if ( m_info[1] ) + close( m_info[1] ); + + if ( m_info[0] ) for (;;) { + char resultByte; int len; + len = read(m_info[0], &resultByte, 1 ); + /* len == 1 start up failed */ + if ( len == 1 ) { + emit error( StartError, tr("Could not start") ); + return; + } + if ( len == -1 ) + if ( (errno == ECHILD ) || (errno == EINTR ) ) + continue; + + // len == 0 or something like this + break; + } + + if ( m_info[0] ) + close( m_info[0] ); + + m_not = new QSocketNotifier(m_comm[0], QSocketNotifier::Read ); + connect(m_not, SIGNAL(activated(int) ), + this, SLOT(slotRead() ) ); + if ( pipe(m_term) < 0 ) + m_term[0] = m_term[1] = 0; + + ProcCtl::self()->add(m_pid, m_term[1] ); + m_proc = new QSocketNotifier(m_term[0], QSocketNotifier::Read ); + connect(m_proc, SIGNAL(activated(int) ), + this, SLOT(slotExec() ) ); + + } + break; + + } + +} +void FileReceive::cancel() { + ::kill(m_pid, 9 ); +} +void FileReceive::setupChild() { + changeDir( currentDir() ); + /* + * we do not want to read from our + * information channel + */ + if (m_info[0] ) + close(m_info[0] ); + /* + * FD_CLOEXEC will close the + * fd on successfull exec + */ + if (m_info[1] ) + fcntl(m_info[1], F_SETFD, FD_CLOEXEC ); + + if (m_comm[0] ) + close( m_comm[0] ); + /* + * now set the communication + * m_fd STDIN_FILENO + * STDOUT_FILENO + * STDERR_FILENO + */ + dup2( m_fd, STDIN_FILENO ); + dup2( m_fd, STDOUT_FILENO ); + dup2( m_comm[1], STDERR_FILENO ); +} +void FileReceive::slotRead() { + QByteArray ar(4096); + int len = read(m_comm[0], ar.data(), 4096 ); + qWarning("slot read %d", len); + for (int i = 0; i < len; i++ ) { + // printf("%c", ar[i] ); + } + ar.resize( len ); + QString str( ar ); + qWarning(str.simplifyWhiteSpace() ); +} +void FileReceive::slotExec() { + char buf[2]; + ::read(m_term[0], buf, 1 ); + delete m_proc; + delete m_not; + m_not = m_proc = 0l; + close( m_term[0] ); + close( m_term[1] ); + close( m_comm[0] ); + close( m_comm[1] ); + layer()->closeRawIO(m_fd); + emit received(QString::null); + +} diff --git a/noncore/apps/opie-console/filereceive.h b/noncore/apps/opie-console/filereceive.h new file mode 100644 index 0000000..a525439 --- a/dev/null +++ b/noncore/apps/opie-console/filereceive.h @@ -0,0 +1,42 @@ +#ifndef OPIE_FILE_RECEIVE_H +#define OPIE_FILE_RECEIVE_H + +/** + * This is the receive Implementation + * for X-Modem/Y-Modem/Z-Modem + */ +#include + +#include "receive_layer.h" + +class QSocketNotifier; +class FileReceive : public ReceiveLayer { + Q_OBJECT +public: + enum Type { + SZ = 0, + SX, + SY + }; + FileReceive( Type t, IOLayer* lay, const QString& startDir = QString::null ); + ~FileReceive(); + void receive(); + void receive( const QString& dir ); + void cancel(); +private slots: + void setupChild(); + void slotRead(); + void slotExec(); +private: + pid_t m_pid; + int m_fd; + int m_prog; + int m_info[2]; + int m_comm[2]; + int m_term[2]; + Type m_type; + QSocketNotifier* m_not; + QSocketNotifier* m_proc; +}; + +#endif diff --git a/noncore/apps/opie-console/filetransfer.cpp b/noncore/apps/opie-console/filetransfer.cpp index 14787f6..8ca0df2 100644 --- a/noncore/apps/opie-console/filetransfer.cpp +++ b/noncore/apps/opie-console/filetransfer.cpp @@ -17,6 +17,7 @@ FileTransfer::FileTransfer( Type t, IOLayer* lay ) : FileTransferLayer( lay ), m_type( t ), m_pid ( 0 ) { signal(SIGPIPE, SIG_IGN ); + m_pid = 0; m_not = 0l; m_proc = 0l; } @@ -48,6 +49,7 @@ void FileTransfer::sendFile( const QString& file ) { switch( m_pid ) { case -1: emit error( StartError, tr("Was not able to fork") ); + slotExec(); break; case 0:{ setupChild(); @@ -177,7 +179,6 @@ void FileTransfer::slotRead() { */ if ( lis[0].simplifyWhiteSpace() == "Transfer" ) { qWarning("sent!!!!"); - emit sent(); return; } /* @@ -236,7 +237,7 @@ void FileTransfer::slotProgress( const QStringList& list ) { } void FileTransfer::cancel() { if(m_pid > 0) ::kill(m_pid,9 ); - delete m_not; + } void FileTransfer::slotExec() { qWarning("exited!"); @@ -249,5 +250,7 @@ void FileTransfer::slotExec() { close( m_term[1] ); close( m_comm[0] ); close( m_comm[1] ); + layer()->closeRawIO( m_fd ); emit sent(); + m_pid = 0; } diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro index 8e39a48..0b4676b 100644 --- a/noncore/apps/opie-console/opie-console.pro +++ b/noncore/apps/opie-console/opie-console.pro @@ -30,7 +30,9 @@ HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h\ btconfigwidget.h modemconfigwidget.h \ atconfigdialog.h dialdialog.h \ emulation_widget.h procctl.h \ - function_keyboard.h script.h + function_keyboard.h \ + receive_layer.h filereceive.h \ + script.h SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp \ file_layer.cpp filetransfer.cpp \ @@ -58,7 +60,9 @@ SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp \ btconfigwidget.cpp modemconfigwidget.cpp \ atconfigdialog.cpp dialdialog.cpp \ emulation_widget.cpp default.cpp procctl.cpp \ - function_keyboard.cpp script.cpp + function_keyboard.cpp \ + receive_layer.cpp filereceive.cpp \ + script.cpp INTERFACES = configurebase.ui editbase.ui INCLUDEPATH += $(OPIEDIR)/include diff --git a/noncore/apps/opie-console/receive_layer.cpp b/noncore/apps/opie-console/receive_layer.cpp new file mode 100644 index 0000000..05e2c67 --- a/dev/null +++ b/noncore/apps/opie-console/receive_layer.cpp @@ -0,0 +1,33 @@ +#include + +#include +#include + +#include "io_layer.h" +#include "receive_layer.h" + +ReceiveLayer::ReceiveLayer( IOLayer* lay, const QString& startDir ) + : QObject(), m_curDir( startDir ), m_layer(lay ) +{ + +} +ReceiveLayer::~ReceiveLayer() { + +} +IOLayer* ReceiveLayer::layer() { + return m_layer; +} +QString ReceiveLayer::currentDir()const{ + if (m_curDir.isEmpty() ) + return QString::fromLocal8Bit( ::getwd(NULL) ); + return m_curDir; +} +void ReceiveLayer::changeDir( const QString& str) { + ::chdir( str.latin1() ); +} +void ReceiveLayer::receive( const QString& dir, Mode, Features ) { + receive( dir ); +} +void ReceiveLayer::cancel() { + +} diff --git a/noncore/apps/opie-console/receive_layer.h b/noncore/apps/opie-console/receive_layer.h index 0cfe16d..157c7e5 100644 --- a/noncore/apps/opie-console/receive_layer.h +++ b/noncore/apps/opie-console/receive_layer.h @@ -45,12 +45,11 @@ public: }; /** - * which protocol to use? + * Error codes */ - enum Type{ - SZ = 0, - SX, - SY + enum Error { + Unknown = 0, + StartError }; /** @@ -59,7 +58,7 @@ public: * @param t The Type * @param startDir In which dir should files be received? */ - ReceiveLayer( IOLayer* lay, Type t, const QString& startDir = QString::null ); + ReceiveLayer( IOLayer* lay, const QString& startDir = QString::null ); virtual ~ReceiveLayer(); public slots: @@ -78,7 +77,7 @@ public slots: /** * advanced method with features and Mode */ - virtual void receive( const QString& dir, Mode, Features ) {} + virtual void receive( const QString& dir, Mode, Features ); /** * cancel receive @@ -108,6 +107,15 @@ signals: */ void received( const QString& file ); +protected: + QString m_curDir; + IOLayer* layer(); + /* from a variable set from the outside */ + QString currentDir()const; + void changeDir( const QString& ); +private: + IOLayer* m_layer; + }; #endif diff --git a/noncore/apps/opie-console/test/console.pro b/noncore/apps/opie-console/test/console.pro index af0e9f7..6de2cd0 100644 --- a/noncore/apps/opie-console/test/console.pro +++ b/noncore/apps/opie-console/test/console.pro @@ -3,10 +3,12 @@ TEMPLATE = app CONFIG = qt debug #DESTDIR = $(OPIEDIR)/bin HEADERS = ../io_layer.h ../io_serial.h ../sz_transfer.h ../file_layer.h\ - senderui.h ../profile.h ../filetransfer.h ../procctl.h + senderui.h ../profile.h ../filetransfer.h ../procctl.h \ + ../filereceive.h ../receive_layer.h SOURCES = ../io_layer.cpp ../io_serial.cpp \ ../profile.cpp ../sz_transfer.cpp ../file_layer.cpp\ - main.cpp senderui.cpp ../filetransfer.cpp ../procctl.cpp + main.cpp senderui.cpp ../filetransfer.cpp ../procctl.cpp \ + ../filereceive.cpp ../receive_layer.cpp INTERFACES = sender.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include diff --git a/noncore/apps/opie-console/test/sender.ui b/noncore/apps/opie-console/test/sender.ui index b946b81..74b9790 100644 --- a/noncore/apps/opie-console/test/sender.ui +++ b/noncore/apps/opie-console/test/sender.ui @@ -11,7 +11,7 @@ 0 0 - 596 + 592 480 @@ -39,6 +39,17 @@ QPushButton name + PushButton3 + + + text + Receive File + + + + QPushButton + + name PushButton1 @@ -66,13 +77,20 @@ Form1 slotSend() - slotSend() PushButton2 clicked() Form1 slotSendFile() + + PushButton3 + clicked() + Form1 + slotRev() + + slotRev() + slotSend() slotSendFile() diff --git a/noncore/apps/opie-console/test/senderui.cpp b/noncore/apps/opie-console/test/senderui.cpp index 8bc1676..2ce3f6d 100644 --- a/noncore/apps/opie-console/test/senderui.cpp +++ b/noncore/apps/opie-console/test/senderui.cpp @@ -9,6 +9,7 @@ #include "../profile.h" #include "../io_serial.h" #include "../filetransfer.h" +#include "../filereceive.h" #include @@ -66,3 +67,9 @@ void SenderUI::fileTransComplete() { void SenderUI::send() { } +void SenderUI::slotRev(){ +qWarning("Going to receive!"); +FileReceive *rev = new FileReceive( FileReceive::SZ, ser ); +rev->receive(); + +} \ No newline at end of file diff --git a/noncore/apps/opie-console/test/senderui.h b/noncore/apps/opie-console/test/senderui.h index 5e613cd..c130dcf 100644 --- a/noncore/apps/opie-console/test/senderui.h +++ b/noncore/apps/opie-console/test/senderui.h @@ -19,6 +19,7 @@ public slots: void send(); void slotSendFile(); void slotSend(); + void slotRev(); void got(const QByteArray& ); void fileTransComplete(); private: -- cgit v0.9.0.2