fixed ramfs entry for ipaq

1 files changed, 15 insertions, 15 deletions

diff --git a/library/storage.cpp b/library/storage.cpp
index b4d743e..8346e82 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -22,62 +22,62 @@
 #include <qpe/storage.h>
 #ifdef QT_QWS_CUSTOM
 #include <qpe/custom.h>
 #endif
 
 #include <qfile.h>
 #include <qtimer.h>
 #include <qcopchannel_qws.h>
 
 #include <stdio.h>
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <sys/vfs.h>
 #include <mntent.h>
 #endif
 
 #include <qstringlist.h>
 
 static bool isCF(const QString& m)
 {
     FILE* f = fopen("/var/run/stab", "r");
     if (!f) f = fopen("/var/state/pcmcia/stab", "r");
     if (!f) f = fopen("/var/lib/pcmcia/stab", "r");
     if ( f ) {
-  char line[1024];
-  char devtype[80];
-  char devname[80];
-  while ( fgets( line, 1024, f ) ) {
-      // 0       ide     ide-cs  0       hda     3       0
-      if ( sscanf(line,"%*d %s %*s %*s %s", devtype, devname )==2 )
-      {
-    if ( QString(devtype) == "ide" && m.find(devname)>0 ) {
+        char line[1024];
+        char devtype[80];
+        char devname[80];
+        while ( fgets( line, 1024, f ) ) {
+              // 0       ide     ide-cs  0       hda     3       0
+            if ( sscanf(line,"%*d %s %*s %*s %s", devtype, devname )==2 )
+              {
+                  if ( QString(devtype) == "ide" && m.find(devname)>0 ) {
+                      fclose(f);
+                      return TRUE;
+                  }
+              }
+        }
         fclose(f);
-        return TRUE;
-    }
-      }
-  }
-  fclose(f);
     }
     return FALSE;
 }
 
 StorageInfo::StorageInfo( QObject *parent )
     : QObject( parent )
 {
     mFileSystems.setAutoDelete( TRUE );
     channel = new QCopChannel( "QPE/Card", this );
     connect( channel, SIGNAL(received(const QCString &, const QByteArray &)),
        this, SLOT(cardMessage( const QCString &, const QByteArray &)) );
     update();
 }
 
 const FileSystem *StorageInfo::fileSystemOf( const QString &filename )
 {
     for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) {
   if ( filename.startsWith( (*i)->path() ) )
        return (*i);
     }
     return 0;
 }
 
 
@@ -133,50 +133,50 @@ void StorageInfo::update()
   for (; it!=curdisks.end(); ++it, ++fsit, ++optsIt) {
       QString opts = *optsIt;
   
       QString disk = *it; 
       QString humanname;
       bool removable = FALSE;
       if ( isCF(disk) ) {
     humanname = tr("CF Card");
     removable = TRUE;
       } else if ( disk == "/dev/hda1" ) {
     humanname = tr("Hard Disk");
       } else if ( disk.left(9) == "/dev/mmcd" ) {
     humanname = tr("SD Card");
     removable = TRUE;
       } else if ( disk.left(7) == "/dev/hd" )
     humanname = tr("Hard Disk") + " " + humanname.mid(7);
       else if ( disk.left(7) == "/dev/sd" )
     humanname = tr("SCSI Hard Disk") + " " + humanname.mid(7);
       else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" )
     humanname = tr("Internal Storage");
       else if ( disk.left(14) == "/dev/mtdblock/" )
     humanname = tr("Internal Storage") + " " + humanname.mid(14);
       else if ( disk.left(13) == "/dev/mtdblock" )
     humanname = tr("Internal Storage") + " " + humanname.mid(13);
-      else if ( disk.left(10) == "/dev/ramfs" )
-    humanname = tr("Internal Storage") + " " + humanname.mid(10);
+      else if ( disk.left(5) == "tmpfs" ) //ipaqs /mnt/ramfs
+    humanname = tr("Ram FS") + " " + humanname.mid(5);
       FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts );
       mFileSystems.append( fs );
   }
   emit disksChanged();
     } else {
   // just update them
   for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
       i.current()->update();
     }
 #endif
 }
 
 //---------------------------------------------------------------------------
 
 FileSystem::FileSystem( const QString &disk, const QString &path, const QString &name, bool rem, const QString &o )
     : fsdisk( disk ), fspath( path ), humanname( name ), blkSize(512), totalBlks(0), availBlks(0), removable( rem ), opts( o )
 {
     update();
 }
 
 void FileSystem::update()
 {
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
     struct statfs fs;