summaryrefslogtreecommitdiff
authorar <ar>2004-01-07 20:22:49 (UTC)
committer ar <ar>2004-01-07 20:22:49 (UTC)
commitdd56d03c7a07ad1cf4f715ba22cbbf6b3d8392e8 (patch) (unidiff)
tree92c625add3c9d24e65c1550bc5449420a85342ce
parent24a62e8789083f446138aebfa11409b73886aa88 (diff)
downloadopie-dd56d03c7a07ad1cf4f715ba22cbbf6b3d8392e8.zip
opie-dd56d03c7a07ad1cf4f715ba22cbbf6b3d8392e8.tar.gz
opie-dd56d03c7a07ad1cf4f715ba22cbbf6b3d8392e8.tar.bz2
new functions getCfPath, getSdPath, getMmcPath returns mountpoints
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/storage.cpp343
-rw-r--r--library/storage.h14
2 files changed, 225 insertions, 132 deletions
diff --git a/library/storage.cpp b/library/storage.cpp
index f8b75d0..657fb71 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -31,3 +31,3 @@
31 31
32#if defined(_OS_LINUX_) || defined(Q_OS_LINUX) 32#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
33#include <sys/vfs.h> 33#include <sys/vfs.h>
@@ -58,3 +58,4 @@ static bool isCF(const QString& m)
58 if (!f) f = fopen("/var/lib/pcmcia/stab", "r"); 58 if (!f) f = fopen("/var/lib/pcmcia/stab", "r");
59 if ( f ) { 59 if ( f )
60 {
60 char line[1024]; 61 char line[1024];
@@ -62,11 +63,13 @@ static bool isCF(const QString& m)
62 char devname[80]; 63 char devname[80];
63 while ( fgets( line, 1024, f ) ) { 64 while ( fgets( line, 1024, f ) )
64 // 0 ide ide-cs 0 hda 3 0 65 {
66 // 0 ide ide-cs 0 hda 3 0
65 if ( sscanf(line,"%*d %s %*s %*s %s", devtype, devname )==2 ) 67 if ( sscanf(line,"%*d %s %*s %*s %s", devtype, devname )==2 )
66 { 68 {
67 if ( QString(devtype) == "ide" && m.find(devname)>0 ) { 69 if ( QString(devtype) == "ide" && m.find(devname)>0 )
68 fclose(f); 70 {
69 return TRUE; 71 fclose(f);
70 } 72 return TRUE;
71 } 73 }
74 }
72 } 75 }
@@ -80,3 +83,3 @@ static bool isCF(const QString& m)
80 \brief The StorageInfo class describes the disks mounted on the file system. 83 \brief The StorageInfo class describes the disks mounted on the file system.
81 84
82 This class provides access to the mount information for the Linux 85 This class provides access to the mount information for the Linux
@@ -94,3 +97,3 @@ static bool isCF(const QString& m)
94StorageInfo::StorageInfo( QObject *parent ) 97StorageInfo::StorageInfo( QObject *parent )
95 : QObject( parent ) 98 : QObject( parent )
96{ 99{
@@ -99,3 +102,3 @@ StorageInfo::StorageInfo( QObject *parent )
99 connect( channel, SIGNAL(received(const QCString &, const QByteArray &)), 102 connect( channel, SIGNAL(received(const QCString &, const QByteArray &)),
100 this, SLOT(cardMessage( const QCString &, const QByteArray &)) ); 103 this, SLOT(cardMessage( const QCString &, const QByteArray &)) );
101 update(); 104 update();
@@ -108,5 +111,6 @@ const FileSystem *StorageInfo::fileSystemOf( const QString &filename )
108{ 111{
109 for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) { 112 for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
110 if ( filename.startsWith( (*i)->path() ) ) 113 {
111 return (*i); 114 if ( filename.startsWith( (*i)->path() ) )
115 return (*i);
112 } 116 }
@@ -141,74 +145,90 @@ void StorageInfo::update()
141 int n=0; 145 int n=0;
142 if ( mntfp ) { 146 if ( mntfp )
143 while ( (me = getmntent( mntfp )) != 0 ) { 147 {
144 QString fs = me->mnt_fsname; 148 while ( (me = getmntent( mntfp )) != 0 )
145 if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd" 149 {
146 || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd" 150 QString fs = me->mnt_fsname;
147 || fs.left( 14 ) == "/dev/mmc/part1" 151 if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd"
148 || fs.left(5)=="tmpfs" || fs.left(9)=="/dev/root" ) 152 || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd"
149 { 153 || fs.left( 14 ) == "/dev/mmc/part1"
150 n++; 154 || fs.left(5)=="tmpfs" || fs.left(9)=="/dev/root" )
151 curdisks.append(fs); 155 {
152 curopts.append( me->mnt_opts ); 156 n++;
153 //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts ); 157 curdisks.append(fs);
154 curfs.append( me->mnt_dir ); 158 curopts.append( me->mnt_opts );
155 bool found = FALSE; 159 //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts );
156 for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) { 160 curfs.append( me->mnt_dir );
157 if ( (*i)->disk() == fs ) { 161 bool found = FALSE;
158 found = TRUE; 162 for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
159 break; 163 {
164 if ( (*i)->disk() == fs )
165 {
166 found = TRUE;
167 break;
168 }
169 }
170 if ( !found )
171 rebuild = TRUE;
172 }
160 } 173 }
174 endmntent( mntfp );
161 } 175 }
162 if ( !found ) 176 if ( rebuild || n != (int)mFileSystems.count() )
163 rebuild = TRUE; 177 {
164 } 178 mFileSystems.clear();
165 } 179 QStringList::ConstIterator it=curdisks.begin();
166 endmntent( mntfp ); 180 QStringList::ConstIterator fsit=curfs.begin();
181 QStringList::ConstIterator optsIt=curopts.begin();
182 for (; it!=curdisks.end(); ++it, ++fsit, ++optsIt)
183 {
184 QString opts = *optsIt;
185
186 QString disk = *it;
187 QString humanname;
188 bool removable = FALSE;
189 if ( isCF(disk) )
190 {
191 humanname = tr("CF Card");
192 removable = TRUE;
193 }
194 else if ( disk == "/dev/hda1" )
195 {
196 humanname = tr("Hard Disk");
197 }
198 else if ( disk.left(9) == "/dev/mmcd" )
199 {
200 humanname = tr("SD Card");
201 removable = TRUE;
202 }
203 else if ( disk.left( 14 ) == "/dev/mmc/part1" )
204 {
205 humanname = tr("MMC Card");
206 removable = TRUE;
207 }
208 else if ( disk.left(7) == "/dev/hd" )
209 humanname = tr("Hard Disk") + " " + disk;
210 else if ( disk.left(7) == "/dev/sd" )
211 humanname = tr("SCSI Hard Disk") + " " + disk;
212 else if ( disk.left(14) == "/dev/mtdblock6" ) //openzaurus ramfs
213 humanname = tr("Internal Memory");
214 else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" )
215 humanname = tr("Internal Storage");
216 else if ( disk.left(14) == "/dev/mtdblock/" )
217 humanname = tr("Internal Storage") + " " + disk;
218 else if ( disk.left(13) == "/dev/mtdblock" )
219 humanname = tr("Internal Storage") + " " + disk;
220 else if ( disk.left(9) == "/dev/root" )
221 humanname = tr("Internal Storage") + " " + disk;
222 else if ( disk.left(5) == "tmpfs" ) //ipaqs /mnt/ramfs
223 humanname = tr("Internal Memory");
224 FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts );
225 mFileSystems.append( fs );
226 }
227 emit disksChanged();
167 } 228 }
168 if ( rebuild || n != (int)mFileSystems.count() ) { 229 else
169 mFileSystems.clear(); 230 {
170 QStringList::ConstIterator it=curdisks.begin(); 231 // just update them
171 QStringList::ConstIterator fsit=curfs.begin(); 232 for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
172 QStringList::ConstIterator optsIt=curopts.begin(); 233 i.current()->update();
173 for (; it!=curdisks.end(); ++it, ++fsit, ++optsIt) {
174 QString opts = *optsIt;
175
176 QString disk = *it;
177 QString humanname;
178 bool removable = FALSE;
179 if ( isCF(disk) ) {
180 humanname = tr("CF Card");
181 removable = TRUE;
182 } else if ( disk == "/dev/hda1" ) {
183 humanname = tr("Hard Disk");
184 } else if ( disk.left(9) == "/dev/mmcd" ) {
185 humanname = tr("SD Card");
186 removable = TRUE;
187 } else if ( disk.left( 14 ) == "/dev/mmc/part1" ) {
188 humanname = tr("MMC Card");
189 removable = TRUE;
190 } else if ( disk.left(7) == "/dev/hd" )
191 humanname = tr("Hard Disk") + " " + disk;
192 else if ( disk.left(7) == "/dev/sd" )
193 humanname = tr("SCSI Hard Disk") + " " + disk;
194 else if ( disk.left(14) == "/dev/mtdblock6" ) //openzaurus ramfs
195 humanname = tr("Internal Memory");
196 else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" )
197 humanname = tr("Internal Storage");
198 else if ( disk.left(14) == "/dev/mtdblock/" )
199 humanname = tr("Internal Storage") + " " + disk;
200 else if ( disk.left(13) == "/dev/mtdblock" )
201 humanname = tr("Internal Storage") + " " + disk;
202 else if ( disk.left(9) == "/dev/root" )
203 humanname = tr("Internal Storage") + " " + disk;
204 else if ( disk.left(5) == "tmpfs" ) //ipaqs /mnt/ramfs
205 humanname = tr("Internal Memory");
206 FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts );
207 mFileSystems.append( fs );
208 }
209 emit disksChanged();
210 } else {
211 // just update them
212 for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
213 i.current()->update();
214 } 234 }
@@ -217,30 +237,36 @@ void StorageInfo::update()
217 237
218bool deviceTab( const char *device) { 238bool deviceTab( const char *device)
219 QString name = device; 239{
220 bool hasDevice=false; 240 QString name = device;
241 bool hasDevice=false;
221 242
222#ifdef Q_OS_MACX 243#ifdef Q_OS_MACX
223 // Darwin (MacOS X) 244 // Darwin (MacOS X)
224 struct statfs** mntbufp; 245 struct statfs** mntbufp;
225 int count = 0; 246 int count = 0;
226 if ( ( count = getmntinfo( mntbufp, MNT_WAIT ) ) == 0 ){ 247 if ( ( count = getmntinfo( mntbufp, MNT_WAIT ) ) == 0 )
227 qWarning("deviceTab: Error in getmntinfo(): %s",strerror( errno ) ); 248 {
228 hasDevice = false; 249 qWarning("deviceTab: Error in getmntinfo(): %s",strerror( errno ) );
229 } 250 hasDevice = false;
230 for( int i = 0; i < count; i++ ){ 251 }
231 QString deviceName = mntbufp[i]->f_mntfromname; 252 for( int i = 0; i < count; i++ )
232 qDebug(deviceName); 253 {
233 if( deviceName.left( name.length() ) == name ) 254 QString deviceName = mntbufp[i]->f_mntfromname;
234 hasDevice = true; 255 qDebug(deviceName);
235 } 256 if( deviceName.left( name.length() ) == name )
257 hasDevice = true;
258 }
236#else 259#else
237 // Linux 260 // Linux
238 struct mntent *me; 261 struct mntent *me;
239 FILE *mntfp = setmntent( "/etc/mtab", "r" ); 262 FILE *mntfp = setmntent( "/etc/mtab", "r" );
240 if ( mntfp ) { 263 if ( mntfp )
241 while ( (me = getmntent( mntfp )) != 0 ) { 264 {
242 QString deviceName = me->mnt_fsname; 265 while ( (me = getmntent( mntfp )) != 0 )
243// qDebug(deviceName); 266 {
244 if( deviceName.left(name.length()) == name) { 267 QString deviceName = me->mnt_fsname;
245 hasDevice = true; 268 // qDebug(deviceName);
269 if( deviceName.left(name.length()) == name)
270 {
271 hasDevice = true;
246 } 272 }
@@ -277,3 +303,3 @@ bool StorageInfo::hasSd()
277 * @fn static bool StorageInfo::hasMmc() 303 * @fn static bool StorageInfo::hasMmc()
278 * @brief reutrns whether device has mmc mounted 304 * @brief returns whether device has mmc mounted
279 * 305 *
@@ -282,8 +308,68 @@ bool StorageInfo::hasMmc()
282{ 308{
283 bool hasMmc=false; 309 bool hasMmc=false;
284 if( deviceTab("/dev/mmc/part")) 310 if( deviceTab("/dev/mmc/part"))
285 hasMmc=true; 311 hasMmc=true;
286 if( deviceTab("/dev/mmcd")) 312 if( deviceTab("/dev/mmcd"))
287 hasMmc=true; 313 hasMmc=true;
288 return hasMmc; 314 return hasMmc;
315}
316
317/*!
318* @fn QString StorageInfo::getCfPath()
319* @brief returns the Mount-Path of Cf Card
320*
321*/
322QString StorageInfo::getCfPath()
323{
324 QString r = "";
325
326 for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
327 {
328 if ( (*i)->disk().left( 8 ) == "/dev/hda" )
329 {
330 r = (*i)->path();
331 break;
332 }
333 }
334 return r;
335}
336
337/*!
338* @fn QString StorageInfo::getSdPath()
339* @brief returns the Mount-Path of Sd Card
340*
341*/
342QString StorageInfo::getSdPath()
343{
344 QString r = "";
345
346 for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
347 {
348 if ( (*i)->disk().left( 9 ) == "/dev/mmcd" )
349 {
350 r = (*i)->path();
351 break;
352 }
353 }
354 return r;
355}
356
357/*!
358* @fn QString StorageInfo::getMmcPath()
359* @brief returns the Mount-Path of Mmc Card
360*
361*/
362QString StorageInfo::getMmcPath()
363{
364 QString r = "";
365
366 for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
367 {
368 if ( (*i)->disk().left( 14 ) == "/dev/mmc/part1" )
369 {
370 r = (*i)->path();
371 break;
372 }
373 }
374 return r;
289} 375}
@@ -303,3 +389,3 @@ bool StorageInfo::hasMmc()
303FileSystem::FileSystem( const QString &disk, const QString &path, const QString &name, bool rem, const QString &o ) 389FileSystem::FileSystem( const QString &disk, const QString &path, const QString &name, bool rem, const QString &o )
304 : fsdisk( disk ), fspath( path ), humanname( name ), blkSize(512), totalBlks(0), availBlks(0), removable( rem ), opts( o ) 390 : fsdisk( disk ), fspath( path ), humanname( name ), blkSize(512), totalBlks(0), availBlks(0), removable( rem ), opts( o )
305{ 391{
@@ -312,10 +398,13 @@ void FileSystem::update()
312 struct statfs fs; 398 struct statfs fs;
313 if ( !statfs( fspath.latin1(), &fs ) ) { 399 if ( !statfs( fspath.latin1(), &fs ) )
314 blkSize = fs.f_bsize; 400 {
315 totalBlks = fs.f_blocks; 401 blkSize = fs.f_bsize;
316 availBlks = fs.f_bavail; 402 totalBlks = fs.f_blocks;
317 } else { 403 availBlks = fs.f_bavail;
318 blkSize = 0; 404 }
319 totalBlks = 0; 405 else
320 availBlks = 0; 406 {
407 blkSize = 0;
408 totalBlks = 0;
409 availBlks = 0;
321 } 410 }
@@ -326,3 +415,3 @@ void FileSystem::update()
326 \brief The FileSystem class describes a single mount point. 415 \brief The FileSystem class describes a single mount point.
327 416
328 This class simply returns information about a mount point, including 417 This class simply returns information about a mount point, including
@@ -331,3 +420,3 @@ void FileSystem::update()
331 \ingroup qtopiaemb 420 \ingroup qtopiaemb
332 421
333 \sa StorageInfo 422 \sa StorageInfo
diff --git a/library/storage.h b/library/storage.h
index 0a0698f..35a1109 100644
--- a/library/storage.h
+++ b/library/storage.h
@@ -34,7 +34,11 @@ public:
34 34
35 const QList<FileSystem> &fileSystems() const { return mFileSystems; } 35 const QList<FileSystem> &fileSystems() const { return mFileSystems; }
36 const FileSystem *fileSystemOf( const QString &filename ); 36 const FileSystem *fileSystemOf( const QString &filename );
37 static bool hasCf(); 37 static bool hasCf();
38 static bool hasSd(); 38 static bool hasSd();
39 static bool hasMmc(); 39 static bool hasMmc();
40
41 QString getCfPath();
42 QString getSdPath();
43 QString getMmcPath();
40signals: 44signals: