summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-06-29 13:16:59 (UTC)
committer llornkcor <llornkcor>2002-06-29 13:16:59 (UTC)
commit83c99614bf6d64601c6845f8dc9458d6c7aa410c (patch) (side-by-side diff)
tree4d6b83f67deebb08b740a72dd3b35c55996017f5
parent2d3e1d2a51edeebfb6acea960cc4d505b4c72731 (diff)
downloadopie-83c99614bf6d64601c6845f8dc9458d6c7aa410c.zip
opie-83c99614bf6d64601c6845f8dc9458d6c7aa410c.tar.gz
opie-83c99614bf6d64601c6845f8dc9458d6c7aa410c.tar.bz2
fixed ramfs entry for ipaq
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/storage.cpp30
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
@@ -38,30 +38,30 @@
#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 );
@@ -149,18 +149,18 @@ void StorageInfo::update()
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();