author | llornkcor <llornkcor> | 2002-07-20 19:45:16 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-07-20 19:45:16 (UTC) |
commit | f095be190be0bcacd7911c585d034fd031e16099 (patch) (unidiff) | |
tree | b54bdc4dbf17e9b1b7799db3121fc71dd2d45dcd /noncore/tools | |
parent | 62e980bfddd33cbd66cccd4c013780ec6e964523 (diff) | |
download | opie-f095be190be0bcacd7911c585d034fd031e16099.zip opie-f095be190be0bcacd7911c585d034fd031e16099.tar.gz opie-f095be190be0bcacd7911c585d034fd031e16099.tar.bz2 |
fix
-rw-r--r-- | noncore/tools/formatter/formatter.cpp | 17 |
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 | |||
@@ -461,35 +461,36 @@ QString FormatterApp::getFileSystemType(const QString ¤tText) { | |||
461 | for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) { | 461 | for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) { |
462 | QString temp = (*it); | 462 | QString temp = (*it); |
463 | if( temp.find( currentText,0,TRUE) != -1) { | 463 | if( temp.find( currentText,0,TRUE) != -1) { |
464 | return temp.right( temp.length() - temp.find("::",0,TRUE) - 2); | 464 | return temp.right( temp.length() - temp.find("::",0,TRUE) - 2); |
465 | // qDebug(fsType); | 465 | // qDebug(fsType); |
466 | } | 466 | } |
467 | } | 467 | } |
468 | return ""; | 468 | return ""; |
469 | } | 469 | } |
470 | 470 | ||
471 | bool FormatterApp::doFsck() { | 471 | bool FormatterApp::doFsck() { |
472 | 472 | ||
473 | Output *outDlg; | 473 | Output *outDlg; |
474 | QString selectedDevice; | 474 | QString selectedDevice; |
475 | //f defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) // lets test on something cheap | 475 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) |
476 | selectedDevice = deviceComboBox->currentText(); | 476 | selectedDevice = deviceComboBox->currentText(); |
477 | //#else | 477 | #else |
478 | // for testing | ||
478 | // currentText = diskDevice = "/dev/fd0"; | 479 | // currentText = diskDevice = "/dev/fd0"; |
479 | QString umountS = "umount -v /floppy 2>&1"; | 480 | QString umountS = "umount -v /floppy 2>&1"; |
480 | QString remountS = "mount -v /floppy 2>&1"; | 481 | QString remountS = "mount -v /floppy 2>&1"; |
481 | selectedDevice ="/dev/fd0"; | 482 | selectedDevice ="/dev/fd0"; |
482 | 483 | ||
483 | //#endif | 484 | #endif |
484 | 485 | ||
485 | QString fsType = getFileSystemType((const QString &)selectedDevice); | 486 | QString fsType = getFileSystemType((const QString &)selectedDevice); |
486 | QString cmd; | 487 | QString cmd; |
487 | qDebug( selectedDevice +" "+ fsType); | 488 | qDebug( selectedDevice +" "+ fsType); |
488 | if(fsType == "vfat") cmd = "dosfsck -vy "; | 489 | if(fsType == "vfat") cmd = "dosfsck -vy "; |
489 | if(fsType == "ext2") cmd = "e2fsck -cpvy "; | 490 | if(fsType == "ext2") cmd = "e2fsck -cpvy "; |
490 | cmd += selectedDevice + " 2>&1"; | 491 | cmd += selectedDevice + " 2>&1"; |
491 | 492 | ||
492 | outDlg = new Output(this, tr("Formatter Output"),FALSE); | 493 | outDlg = new Output(this, tr("Formatter Output"),FALSE); |
493 | outDlg->showMaximized(); | 494 | outDlg->showMaximized(); |
494 | outDlg->show(); | 495 | outDlg->show(); |
495 | qApp->processEvents(); | 496 | qApp->processEvents(); |