summaryrefslogtreecommitdiff
path: root/library
authorllornkcor <llornkcor>2002-06-29 13:16:59 (UTC)
committer llornkcor <llornkcor>2002-06-29 13:16:59 (UTC)
commit83c99614bf6d64601c6845f8dc9458d6c7aa410c (patch) (unidiff)
tree4d6b83f67deebb08b740a72dd3b35c55996017f5 /library
parent2d3e1d2a51edeebfb6acea960cc4d505b4c72731 (diff)
downloadopie-83c99614bf6d64601c6845f8dc9458d6c7aa410c.zip
opie-83c99614bf6d64601c6845f8dc9458d6c7aa410c.tar.gz
opie-83c99614bf6d64601c6845f8dc9458d6c7aa410c.tar.bz2
fixed ramfs entry for ipaq
Diffstat (limited to 'library') (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
@@ -22,62 +22,62 @@
22#include <qpe/storage.h> 22#include <qpe/storage.h>
23#ifdef QT_QWS_CUSTOM 23#ifdef QT_QWS_CUSTOM
24#include <qpe/custom.h> 24#include <qpe/custom.h>
25#endif 25#endif
26 26
27#include <qfile.h> 27#include <qfile.h>
28#include <qtimer.h> 28#include <qtimer.h>
29#include <qcopchannel_qws.h> 29#include <qcopchannel_qws.h>
30 30
31#include <stdio.h> 31#include <stdio.h>
32 32
33#if defined(_OS_LINUX_) || defined(Q_OS_LINUX) 33#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
34#include <sys/vfs.h> 34#include <sys/vfs.h>
35#include <mntent.h> 35#include <mntent.h>
36#endif 36#endif
37 37
38#include <qstringlist.h> 38#include <qstringlist.h>
39 39
40static bool isCF(const QString& m) 40static bool isCF(const QString& m)
41{ 41{
42 FILE* f = fopen("/var/run/stab", "r"); 42 FILE* f = fopen("/var/run/stab", "r");
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}
63 63
64StorageInfo::StorageInfo( QObject *parent ) 64StorageInfo::StorageInfo( QObject *parent )
65 : QObject( parent ) 65 : QObject( parent )
66{ 66{
67 mFileSystems.setAutoDelete( TRUE ); 67 mFileSystems.setAutoDelete( TRUE );
68 channel = new QCopChannel( "QPE/Card", this ); 68 channel = new QCopChannel( "QPE/Card", this );
69 connect( channel, SIGNAL(received(const QCString &, const QByteArray &)), 69 connect( channel, SIGNAL(received(const QCString &, const QByteArray &)),
70 this, SLOT(cardMessage( const QCString &, const QByteArray &)) ); 70 this, SLOT(cardMessage( const QCString &, const QByteArray &)) );
71 update(); 71 update();
72} 72}
73 73
74const FileSystem *StorageInfo::fileSystemOf( const QString &filename ) 74const FileSystem *StorageInfo::fileSystemOf( const QString &filename )
75{ 75{
76 for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) { 76 for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) {
77 if ( filename.startsWith( (*i)->path() ) ) 77 if ( filename.startsWith( (*i)->path() ) )
78 return (*i); 78 return (*i);
79 } 79 }
80 return 0; 80 return 0;
81} 81}
82 82
83 83
@@ -133,50 +133,50 @@ void StorageInfo::update()
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 == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" ) 151 else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" )
152 humanname = tr("Internal Storage"); 152 humanname = tr("Internal Storage");
153 else if ( disk.left(14) == "/dev/mtdblock/" ) 153 else if ( disk.left(14) == "/dev/mtdblock/" )
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 }
162 emit disksChanged(); 162 emit disksChanged();
163 } else { 163 } else {
164 // just update them 164 // just update them
165 for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) 165 for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
166 i.current()->update(); 166 i.current()->update();
167 } 167 }
168#endif 168#endif
169} 169}
170 170
171//--------------------------------------------------------------------------- 171//---------------------------------------------------------------------------
172 172
173FileSystem::FileSystem( const QString &disk, const QString &path, const QString &name, bool rem, const QString &o ) 173FileSystem::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 ) 174 : fsdisk( disk ), fspath( path ), humanname( name ), blkSize(512), totalBlks(0), availBlks(0), removable( rem ), opts( o )
175{ 175{
176 update(); 176 update();
177} 177}
178 178
179void FileSystem::update() 179void FileSystem::update()
180{ 180{
181#if defined(_OS_LINUX_) || defined(Q_OS_LINUX) 181#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
182 struct statfs fs; 182 struct statfs fs;