summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-10-22 02:09:43 (UTC)
committer llornkcor <llornkcor>2002-10-22 02:09:43 (UTC)
commita19864da233f2d434d96c85b4f4b1978bab5d30d (patch) (unidiff)
tree66180af100ae77f7d83bb9aef822fad07a1708b8
parent69c1f36dd6f7be1cf043349752e548b519049b23 (diff)
downloadopie-a19864da233f2d434d96c85b4f4b1978bab5d30d.zip
opie-a19864da233f2d434d96c85b4f4b1978bab5d30d.tar.gz
opie-a19864da233f2d434d96c85b4f4b1978bab5d30d.tar.bz2
gak
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/formatter/formatter.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index ed0ced1..46dc01c 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -454,48 +454,51 @@ void FormatterApp::parsetab(const QString &fileName) {
454// f.close(); 454// f.close();
455// } 455// }
456} 456}
457 457
458QString FormatterApp::getFileSystemType(const QString &currentText) { 458QString FormatterApp::getFileSystemType(const QString &currentText) {
459 459
460 parsetab("/etc/mtab"); //why did TT forget filesystem type? 460 parsetab("/etc/mtab"); //why did TT forget filesystem type?
461 461
462 for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) { 462 for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) {
463 QString temp = (*it); 463 QString temp = (*it);
464 if( temp.find( currentText,0,TRUE) != -1) { 464 if( temp.find( currentText,0,TRUE) != -1) {
465 return temp.right( temp.length() - temp.find("::",0,TRUE) - 2); 465 return temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
466// qDebug(fsType); 466// qDebug(fsType);
467 } 467 }
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
479 QString umountS = "umount -v "+selectedDevice+" 2>&1";
480 QString remountS = "mount -v "+selectedDevice+" 2>&1";
478#else 481#else
479 // for testing 482 // for testing
480// currentText = diskDevice = "/dev/fd0"; 483// currentText = diskDevice = "/dev/fd0";
481 QString umountS = "umount -v /floppy 2>&1"; 484 QString umountS = "umount -v /floppy 2>&1";
482 QString remountS = "mount -v /floppy 2>&1"; 485 QString remountS = "mount -v /floppy 2>&1";
483 selectedDevice ="/dev/fd0"; 486 selectedDevice ="/dev/fd0";
484 487
485#endif 488#endif
486 489
487 QString fsType = getFileSystemType((const QString &)selectedDevice); 490 QString fsType = getFileSystemType((const QString &)selectedDevice);
488 QString cmd; 491 QString cmd;
489 qDebug( selectedDevice +" "+ fsType); 492 qDebug( selectedDevice +" "+ fsType);
490 if(fsType == "vfat") cmd = "dosfsck -vy "; 493 if(fsType == "vfat") cmd = "dosfsck -vy ";
491 if(fsType == "ext2") cmd = "e2fsck -cpvy "; 494 if(fsType == "ext2") cmd = "e2fsck -cpvy ";
492 cmd += selectedDevice + " 2>&1"; 495 cmd += selectedDevice + " 2>&1";
493 496
494 outDlg = new Output(this, tr("Formatter Output"),FALSE); 497 outDlg = new Output(this, tr("Formatter Output"),FALSE);
495 outDlg->showMaximized(); 498 outDlg->showMaximized();
496 outDlg->show(); 499 outDlg->show();
497 qApp->processEvents(); 500 qApp->processEvents();
498 FILE *fp; 501 FILE *fp;
499 char line[130]; 502 char line[130];
500 outDlg->OutputEdit->append( tr("Trying to umount.")); 503 outDlg->OutputEdit->append( tr("Trying to umount."));
501 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); 504 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);