author | leseb <leseb> | 2002-08-04 17:00:12 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-08-04 17:00:12 (UTC) |
commit | 55019d84057f9c2bd2b2483da2c128a0a927e003 (patch) (side-by-side diff) | |
tree | 1b77fb6b340ee3089edcec4e737e97cb2d0db53f /library | |
parent | 1a29ba832acf4d49398c498ce509cecc7cfb14a2 (diff) | |
download | opie-55019d84057f9c2bd2b2483da2c128a0a927e003.zip opie-55019d84057f9c2bd2b2483da2c128a0a927e003.tar.gz opie-55019d84057f9c2bd2b2483da2c128a0a927e003.tar.bz2 |
Fix bug for RamFS on iPaq (not tested)
-rw-r--r-- | library/storage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/storage.cpp b/library/storage.cpp index 096170f..2d996fa 100644 --- a/library/storage.cpp +++ b/library/storage.cpp @@ -60,97 +60,97 @@ static bool isCF(const QString& m) } 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; } void StorageInfo::cardMessage( const QCString& msg, const QByteArray& ) { if ( msg == "mtabChanged()" ) update(); } // cause of the lack of a d pointer we need // to store informations in a config file :( void StorageInfo::update() { //qDebug("StorageInfo::updating"); #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) struct mntent *me; FILE *mntfp = setmntent( "/etc/mtab", "r" ); QStringList curdisks; QStringList curopts; QStringList curfs; bool rebuild = FALSE; int n=0; if ( mntfp ) { while ( (me = getmntent( mntfp )) != 0 ) { QString fs = me->mnt_fsname; if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd" || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd" - || fs.left(8)=="/dev/ram") + || fs.left(8)=="/dev/ram" || fs.left(5)=="tmpfs" ) { n++; curdisks.append(fs); curopts.append( me->mnt_opts ); //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts ); curfs.append( me->mnt_dir ); bool found = FALSE; for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) { if ( (*i)->disk() == fs ) { found = TRUE; break; } } if ( !found ) rebuild = TRUE; } } endmntent( mntfp ); } if ( rebuild || n != (int)mFileSystems.count() ) { mFileSystems.clear(); QStringList::ConstIterator it=curdisks.begin(); QStringList::ConstIterator fsit=curfs.begin(); QStringList::ConstIterator optsIt=curopts.begin(); 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.left(14) == "/dev/mtdblock6" ) //openzaurus ramfs humanname = tr("Ram FS") + " " + humanname.mid(14); 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); |