new functions getCfPath, getSdPath, getMmcPath returns mountpoints

2 files changed, 118 insertions, 25 deletions

diff --git a/library/storage.cpp b/library/storage.cpp
index f8b75d0..657fb71 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -58,3 +58,4 @@ static bool isCF(const QString& m)
     if (!f) f = fopen("/var/lib/pcmcia/stab", "r");
-    if ( f ) {
+    if ( f )
+    {
         char line[1024];
@@ -62,3 +63,4 @@ static bool isCF(const QString& m)
         char devname[80];
-        while ( fgets( line, 1024, f ) ) {
+        while ( fgets( line, 1024, f ) )
+        {
               // 0       ide     ide-cs  0       hda     3       0
@@ -66,3 +68,4 @@ static bool isCF(const QString& m)
               {
-                  if ( QString(devtype) == "ide" && m.find(devname)>0 ) {
+                if ( QString(devtype) == "ide" && m.find(devname)>0 )
+                {
                       fclose(f);
@@ -108,3 +111,4 @@ const FileSystem *StorageInfo::fileSystemOf( const QString &filename )
 {
-    for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) {
+    for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
+    {
   if ( filename.startsWith( (*i)->path() ) )
@@ -141,4 +145,6 @@ void StorageInfo::update()
     int n=0;
-    if ( mntfp ) {
-  while ( (me = getmntent( mntfp )) != 0 ) {
+    if ( mntfp )
+    {
+        while ( (me = getmntent( mntfp )) != 0 )
+        {
       QString fs = me->mnt_fsname;
@@ -155,4 +161,6 @@ void StorageInfo::update()
     bool found = FALSE;
-    for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) {
-        if ( (*i)->disk() == fs ) {
+                for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
+                {
+                    if ( (*i)->disk() == fs )
+                    {
       found = TRUE;
@@ -167,3 +175,4 @@ void StorageInfo::update()
     }
-    if ( rebuild || n != (int)mFileSystems.count() ) {
+    if ( rebuild || n != (int)mFileSystems.count() )
+    {
   mFileSystems.clear();
@@ -172,3 +181,4 @@ void StorageInfo::update()
   QStringList::ConstIterator optsIt=curopts.begin();
-  for (; it!=curdisks.end(); ++it, ++fsit, ++optsIt) {
+        for (; it!=curdisks.end(); ++it, ++fsit, ++optsIt)
+        {
       QString opts = *optsIt;
@@ -178,14 +188,22 @@ void StorageInfo::update()
       bool removable = FALSE;
-      if ( isCF(disk) ) {
+            if ( isCF(disk) )
+            {
     humanname = tr("CF Card");
     removable = TRUE;
-      } else if ( disk == "/dev/hda1" ) {
+            }
+            else if ( disk == "/dev/hda1" )
+            {
     humanname = tr("Hard Disk");
-      } else if ( disk.left(9) == "/dev/mmcd" ) {
+            }
+            else if ( disk.left(9) == "/dev/mmcd" )
+            {
     humanname = tr("SD Card");
     removable = TRUE;
-      } else if ( disk.left( 14 ) == "/dev/mmc/part1" ) {
+            }
+            else if ( disk.left( 14 ) == "/dev/mmc/part1" )
+            {
     humanname = tr("MMC Card");
     removable = TRUE;
-      } else if ( disk.left(7) == "/dev/hd" )
+            }
+            else if ( disk.left(7) == "/dev/hd" )
     humanname = tr("Hard Disk") + " " + disk;
@@ -209,3 +227,5 @@ void StorageInfo::update()
   emit disksChanged();
-    } else {
+    }
+    else
+    {
   // just update them
@@ -217,3 +237,4 @@ void StorageInfo::update()
 
-bool deviceTab( const char *device) {
+bool deviceTab( const char *device)
+{
 	QString name = device;
@@ -225,3 +246,4 @@ bool deviceTab( const char *device) {
 	int count = 0;
-	if ( ( count = getmntinfo( mntbufp, MNT_WAIT ) ) == 0 ){
+    if ( ( count = getmntinfo( mntbufp, MNT_WAIT ) ) == 0 )
+    {
 		qWarning("deviceTab: Error in getmntinfo(): %s",strerror( errno ) );
@@ -229,3 +251,4 @@ bool deviceTab( const char *device) {
 	}
-	for( int i = 0; i < count; i++ ){
+    for( int i = 0; i < count; i++ )
+    {
 		QString deviceName = mntbufp[i]->f_mntfromname;
@@ -239,7 +262,10 @@ bool deviceTab( const char *device) {
     FILE *mntfp = setmntent( "/etc/mtab", "r" );
-    if ( mntfp ) {
-        while ( (me = getmntent( mntfp )) != 0 ) {
+    if ( mntfp )
+    {
+        while ( (me = getmntent( mntfp )) != 0 )
+        {
           QString deviceName = me->mnt_fsname;
 //          qDebug(deviceName);
-            if( deviceName.left(name.length()) == name) {
+            if( deviceName.left(name.length()) == name)
+            {
                hasDevice = true;
@@ -277,3 +303,3 @@ bool StorageInfo::hasSd()
  * @fn static bool StorageInfo::hasMmc()
- * @brief reutrns whether device has mmc mounted
+ * @brief returns whether device has mmc mounted
  *
@@ -290,2 +316,62 @@ bool StorageInfo::hasMmc()
 
+/*!
+* @fn QString StorageInfo::getCfPath()
+* @brief returns the Mount-Path of Cf Card
+*
+*/
+QString StorageInfo::getCfPath()
+{
+    QString r = "";
+
+    for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
+    {
+        if ( (*i)->disk().left( 8 ) == "/dev/hda"  )
+        {
+            r = (*i)->path();
+            break;
+        }
+    }
+    return r;
+}
+
+/*!
+* @fn QString StorageInfo::getSdPath()
+* @brief returns the Mount-Path of Sd Card
+*
+*/
+QString StorageInfo::getSdPath()
+{
+    QString r = "";
+
+    for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
+    {
+        if ( (*i)->disk().left( 9 ) == "/dev/mmcd" )
+        {
+            r = (*i)->path();
+            break;
+        }
+    }
+    return r;
+}
+
+/*!
+* @fn QString StorageInfo::getMmcPath()
+* @brief returns the Mount-Path of Mmc Card
+*
+*/
+QString StorageInfo::getMmcPath()
+{
+    QString r = "";
+
+    for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
+    {
+        if ( (*i)->disk().left( 14 ) == "/dev/mmc/part1" )
+        {
+            r = (*i)->path();
+            break;
+        }
+    }
+    return r;
+}
+
 /*! \fn const QList<FileSystem> &StorageInfo::fileSystems() const
@@ -312,3 +398,4 @@ void FileSystem::update()
     struct statfs fs;
-    if ( !statfs( fspath.latin1(), &fs ) ) {
+    if ( !statfs( fspath.latin1(), &fs ) )
+    {
   blkSize = fs.f_bsize;
@@ -316,3 +403,5 @@ void FileSystem::update()
   availBlks = fs.f_bavail;
-    } else {
+    }
+    else
+    {
   blkSize = 0;
diff --git a/library/storage.h b/library/storage.h
index 0a0698f..35a1109 100644
--- a/library/storage.h
+++ b/library/storage.h
@@ -39,2 +39,6 @@ public:
    static bool hasMmc();
+
+    QString getCfPath();
+    QString getSdPath();
+    QString getMmcPath();
 signals: