summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-10-22 02:20:37 (UTC)
committer llornkcor <llornkcor>2002-10-22 02:20:37 (UTC)
commit896bea1ee64705bfc8753d7b3d1d51fddf43efaf (patch) (unidiff)
tree847bd0285590aca60831fe9bbae17cd467e04c30
parent59c92dc2a1defbece541663c76a9da82a59cbaa9 (diff)
downloadopie-896bea1ee64705bfc8753d7b3d1d51fddf43efaf.zip
opie-896bea1ee64705bfc8753d7b3d1d51fddf43efaf.tar.gz
opie-896bea1ee64705bfc8753d7b3d1d51fddf43efaf.tar.bz2
gak 2
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
@@ -444,110 +444,111 @@ void FormatterApp::parsetab(const QString &fileName) {
444// QString deviceName = s.left(0,s.find(BLANK) ); 444// QString deviceName = s.left(0,s.find(BLANK) );
445// s=s.remove(0,s.find(BLANK)+1 ); // devicename 445// s=s.remove(0,s.find(BLANK)+1 ); // devicename
446 446
447// s=s.remove(0,s.find(BLANK)+1 ); // mountpoint 447// s=s.remove(0,s.find(BLANK)+1 ); // mountpoint
448// QStringt mountPoint= s.left(0,s.find(BLANK) ); 448// QStringt mountPoint= s.left(0,s.find(BLANK) );
449// s=s.remove(0,s.find(BLANK)+1 ); // fs 449// s=s.remove(0,s.find(BLANK)+1 ); // fs
450// QString filesystemType= s.left(0,s.find(BLANK) ); 450// QString filesystemType= s.left(0,s.find(BLANK) );
451// } 451// }
452// } 452// }
453// } 453// }
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 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
497 outDlg = new Output(this, tr("Formatter Output"),FALSE); 497 outDlg = new Output(this, tr("Formatter Output"),FALSE);
498 outDlg->showMaximized(); 498 outDlg->showMaximized();
499 outDlg->show(); 499 outDlg->show();
500 qApp->processEvents(); 500 qApp->processEvents();
501 FILE *fp; 501 FILE *fp;
502 char line[130]; 502 char line[130];
503 outDlg->OutputEdit->append( tr("Trying to umount.")); 503 outDlg->OutputEdit->append( tr("Trying to umount."));
504 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); 504 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
505 505
506 sleep(1); 506 sleep(1);
507// qDebug("Command is "+umountS); 507// qDebug("Command is "+umountS);
508 fp = popen( (const char *) umountS, "r"); 508 fp = popen( (const char *) umountS, "r");
509// qDebug("%d", fp); 509// qDebug("%d", fp);
510 if ( !fp ) { 510 if ( !fp ) {
511 qDebug("Could not execute '" + umountS + "'!\n" +(QString)strerror(errno)); 511 qDebug("Could not execute '" + umountS + "'!\n" +(QString)strerror(errno));
512 QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") ); 512 QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") );
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 }
530 } 531 }
531 } 532 }
532 pclose(fp); 533 pclose(fp);
533///////////////////////////////////// 534/////////////////////////////////////
534 fp = popen( (const char *) cmd, "r"); 535 fp = popen( (const char *) cmd, "r");
535 while ( fgets( line, sizeof line, fp)) { 536 while ( fgets( line, sizeof line, fp)) {
536 if( ((QString)line).find("No such device",0,TRUE) != -1) { 537 if( ((QString)line).find("No such device",0,TRUE) != -1) {
537 qDebug("No such device '" + umountS); 538 qDebug("No such device '" + umountS);
538 QMessageBox::warning( this, tr("Formatter"), tr("No such device!"), tr("&OK") ); 539 QMessageBox::warning( this, tr("Formatter"), tr("No such device!"), tr("&OK") );
539 pclose(fp); 540 pclose(fp);
540// outDlg->OutputEdit->append("No such device"); 541// outDlg->OutputEdit->append("No such device");
541// outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); 542// outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
542 return false; 543 return false;
543 } else { 544 } else {
544 QString lineStr = line; 545 QString lineStr = line;
545 lineStr=lineStr.left(lineStr.length()-1); 546 lineStr=lineStr.left(lineStr.length()-1);
546 outDlg->OutputEdit->append(lineStr); 547 outDlg->OutputEdit->append(lineStr);
547 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); 548 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
548 } 549 }
549 } 550 }
550 outDlg->OutputEdit->append(tr("You can now close the output window.")); 551 outDlg->OutputEdit->append(tr("You can now close the output window."));
551 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); 552 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
552// outDlg->OutputEdit->append( currentText + tr("\nhas been successfully formatted.")); 553// outDlg->OutputEdit->append( currentText + tr("\nhas been successfully formatted."));
553// outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); 554// outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);