summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/tools/formatter/formatter.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index 9192099..f275fbe 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -464,37 +464,37 @@ QString FormatterApp::getFileSystemType(const QString &currentText) {
if( temp.find( currentText,0,TRUE) != -1) {
return temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
// qDebug(fsType);
}
}
return "";
}
bool FormatterApp::doFsck() {
Output *outDlg;
QString selectedDevice;
-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
+// #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
selectedDevice = deviceComboBox->currentText();
QString mountPoint = mountPointLineEdit->text();
QString umountS = "umount -v "+mountPoint+" 2>&1";
QString remountS = "mount -v "+mountPoint+" 2>&1";
-#else
- // for testing
-// currentText = diskDevice = "/dev/fd0";
- QString umountS = "umount -v /floppy 2>&1";
- QString remountS = "mount -v /floppy 2>&1";
- selectedDevice ="/dev/fd0";
+// #else
+// // for testing
+// // currentText = diskDevice = "/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";
outDlg = new Output(this, tr("Formatter Output"),FALSE);
outDlg->showMaximized();
outDlg->show();
qApp->processEvents();
@@ -509,25 +509,26 @@ bool FormatterApp::doFsck() {
// qDebug("%d", fp);
if ( !fp ) {
qDebug("Could not execute '" + umountS + "'!\n" +(QString)strerror(errno));
QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") );
pclose(fp);
return false;
} else {
// outDlg->OutputEdit->append( currentText + tr("\nhas been successfully umounted."));
// outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
while ( fgets( line, sizeof line, fp)) {
if( ((QString)line).find("busy",0,TRUE) != -1) {
qDebug("Could not find '" + umountS);
- QMessageBox::warning( this, tr("Formatter"), tr("Could not umount.\nDevice is busy!"), tr("&OK") );
+ QMessageBox::warning( this, tr("Formatter"),
+ tr("Could not umount.\nDevice is busy!"), tr("&OK") );
pclose(fp);
return false;
} else {
QString lineStr = line;
lineStr=lineStr.left(lineStr.length()-1);
outDlg->OutputEdit->append(lineStr);
outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
}
}
}
pclose(fp);
/////////////////////////////////////