summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-07-20 19:45:16 (UTC)
committer llornkcor <llornkcor>2002-07-20 19:45:16 (UTC)
commitf095be190be0bcacd7911c585d034fd031e16099 (patch) (side-by-side diff)
treeb54bdc4dbf17e9b1b7799db3121fc71dd2d45dcd
parent62e980bfddd33cbd66cccd4c013780ec6e964523 (diff)
downloadopie-f095be190be0bcacd7911c585d034fd031e16099.zip
opie-f095be190be0bcacd7911c585d034fd031e16099.tar.gz
opie-f095be190be0bcacd7911c585d034fd031e16099.tar.bz2
fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/formatter/formatter.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index d52a4be..bd0bb01 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -465,27 +465,28 @@ QString FormatterApp::getFileSystemType(const QString &currentText) {
// qDebug(fsType);
}
}
return "";
}
bool FormatterApp::doFsck() {
- Output *outDlg;
- QString selectedDevice;
-//f defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) // lets test on something cheap
+ Output *outDlg;
+ QString selectedDevice;
+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
selectedDevice = deviceComboBox->currentText();
-//#else
+#else
+ // for testing
// currentText = diskDevice = "/dev/fd0";
- QString umountS = "umount -v /floppy 2>&1";
- QString remountS = "mount -v /floppy 2>&1";
- selectedDevice ="/dev/fd0";
+ QString umountS = "umount -v /floppy 2>&1";
+ QString remountS = "mount -v /floppy 2>&1";
+ selectedDevice ="/dev/fd0";
-//#endif
+#endif
QString fsType = getFileSystemType((const QString &)selectedDevice);
QString cmd;
qDebug( selectedDevice +" "+ fsType);
if(fsType == "vfat") cmd = "dosfsck -vy ";
if(fsType == "ext2") cmd = "e2fsck -cpvy ";
cmd += selectedDevice + " 2>&1";