author | llornkcor <llornkcor> | 2002-10-22 02:20:37 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-22 02:20:37 (UTC) |
commit | 896bea1ee64705bfc8753d7b3d1d51fddf43efaf (patch) (unidiff) | |
tree | 847bd0285590aca60831fe9bbae17cd467e04c30 /noncore/tools/formatter/formatter.cpp | |
parent | 59c92dc2a1defbece541663c76a9da82a59cbaa9 (diff) | |
download | opie-896bea1ee64705bfc8753d7b3d1d51fddf43efaf.zip opie-896bea1ee64705bfc8753d7b3d1d51fddf43efaf.tar.gz opie-896bea1ee64705bfc8753d7b3d1d51fddf43efaf.tar.bz2 |
gak 2
Diffstat (limited to 'noncore/tools/formatter/formatter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/tools/formatter/formatter.cpp | 19 |
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 | |||
@@ -473,19 +473,19 @@ bool 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; |
@@ -518,7 +518,8 @@ bool FormatterApp::doFsck() { | |||
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 { |