summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore 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
@@ -468,29 +468,29 @@ QString FormatterApp::getFileSystemType(const QString &currentText) {
468 } 468 }
469 return ""; 469 return "";
470} 470}
471 471
472bool FormatterApp::doFsck() { 472bool FormatterApp::doFsck() {
473 473
474 Output *outDlg; 474 Output *outDlg;
475 QString selectedDevice; 475 QString selectedDevice;
476#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 476// #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
477 selectedDevice = deviceComboBox->currentText(); 477 selectedDevice = deviceComboBox->currentText();
478 QString mountPoint = mountPointLineEdit->text(); 478 QString mountPoint = mountPointLineEdit->text();
479 QString umountS = "umount -v "+mountPoint+" 2>&1"; 479 QString umountS = "umount -v "+mountPoint+" 2>&1";
480 QString remountS = "mount -v "+mountPoint+" 2>&1"; 480 QString remountS = "mount -v "+mountPoint+" 2>&1";
481#else 481// #else
482 // for testing 482// // for testing
483// currentText = diskDevice = "/dev/fd0"; 483// // currentText = diskDevice = "/dev/fd0";
484 QString umountS = "umount -v /floppy 2>&1"; 484// QString umountS = "umount -v /floppy 2>&1";
485 QString remountS = "mount -v /floppy 2>&1"; 485// QString remountS = "mount -v /floppy 2>&1";
486 selectedDevice ="/dev/fd0"; 486// selectedDevice ="/dev/fd0";
487 487
488#endif 488// #endif
489 489
490 QString fsType = getFileSystemType((const QString &)selectedDevice); 490 QString fsType = getFileSystemType((const QString &)selectedDevice);
491 QString cmd; 491 QString cmd;
492 qDebug( selectedDevice +" "+ fsType); 492 qDebug( selectedDevice +" "+ fsType);
493 if(fsType == "vfat") cmd = "dosfsck -vy "; 493 if(fsType == "vfat") cmd = "dosfsck -vy ";
494 if(fsType == "ext2") cmd = "e2fsck -cpvy "; 494 if(fsType == "ext2") cmd = "e2fsck -cpvy ";
495 cmd += selectedDevice + " 2>&1"; 495 cmd += selectedDevice + " 2>&1";
496 496
@@ -513,17 +513,18 @@ bool FormatterApp::doFsck() {
513 pclose(fp); 513 pclose(fp);
514 return false; 514 return false;
515 } else { 515 } else {
516// outDlg->OutputEdit->append( currentText + tr("\nhas been successfully umounted.")); 516// outDlg->OutputEdit->append( currentText + tr("\nhas been successfully umounted."));
517// outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); 517// outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
518 while ( fgets( line, sizeof line, fp)) { 518 while ( fgets( line, sizeof line, fp)) {
519 if( ((QString)line).find("busy",0,TRUE) != -1) { 519 if( ((QString)line).find("busy",0,TRUE) != -1) {
520 qDebug("Could not find '" + umountS); 520 qDebug("Could not find '" + umountS);
521 QMessageBox::warning( this, tr("Formatter"), tr("Could not umount.\nDevice is busy!"), tr("&OK") ); 521 QMessageBox::warning( this, tr("Formatter"),
522 tr("Could not umount.\nDevice is busy!"), tr("&OK") );
522 pclose(fp); 523 pclose(fp);
523 return false; 524 return false;
524 } else { 525 } else {
525 QString lineStr = line; 526 QString lineStr = line;
526 lineStr=lineStr.left(lineStr.length()-1); 527 lineStr=lineStr.left(lineStr.length()-1);
527 outDlg->OutputEdit->append(lineStr); 528 outDlg->OutputEdit->append(lineStr);
528 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); 529 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
529 } 530 }