author | llornkcor <llornkcor> | 2002-06-29 13:24:57 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-06-29 13:24:57 (UTC) |
commit | ab5e280b6fd7349c8aa81ba0b235601a7559d3de (patch) (unidiff) | |
tree | d23469349c54334d302fc27005a356dd6bccc6a8 | |
parent | 881940465ce6bf9572a46e1aab850ec8e510c54b (diff) | |
download | opie-ab5e280b6fd7349c8aa81ba0b235601a7559d3de.zip opie-ab5e280b6fd7349c8aa81ba0b235601a7559d3de.tar.gz opie-ab5e280b6fd7349c8aa81ba0b235601a7559d3de.tar.bz2 |
whoops
-rw-r--r-- | library/storage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/storage.cpp b/library/storage.cpp index d6a91cf..096170f 100644 --- a/library/storage.cpp +++ b/library/storage.cpp | |||
@@ -87,110 +87,110 @@ void StorageInfo::cardMessage( const QCString& msg, const QByteArray& ) | |||
87 | update(); | 87 | update(); |
88 | } | 88 | } |
89 | // cause of the lack of a d pointer we need | 89 | // cause of the lack of a d pointer we need |
90 | // to store informations in a config file :( | 90 | // to store informations in a config file :( |
91 | void StorageInfo::update() | 91 | void StorageInfo::update() |
92 | { | 92 | { |
93 | //qDebug("StorageInfo::updating"); | 93 | //qDebug("StorageInfo::updating"); |
94 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) | 94 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) |
95 | struct mntent *me; | 95 | struct mntent *me; |
96 | FILE *mntfp = setmntent( "/etc/mtab", "r" ); | 96 | FILE *mntfp = setmntent( "/etc/mtab", "r" ); |
97 | 97 | ||
98 | QStringList curdisks; | 98 | QStringList curdisks; |
99 | QStringList curopts; | 99 | QStringList curopts; |
100 | QStringList curfs; | 100 | QStringList curfs; |
101 | bool rebuild = FALSE; | 101 | bool rebuild = FALSE; |
102 | int n=0; | 102 | int n=0; |
103 | if ( mntfp ) { | 103 | if ( mntfp ) { |
104 | while ( (me = getmntent( mntfp )) != 0 ) { | 104 | while ( (me = getmntent( mntfp )) != 0 ) { |
105 | QString fs = me->mnt_fsname; | 105 | QString fs = me->mnt_fsname; |
106 | if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd" | 106 | if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd" |
107 | || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd" | 107 | || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd" |
108 | || fs.left(8)=="/dev/ram") | 108 | || fs.left(8)=="/dev/ram") |
109 | { | 109 | { |
110 | n++; | 110 | n++; |
111 | curdisks.append(fs); | 111 | curdisks.append(fs); |
112 | curopts.append( me->mnt_opts ); | 112 | curopts.append( me->mnt_opts ); |
113 | //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts ); | 113 | //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts ); |
114 | curfs.append( me->mnt_dir ); | 114 | curfs.append( me->mnt_dir ); |
115 | bool found = FALSE; | 115 | bool found = FALSE; |
116 | for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) { | 116 | for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) { |
117 | if ( (*i)->disk() == fs ) { | 117 | if ( (*i)->disk() == fs ) { |
118 | found = TRUE; | 118 | found = TRUE; |
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 | 151 | else if ( disk.left(14) == "/dev/mtdblock6" ) //openzaurus ramfs |
152 | humanname = tr("Ram FS") + " " + humanname.mid(15); | 152 | humanname = tr("Ram FS") + " " + humanname.mid(14); |
153 | else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" ) | 153 | else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" ) |
154 | humanname = tr("Internal Storage"); | 154 | humanname = tr("Internal Storage"); |
155 | else if ( disk.left(14) == "/dev/mtdblock/" ) | 155 | else if ( disk.left(14) == "/dev/mtdblock/" ) |
156 | humanname = tr("Internal Storage") + " " + humanname.mid(14); | 156 | humanname = tr("Internal Storage") + " " + humanname.mid(14); |
157 | else if ( disk.left(13) == "/dev/mtdblock" ) | 157 | else if ( disk.left(13) == "/dev/mtdblock" ) |
158 | humanname = tr("Internal Storage") + " " + humanname.mid(13); | 158 | humanname = tr("Internal Storage") + " " + humanname.mid(13); |
159 | else if ( disk.left(5) == "tmpfs" ) //ipaqs /mnt/ramfs | 159 | else if ( disk.left(5) == "tmpfs" ) //ipaqs /mnt/ramfs |
160 | humanname = tr("Ram FS") + " " + humanname.mid(5); | 160 | humanname = tr("Ram FS") + " " + humanname.mid(5); |
161 | FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts ); | 161 | FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts ); |
162 | mFileSystems.append( fs ); | 162 | mFileSystems.append( fs ); |
163 | } | 163 | } |
164 | emit disksChanged(); | 164 | emit disksChanged(); |
165 | } else { | 165 | } else { |
166 | // just update them | 166 | // just update them |
167 | for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) | 167 | for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) |
168 | i.current()->update(); | 168 | i.current()->update(); |
169 | } | 169 | } |
170 | #endif | 170 | #endif |
171 | } | 171 | } |
172 | 172 | ||
173 | //--------------------------------------------------------------------------- | 173 | //--------------------------------------------------------------------------- |
174 | 174 | ||
175 | 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 ) |
176 | : 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 ) |
177 | { | 177 | { |
178 | update(); | 178 | update(); |
179 | } | 179 | } |
180 | 180 | ||
181 | void FileSystem::update() | 181 | void FileSystem::update() |
182 | { | 182 | { |
183 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) | 183 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) |
184 | struct statfs fs; | 184 | struct statfs fs; |
185 | if ( !statfs( fspath.latin1(), &fs ) ) { | 185 | if ( !statfs( fspath.latin1(), &fs ) ) { |
186 | blkSize = fs.f_bsize; | 186 | blkSize = fs.f_bsize; |
187 | totalBlks = fs.f_blocks; | 187 | totalBlks = fs.f_blocks; |
188 | availBlks = fs.f_bavail; | 188 | availBlks = fs.f_bavail; |
189 | } else { | 189 | } else { |
190 | blkSize = 0; | 190 | blkSize = 0; |
191 | totalBlks = 0; | 191 | totalBlks = 0; |
192 | availBlks = 0; | 192 | availBlks = 0; |
193 | } | 193 | } |
194 | #endif | 194 | #endif |
195 | } | 195 | } |
196 | 196 | ||