author | llornkcor <llornkcor> | 2002-07-20 19:45:16 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-07-20 19:45:16 (UTC) |
commit | f095be190be0bcacd7911c585d034fd031e16099 (patch) (side-by-side diff) | |
tree | b54bdc4dbf17e9b1b7799db3121fc71dd2d45dcd /noncore | |
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 @@ -449,59 +449,60 @@ void FormatterApp::parsetab(const QString &fileName) { // QString filesystemType= s.left(0,s.find(BLANK) ); // } // } // } // f.close(); // } } QString FormatterApp::getFileSystemType(const QString ¤tText) { parsetab("/etc/mtab"); //why did TT forget filesystem type? for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) { QString temp = (*it); if( temp.find( currentText,0,TRUE) != -1) { return temp.right( temp.length() - temp.find("::",0,TRUE) - 2); // qDebug(fsType); } } return ""; } bool FormatterApp::doFsck() { - Output *outDlg; - QString selectedDevice; -//f defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) // lets test on something cheap + Output *outDlg; + QString selectedDevice; +#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) selectedDevice = deviceComboBox->currentText(); -//#else +#else + // for testing // currentText = diskDevice = "/dev/fd0"; - QString umountS = "umount -v /floppy 2>&1"; - QString remountS = "mount -v /floppy 2>&1"; - selectedDevice ="/dev/fd0"; + QString umountS = "umount -v /floppy 2>&1"; + QString remountS = "mount -v /floppy 2>&1"; + selectedDevice ="/dev/fd0"; -//#endif +#endif QString fsType = getFileSystemType((const QString &)selectedDevice); QString cmd; qDebug( selectedDevice +" "+ fsType); if(fsType == "vfat") cmd = "dosfsck -vy "; if(fsType == "ext2") cmd = "e2fsck -cpvy "; cmd += selectedDevice + " 2>&1"; outDlg = new Output(this, tr("Formatter Output"),FALSE); outDlg->showMaximized(); outDlg->show(); qApp->processEvents(); FILE *fp; char line[130]; outDlg->OutputEdit->append( tr("Trying to umount.")); outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); sleep(1); // qDebug("Command is "+umountS); fp = popen( (const char *) umountS, "r"); // qDebug("%d", fp); if ( !fp ) { qDebug("Could not execute '" + umountS + "'!\n" +(QString)strerror(errno)); QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") ); |