The following change is untested on a real device. So please try and

bitch if I broke something!!!

Make unmounting of sdcards more robust. If we find a /dev/mmcard1 or
/dev/mmc/1 or /dev/mmc* we will remember that device name and if the
user asks us to eject it we will use that name.

2 files changed, 6 insertions, 10 deletions

diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 48146ab..43ccce2 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -125,39 +125,34 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
     if ( cardInPcmcia1 ) {
         menu->
         insertItem( QIconSet
                     ( Resource::loadPixmap( "cardmon/" + cardInPcmcia1Type ) ),
                     tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );
     }
 
     QPoint p = mapToGlobal( QPoint( 0, 0 ) );
     QSize s = menu->sizeHint();
     int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),
                                   p.y() - s.height() ), 0 );
 
     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 {
-            cmd = "umount /dev/mmcda1";
-        }
         m_commandOrig = 2;
-        execCommand( cmd );
+        execCommand( QString("umount %1").arg(cardSdName));
     } 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()" ) {
         // odebug << "Pcmcia: stabchanged" << oendl;
         getStatusPcmcia();
     } else if ( msg == "mtabChanged()" ) {
         // odebug << "CARDMONAPPLET: mtabchanged" << oendl;
         getStatusSd();
     }
@@ -269,37 +264,38 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
 
 }
 
 
 bool CardMonitor::getStatusSd( int showPopUp ) {
 
     bool cardWas = cardInSd;    // remember last state
     cardInSd = FALSE;
 
     #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 
     struct mntent *me;
     FILE *mntfp = setmntent( "/etc/mtab", "r" );
 
     if ( mntfp ) {
         while ( ( me = getmntent( mntfp ) ) != 0 ) {
-            QString fs = me->mnt_fsname;
+            QString fs = QFile::decodeName( me->mnt_fsname );
             //odebug << fs << oendl;
             if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd"
                     || fs.left( 9 ) == "/dev/mmcd" ) {
                 cardInSd = TRUE;
+                cardSdName = fs;
                 show();
             }
             //            else {
             //                 cardInSd = FALSE;
             //             }
         }
         endmntent( mntfp );
     }
 
     if ( !showPopUp && cardWas != cardInSd ) {
         QString text = QString::null;
         QString what = QString::null;
         if ( cardInSd ) {
             text += "New card: SD/MMC";
             what = "on";
         } else {
@@ -325,32 +321,34 @@ void CardMonitor::paintEvent( QPaintEvent * ) {
     QPainter p( this );
 
     if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
         p.drawPixmap( 0, 0, pm );
         show();
     } else {
         //p.eraseRect(rect());
         hide();
     }
 }
 
 int CardMonitor::position() {
     return 7;
 }
 
 void CardMonitor::execCommand( const QString &command ) {
+    delete m_process;
+    m_process = 0;
 
     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;
         }
@@ -358,23 +356,20 @@ void CardMonitor::execCommand( const QString &command ) {
 }
 
 void CardMonitor::slotExited( OProcess*  ) {
 
    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 19d0394..b02c8b1 100644
--- a/core/applets/cardmon/cardmon.h
+++ b/core/applets/cardmon/cardmon.h
@@ -46,24 +46,25 @@ protected:
     void paintEvent( QPaintEvent* );
     void mousePressEvent( QMouseEvent * );
 
 private:
     void execCommand( const QString &command );
     int m_commandOrig;
     QPixmap pm;
     // pcmcia socket 0
     bool cardInPcmcia0;
     QString cardInPcmcia0Name;
     QString cardInPcmcia0Type;
     // pcmcia socket 1
     bool cardInPcmcia1;
     QString cardInPcmcia1Name;
     QString cardInPcmcia1Type;
     bool cardInSd;
+    QString cardSdName; // the device which is mounted
     void iconShow();
     QPopupMenu *popupMenu;
     void popUp(QString message, QString icon = QString::null );
     Opie::Core::OProcess* m_process;
 };
 
 #endif