author | llornkcor <llornkcor> | 2002-06-29 13:20:37 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-06-29 13:20:37 (UTC) |
commit | 881940465ce6bf9572a46e1aab850ec8e510c54b (patch) (unidiff) | |
tree | 2d896e808d728a241d1c7b2e65a9671650644586 | |
parent | 83c99614bf6d64601c6845f8dc9458d6c7aa410c (diff) | |
download | opie-881940465ce6bf9572a46e1aab850ec8e510c54b.zip opie-881940465ce6bf9572a46e1aab850ec8e510c54b.tar.gz opie-881940465ce6bf9572a46e1aab850ec8e510c54b.tar.bz2 |
added z ramfs
-rw-r--r-- | library/storage.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/library/storage.cpp b/library/storage.cpp index 8346e82..d6a91cf 100644 --- a/library/storage.cpp +++ b/library/storage.cpp | |||
@@ -119,64 +119,66 @@ void StorageInfo::update() | |||
119 | break; | 119 | break; |
120 | } | 120 | } |
121 | } | 121 | } |
122 | if ( !found ) | 122 | if ( !found ) |
123 | rebuild = TRUE; | 123 | rebuild = TRUE; |
124 | } | 124 | } |
125 | } | 125 | } |
126 | endmntent( mntfp ); | 126 | endmntent( mntfp ); |
127 | } | 127 | } |
128 | if ( rebuild || n != (int)mFileSystems.count() ) { | 128 | if ( rebuild || n != (int)mFileSystems.count() ) { |
129 | mFileSystems.clear(); | 129 | mFileSystems.clear(); |
130 | QStringList::ConstIterator it=curdisks.begin(); | 130 | QStringList::ConstIterator it=curdisks.begin(); |
131 | QStringList::ConstIterator fsit=curfs.begin(); | 131 | QStringList::ConstIterator fsit=curfs.begin(); |
132 | QStringList::ConstIterator optsIt=curopts.begin(); | 132 | QStringList::ConstIterator optsIt=curopts.begin(); |
133 | for (; it!=curdisks.end(); ++it, ++fsit, ++optsIt) { | 133 | for (; it!=curdisks.end(); ++it, ++fsit, ++optsIt) { |
134 | QString opts = *optsIt; | 134 | QString opts = *optsIt; |
135 | 135 | ||
136 | QString disk = *it; | 136 | QString disk = *it; |
137 | QString humanname; | 137 | QString humanname; |
138 | bool removable = FALSE; | 138 | bool removable = FALSE; |
139 | if ( isCF(disk) ) { | 139 | if ( isCF(disk) ) { |
140 | humanname = tr("CF Card"); | 140 | humanname = tr("CF Card"); |
141 | removable = TRUE; | 141 | removable = TRUE; |
142 | } else if ( disk == "/dev/hda1" ) { | 142 | } else if ( disk == "/dev/hda1" ) { |
143 | humanname = tr("Hard Disk"); | 143 | humanname = tr("Hard Disk"); |
144 | } else if ( disk.left(9) == "/dev/mmcd" ) { | 144 | } else if ( disk.left(9) == "/dev/mmcd" ) { |
145 | humanname = tr("SD Card"); | 145 | humanname = tr("SD Card"); |
146 | removable = TRUE; | 146 | removable = TRUE; |
147 | } else if ( disk.left(7) == "/dev/hd" ) | 147 | } else if ( disk.left(7) == "/dev/hd" ) |
148 | humanname = tr("Hard Disk") + " " + humanname.mid(7); | 148 | humanname = tr("Hard Disk") + " " + humanname.mid(7); |
149 | else if ( disk.left(7) == "/dev/sd" ) | 149 | else if ( disk.left(7) == "/dev/sd" ) |
150 | humanname = tr("SCSI Hard Disk") + " " + humanname.mid(7); | 150 | humanname = tr("SCSI Hard Disk") + " " + humanname.mid(7); |
151 | else if ( disk.left(15) == "/dev/mtdblock6/" ) //openzaurus ramfs | ||
152 | humanname = tr("Ram FS") + " " + humanname.mid(15); | ||
151 | else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" ) | 153 | else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" ) |
152 | humanname = tr("Internal Storage"); | 154 | humanname = tr("Internal Storage"); |
153 | else if ( disk.left(14) == "/dev/mtdblock/" ) | 155 | else if ( disk.left(14) == "/dev/mtdblock/" ) |
154 | humanname = tr("Internal Storage") + " " + humanname.mid(14); | 156 | humanname = tr("Internal Storage") + " " + humanname.mid(14); |
155 | else if ( disk.left(13) == "/dev/mtdblock" ) | 157 | else if ( disk.left(13) == "/dev/mtdblock" ) |
156 | humanname = tr("Internal Storage") + " " + humanname.mid(13); | 158 | humanname = tr("Internal Storage") + " " + humanname.mid(13); |
157 | else if ( disk.left(5) == "tmpfs" ) //ipaqs /mnt/ramfs | 159 | else if ( disk.left(5) == "tmpfs" ) //ipaqs /mnt/ramfs |
158 | humanname = tr("Ram FS") + " " + humanname.mid(5); | 160 | humanname = tr("Ram FS") + " " + humanname.mid(5); |
159 | FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts ); | 161 | FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts ); |
160 | mFileSystems.append( fs ); | 162 | mFileSystems.append( fs ); |
161 | } | 163 | } |
162 | emit disksChanged(); | 164 | emit disksChanged(); |
163 | } else { | 165 | } else { |
164 | // just update them | 166 | // just update them |
165 | for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) | 167 | for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) |
166 | i.current()->update(); | 168 | i.current()->update(); |
167 | } | 169 | } |
168 | #endif | 170 | #endif |
169 | } | 171 | } |
170 | 172 | ||
171 | //--------------------------------------------------------------------------- | 173 | //--------------------------------------------------------------------------- |
172 | 174 | ||
173 | FileSystem::FileSystem( const QString &disk, const QString &path, const QString &name, bool rem, const QString &o ) | 175 | FileSystem::FileSystem( const QString &disk, const QString &path, const QString &name, bool rem, const QString &o ) |
174 | : fsdisk( disk ), fspath( path ), humanname( name ), blkSize(512), totalBlks(0), availBlks(0), removable( rem ), opts( o ) | 176 | : fsdisk( disk ), fspath( path ), humanname( name ), blkSize(512), totalBlks(0), availBlks(0), removable( rem ), opts( o ) |
175 | { | 177 | { |
176 | update(); | 178 | update(); |
177 | } | 179 | } |
178 | 180 | ||
179 | void FileSystem::update() | 181 | void FileSystem::update() |
180 | { | 182 | { |
181 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) | 183 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) |
182 | struct statfs fs; | 184 | struct statfs fs; |