author | llornkcor <llornkcor> | 2002-06-29 13:16:59 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-06-29 13:16:59 (UTC) |
commit | 83c99614bf6d64601c6845f8dc9458d6c7aa410c (patch) (unidiff) | |
tree | 4d6b83f67deebb08b740a72dd3b35c55996017f5 /library | |
parent | 2d3e1d2a51edeebfb6acea960cc4d505b4c72731 (diff) | |
download | opie-83c99614bf6d64601c6845f8dc9458d6c7aa410c.zip opie-83c99614bf6d64601c6845f8dc9458d6c7aa410c.tar.gz opie-83c99614bf6d64601c6845f8dc9458d6c7aa410c.tar.bz2 |
fixed ramfs entry for ipaq
-rw-r--r-- | library/storage.cpp | 30 |
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 | |||
@@ -43,20 +43,20 @@ static bool isCF(const QString& m) | |||
43 | if (!f) f = fopen("/var/state/pcmcia/stab", "r"); | 43 | if (!f) f = fopen("/var/state/pcmcia/stab", "r"); |
44 | if (!f) f = fopen("/var/lib/pcmcia/stab", "r"); | 44 | if (!f) f = fopen("/var/lib/pcmcia/stab", "r"); |
45 | if ( f ) { | 45 | if ( f ) { |
46 | char line[1024]; | 46 | char line[1024]; |
47 | char devtype[80]; | 47 | char devtype[80]; |
48 | char devname[80]; | 48 | char devname[80]; |
49 | while ( fgets( line, 1024, f ) ) { | 49 | while ( fgets( line, 1024, f ) ) { |
50 | // 0 ide ide-cs 0 hda 3 0 | 50 | // 0 ide ide-cs 0 hda 3 0 |
51 | if ( sscanf(line,"%*d %s %*s %*s %s", devtype, devname )==2 ) | 51 | if ( sscanf(line,"%*d %s %*s %*s %s", devtype, devname )==2 ) |
52 | { | 52 | { |
53 | if ( QString(devtype) == "ide" && m.find(devname)>0 ) { | 53 | if ( QString(devtype) == "ide" && m.find(devname)>0 ) { |
54 | fclose(f); | ||
55 | return TRUE; | ||
56 | } | ||
57 | } | ||
58 | } | ||
54 | fclose(f); | 59 | fclose(f); |
55 | return TRUE; | ||
56 | } | ||
57 | } | ||
58 | } | ||
59 | fclose(f); | ||
60 | } | 60 | } |
61 | return FALSE; | 61 | return FALSE; |
62 | } | 62 | } |
@@ -154,8 +154,8 @@ void StorageInfo::update() | |||
154 | humanname = tr("Internal Storage") + " " + humanname.mid(14); | 154 | humanname = tr("Internal Storage") + " " + humanname.mid(14); |
155 | else if ( disk.left(13) == "/dev/mtdblock" ) | 155 | else if ( disk.left(13) == "/dev/mtdblock" ) |
156 | humanname = tr("Internal Storage") + " " + humanname.mid(13); | 156 | humanname = tr("Internal Storage") + " " + humanname.mid(13); |
157 | else if ( disk.left(10) == "/dev/ramfs" ) | 157 | else if ( disk.left(5) == "tmpfs" ) //ipaqs /mnt/ramfs |
158 | humanname = tr("Internal Storage") + " " + humanname.mid(10); | 158 | humanname = tr("Ram FS") + " " + humanname.mid(5); |
159 | FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts ); | 159 | FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts ); |
160 | mFileSystems.append( fs ); | 160 | mFileSystems.append( fs ); |
161 | } | 161 | } |