2 files changed, 123 insertions, 150 deletions

diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 3af3d03..3f07b41 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -22,6 +22,8 @@
 #include <opie2/odebug.h>
 #include <opie2/odevice.h>
 #include <opie2/otaskbarapplet.h>
+#include <opie2/oprocess.h>
+
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 using namespace Opie::Core;
@@ -47,8 +49,7 @@ using namespace Opie::Ui;
 #endif
 
 CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ),
-        pm( Resource::loadPixmap( "cardmon/pcmcia" ) )
-{
+pm( Resource::loadPixmap( "cardmon/pcmcia" ) ) {
 
     QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this );
     connect( pcmciaChannel,
@@ -63,6 +64,7 @@ CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ),
     cardInPcmcia0 = FALSE;
     cardInPcmcia1 = FALSE;
     cardInSd = FALSE;
+    m_process = 0;
 
     setFocusPolicy( NoFocus );
 
@@ -75,28 +77,19 @@ CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ),
     popupMenu = 0;
 }
 
-CardMonitor::~CardMonitor()
-{
-    if ( popupMenu )
-    {
-        delete popupMenu;
-    }
+CardMonitor::~CardMonitor() {
+    delete popupMenu;
 }
 
-void CardMonitor::popUp( QString message, QString icon )
-{
-    if ( !popupMenu )
-    {
+void CardMonitor::popUp( QString message, QString icon ) {
+    if ( !popupMenu ) {
         popupMenu = new QPopupMenu( this );
     }
 
     popupMenu->clear();
-    if ( icon.isEmpty() )
-    {
+    if ( icon.isEmpty() ) {
         popupMenu->insertItem( message, 0 );
-    }
-    else
-    {
+    } else {
         popupMenu->insertItem( QIconSet( Resource::loadPixmap( icon ) ),
                                message, 0 );
     }
@@ -109,33 +102,27 @@ void CardMonitor::popUp( QString message, QString icon )
     QTimer::singleShot( 2000, this, SLOT( popupTimeout() ) );
 }
 
-void CardMonitor::popupTimeout()
-{
+void CardMonitor::popupTimeout() {
     popupMenu->hide();
 }
 
-void CardMonitor::mousePressEvent( QMouseEvent * )
-{
+void CardMonitor::mousePressEvent( QMouseEvent * ) {
     QPopupMenu * menu = new QPopupMenu( this );
     QString cmd;
-    int err = 0;
 
-    if ( cardInSd )
-    {
+    if ( cardInSd ) {
         menu->insertItem( QIconSet( Resource::loadPixmap( "cardmon/ide" ) ),
                           tr( "Eject SD/MMC card" ), 0 );
     }
 
-    if ( cardInPcmcia0 )
-    {
+    if ( cardInPcmcia0 ) {
         menu->
         insertItem( QIconSet
                     ( Resource::loadPixmap( "cardmon/" + cardInPcmcia0Type ) ),
                     tr( "Eject card 0: %1" ).arg( cardInPcmcia0Name ), 1 );
     }
 
-    if ( cardInPcmcia1 )
-    {
+    if ( cardInPcmcia1 ) {
         menu->
         insertItem( QIconSet
                     ( Resource::loadPixmap( "cardmon/" + cardInPcmcia1Type ) ),
@@ -147,62 +134,36 @@ void CardMonitor::mousePressEvent( QMouseEvent * )
     int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),
                                   p.y() - s.height() ), 0 );
 
-    if ( opt == 1 )
-    {
-        cmd = "/sbin/cardctl eject 0";
-        err = system( ( const char * ) cmd );
-        if ( err != 0 )
-        {
-            odebug << "Could not execute `/sbin/cardctl eject 0'! err=" << err << oendl;
-            popUp( tr( "CF/PCMCIA card eject failed!" ) );
-        }
-    }
-    else if ( opt == 0 )
-    {
-        if ( ODevice::inst() ->system() == System_Familiar )
-        {
+    if ( opt == 1 ) {
+        m_commandOrig = 1;
+        execCommand("/sbin/cardctl eject 0");
+    } else if ( opt == 0 ) {
+        if ( ODevice::inst() ->system() == System_Familiar ) {
             cmd = "umount /dev/mmc/part1";
-        }
-        else
-        {
+        } else {
             cmd = "umount /dev/mmcda1";
         }
-        err = system( ( const char * ) cmd );
-        if ( err != 0 )
-        {
-            popUp( tr( "SD/MMC card eject failed!" ) );
-        }
-    }
-    else if ( opt == 2 )
-    {
-        cmd = "/sbin/cardctl eject 1";
-        err = system( ( const char * ) cmd );
-        if ( err != 0 )
-        {
-            odebug << "Could not execute `/sbin/cardctl eject 1'! err=" << err << oendl;
-            popUp( tr( "CF/PCMCIA card eject failed!" ) );
-        }
+        m_commandOrig = 2;
+        execCommand( cmd );
+    } else if ( opt == 2 ) {
+        m_commandOrig = 3;
+        execCommand( "/sbin/cardctl eject 1" );
     }
     delete menu;
 }
 
 
-void CardMonitor::cardMessage( const QCString & msg, const QByteArray & )
-{
-    if ( msg == "stabChanged()" )
-    {
+void CardMonitor::cardMessage( const QCString & msg, const QByteArray & ) {
+    if ( msg == "stabChanged()" ) {
         // odebug << "Pcmcia: stabchanged" << oendl;
         getStatusPcmcia();
-    }
-    else if ( msg == "mtabChanged()" )
-    {
+    } else if ( msg == "mtabChanged()" ) {
         // odebug << "CARDMONAPPLET: mtabchanged" << oendl;
         getStatusSd();
     }
 }
 
-bool CardMonitor::getStatusPcmcia( int showPopUp )
-{
+bool CardMonitor::getStatusPcmcia( int showPopUp ) {
 
     bool cardWas0 = cardInPcmcia0;    // remember last state
     bool cardWas1 = cardInPcmcia1;
@@ -210,40 +171,29 @@ bool CardMonitor::getStatusPcmcia( int showPopUp )
     QString fileName;
 
     // one of these 3 files should exist
-    if ( QFile::exists( "/var/run/stab" ) )
-    {
+    if ( QFile::exists( "/var/run/stab" ) ) {
         fileName = "/var/run/stab";
-    }
-    else if ( QFile::exists( "/var/state/pcmcia/stab" ) )
-    {
+    } else if ( QFile::exists( "/var/state/pcmcia/stab" ) ) {
         fileName = "/var/state/pcmcia/stab";
-    }
-    else
-    {
+    } else {
         fileName = "/var/lib/pcmcia/stab";
     }
 
     QFile f( fileName );
 
-    if ( f.open( IO_ReadOnly ) )
-    {
+    if ( f.open( IO_ReadOnly ) ) {
         QStringList list;
         QTextStream stream( &f );
         QString streamIn;
         streamIn = stream.read();
         list = QStringList::split( "\n", streamIn );
         for ( QStringList::Iterator line = list.begin(); line != list.end();
-                line++ )
-        {
-            if ( ( *line ).startsWith( "Socket 0:" ) )
-            {
-                if ( ( *line ).startsWith( "Socket 0: empty" ) && cardInPcmcia0 )
-                {
+                line++ ) {
+            if ( ( *line ).startsWith( "Socket 0:" ) ) {
+                if ( ( *line ).startsWith( "Socket 0: empty" ) && cardInPcmcia0 ) {
                     cardInPcmcia0 = FALSE;
-                }
-                else if ( !( *line ).startsWith( "Socket 0: empty" )
-                          && !cardInPcmcia0 )
-                {
+                } else if ( !( *line ).startsWith( "Socket 0: empty" )
+                            && !cardInPcmcia0 ) {
                     cardInPcmcia0Name =
                         ( *line ).mid( ( ( *line ).find( ':' ) + 1 ),
                                        ( *line ).length() - 9 );
@@ -255,16 +205,11 @@ bool CardMonitor::getStatusPcmcia( int showPopUp )
                     cardInPcmcia0Type =
                         ( *line ).mid( pos, ( *line ).find( "\t", pos ) - pos );
                 }
-            }
-            else if ( ( *line ).startsWith( "Socket 1:" ) )
-            {
-                if ( ( *line ).startsWith( "Socket 1: empty" ) && cardInPcmcia1 )
-                {
+            } else if ( ( *line ).startsWith( "Socket 1:" ) ) {
+                if ( ( *line ).startsWith( "Socket 1: empty" ) && cardInPcmcia1 ) {
                     cardInPcmcia1 = FALSE;
-                }
-                else if ( !( *line ).startsWith( "Socket 1: empty" )
-                          && !cardInPcmcia1 )
-                {
+                } else if ( !( *line ).startsWith( "Socket 1: empty" )
+                            && !cardInPcmcia1 ) {
                     cardInPcmcia1Name =
                         ( *line ).mid( ( ( *line ).find( ':' ) + 1 ),
                                        ( *line ).length() - 9 );
@@ -281,19 +226,14 @@ bool CardMonitor::getStatusPcmcia( int showPopUp )
         f.close();
 
         if ( !showPopUp
-                && ( cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1 ) )
-        {
+                && ( cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1 ) ) {
             QString text = QString::null;
             QString what = QString::null;
-            if ( cardWas0 != cardInPcmcia0 )
-            {
-                if ( cardInPcmcia0 )
-                {
+            if ( cardWas0 != cardInPcmcia0 ) {
+                if ( cardInPcmcia0 ) {
                     text += tr( "New card: " );
                     what = "on";
-                }
-                else
-                {
+                } else {
                     text += tr( "Ejected: " );
                     what = "off";
                 }
@@ -301,29 +241,23 @@ bool CardMonitor::getStatusPcmcia( int showPopUp )
                 popUp( text, "cardmon/" + cardInPcmcia0Type );
             }
 
-            if ( cardWas1 != cardInPcmcia1 )
-            {
-                if ( cardInPcmcia1 )
-                {
+            if ( cardWas1 != cardInPcmcia1 ) {
+                if ( cardInPcmcia1 ) {
                     text += tr( "New card: " );
                     what = "on";
-                }
-                else
-                {
+                } else {
                     text += tr( "Ejected: " );
                     what = "off";
                 }
                 text += cardInPcmcia1Name;
                 popUp( text, "cardmon/" + cardInPcmcia1Type );
             }
-#ifndef QT_NO_SOUND
+            #ifndef QT_NO_SOUND
             QSound::play( Resource::findSound( "cardmon/card" + what ) );
-#endif
+            #endif
 
         }
-    }
-    else
-    {
+    } else {
         // no file found
         odebug << "no file found" << oendl;
         cardInPcmcia0 = FALSE;
@@ -336,25 +270,22 @@ bool CardMonitor::getStatusPcmcia( int showPopUp )
 }
 
 
-bool CardMonitor::getStatusSd( int showPopUp )
-{
+bool CardMonitor::getStatusSd( int showPopUp ) {
 
     bool cardWas = cardInSd;    // remember last state
     cardInSd = FALSE;
 
-#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
+    #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
+
     struct mntent *me;
     FILE *mntfp = setmntent( "/etc/mtab", "r" );
 
-    if ( mntfp )
-    {
-        while ( ( me = getmntent( mntfp ) ) != 0 )
-        {
+    if ( mntfp ) {
+        while ( ( me = getmntent( mntfp ) ) != 0 ) {
             QString fs = me->mnt_fsname;
             //odebug << fs << oendl;
             if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd"
-                    || fs.left( 9 ) == "/dev/mmcd" )
-            {
+                    || fs.left( 9 ) == "/dev/mmcd" ) {
                 cardInSd = TRUE;
                 show();
             }
@@ -365,54 +296,85 @@ bool CardMonitor::getStatusSd( int showPopUp )
         endmntent( mntfp );
     }
 
-    if ( !showPopUp && cardWas != cardInSd )
-    {
+    if ( !showPopUp && cardWas != cardInSd ) {
         QString text = QString::null;
         QString what = QString::null;
-        if ( cardInSd )
-        {
+        if ( cardInSd ) {
             text += "New card: SD/MMC";
             what = "on";
-        }
-        else
-        {
+        } else {
             text += "Ejected: SD/MMC";
             what = "off";
         }
         //odebug << "TEXT: " + text << oendl;
-#ifndef QT_NO_SOUND
+        #ifndef QT_NO_SOUND
         QSound::play( Resource::findSound( "cardmon/card" + what ) );
-#endif
+        #endif
+
         popUp( text, "cardmon/ide" );    // XX add SD pic
     }
-#else
-#error "Not on Linux"
-#endif
+    #else
+    #error "Not on Linux"
+    #endif
     repaint( FALSE );
     return ( ( cardWas == cardInSd ) ? FALSE : TRUE );
 }
 
-void CardMonitor::paintEvent( QPaintEvent * )
-{
+void CardMonitor::paintEvent( QPaintEvent * ) {
 
     QPainter p( this );
 
-    if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd )
-    {
+    if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
         p.drawPixmap( 0, 0, pm );
         show();
-    }
-    else
-    {
+    } else {
         //p.eraseRect(rect());
         hide();
     }
 }
 
-int CardMonitor::position()
-{
+int CardMonitor::position() {
     return 7;
 }
 
+void CardMonitor::execCommand( const QString &command ) {
+
+    if ( m_process == 0 ) {
+        m_process = new OProcess();
+        QStringList strList = QStringList::split( " ", command );
+
+           for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) {
+                *m_process << *it;
+            }
+
+        connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ),
+                this, SLOT( slotExited(Opie::Core::OProcess* ) ) );
+
+        if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ) {
+            delete m_process;
+            m_process = 0;
+        }
+    }
+}
+
+void CardMonitor::slotExited( OProcess* proc ) {
+
+   if( m_process->normalExit() ) {
+        int ret = m_process->exitStatus();
+        if( ret != 0 ) {
+            if ( m_commandOrig == 1 ) {
+                popUp( tr( "CF/PCMCIA card eject failed!" ) );
+            } else if ( m_commandOrig == 2 ) {
+                popUp( tr( "SD/MMC card eject failed!" ) );
+            } else if ( m_commandOrig == 3 ) {
+                popUp( tr( "CF/PCMCIA card eject failed!" ) );
+            }
+        }
+    }
+
+    delete m_process;
+    m_process = 0;
+}
+
 EXPORT_OPIE_APPLET_v1( CardMonitor )
 
diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h
index 37de366..19d0394 100644
--- a/core/applets/cardmon/cardmon.h
+++ b/core/applets/cardmon/cardmon.h
@@ -23,6 +23,12 @@
 #include <qpixmap.h>
 #include <qpopupmenu.h>
 
+namespace Opie {
+    namespace Core {
+        class OProcess;
+    }
+}
+
 class CardMonitor : public QWidget {
     Q_OBJECT
 public:
@@ -33,12 +39,16 @@ public:
     static int position();
 private slots:
     void cardMessage( const QCString &msg, const QByteArray & );
+    void slotExited( Opie::Core::OProcess* proc );
     void popupTimeout();
 
 protected:
     void paintEvent( QPaintEvent* );
     void mousePressEvent( QMouseEvent * );
+
 private:
+    void execCommand( const QString &command );
+    int m_commandOrig;
     QPixmap pm;
     // pcmcia socket 0
     bool cardInPcmcia0;
@@ -52,7 +62,8 @@ private:
     void iconShow();
     QPopupMenu *popupMenu;
     void popUp(QString message, QString icon = QString::null );
- };
+    Opie::Core::OProcess* m_process;
+};
 
 #endif