summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-03-26 02:06:21 (UTC)
committer llornkcor <llornkcor>2003-03-26 02:06:21 (UTC)
commita76176911328349414203edda3785ac8925c0648 (patch) (side-by-side diff)
tree30e345d6c458b3dc2f0fd06fe900d4b7203e902f
parentf50d60ad220bbaf76e6cbcb07caf5bed037311d5 (diff)
downloadopie-a76176911328349414203edda3785ac8925c0648.zip
opie-a76176911328349414203edda3785ac8925c0648.tar.gz
opie-a76176911328349414203edda3785ac8925c0648.tar.bz2
add static isCf, isSd, and isMmc
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/storage.cpp61
-rw-r--r--library/storage.h8
2 files changed, 65 insertions, 4 deletions
diff --git a/library/storage.cpp b/library/storage.cpp
index a7c466d..912b22d 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -1,8 +1,9 @@
/**********************************************************************
** Copyright (C) Holger 'zecke' Freyther <freyther@kde.org>
+** Copyright (C) Lorn Potter <llornkcor@handhelds.org>
** Copyright (C) 2000 Trolltech AS. All rights reserved.
**
-** This file is part of Qtopia Environment.
+** This file is part of Opie Environment.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
@@ -37,6 +38,10 @@
#include <qstringlist.h>
+#include <sys/vfs.h>
+#include <mntent.h>
+
+
static bool isCF(const QString& m)
{
FILE* f = fopen("/var/run/stab", "r");
@@ -174,6 +179,60 @@ void StorageInfo::update()
#endif
}
+bool deviceTab( const char *device) {
+ QString name = device;
+ bool hasDevice=false;
+ struct mntent *me;
+ FILE *mntfp = setmntent( "/etc/mtab", "r" );
+ if ( mntfp ) {
+ while ( (me = getmntent( mntfp )) != 0 ) {
+ QString deviceName = me->mnt_fsname;
+// qDebug(deviceName);
+ if( deviceName.left(name.length()) == name) {
+ hasDevice = true;
+ }
+ }
+ }
+ endmntent( mntfp );
+ return hasDevice;
+}
+
+/*!
+ * @fn hasCf()
+ * @brief returns whether device has Cf mounted
+ *
+ */
+bool StorageInfo::hasCf()
+{
+ return deviceTab("/dev/hd");
+}
+
+/*!
+ * @fn hasSd()
+ * @brief returns whether device has SD mounted
+ *
+ */
+bool StorageInfo::hasSd()
+{
+ return deviceTab("/dev/mmcd");
+}
+
+/*!
+ * @fn hasMmc()
+ * @brief reutrns whether device has mmc mounted
+ *
+ */
+bool StorageInfo::hasMmc()
+{
+ bool hasMmc=false;
+ if( deviceTab("/dev/mmc/part"))
+ hasMmc=true;
+ if( deviceTab("/dev/mmcd"))
+ hasMmc=true;
+ return hasMmc;
+}
+
+
//---------------------------------------------------------------------------
FileSystem::FileSystem( const QString &disk, const QString &path, const QString &name, bool rem, const QString &o )
diff --git a/library/storage.h b/library/storage.h
index 66a9f9d..0a0698f 100644
--- a/library/storage.h
+++ b/library/storage.h
@@ -32,9 +32,11 @@ class StorageInfo : public QObject
public:
StorageInfo( QObject *parent=0 );
- const QList<FileSystem> &fileSystems() const { return mFileSystems; }
- const FileSystem *fileSystemOf( const QString &filename );
-
+ const QList<FileSystem> &fileSystems() const { return mFileSystems; }
+ const FileSystem *fileSystemOf( const QString &filename );
+ static bool hasCf();
+ static bool hasSd();
+ static bool hasMmc();
signals:
void disksChanged();