fix

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
@@ -425,107 +425,108 @@ void FormatterApp::parsetab(const QString &fileName) {
                 deviceList << deviceName;
                 qDebug(deviceName+"::"+filesystemType);
                 fileSystemTypeList << deviceName+"::"+filesystemType;
             }
         }
     }
     endmntent( mntfp );
 //  } else if(fileName == "/etc/fstab") {
 //    QFile f("/etc/fstab");
 //   if ( f.open(IO_ReadOnly) ) {
 //     QTextStream t (&f);
 //     QString s;
 //     while (! t.eof()) {
 //         s=t.readLine();
 //         s=s.simplifyWhiteSpace();
 //         if ( (!s.isEmpty() ) && (s.find(" ")!=0) ) {
 // // = me->mnt_fsname;
 //             QString filesystemType = me->mnt_type;
 //             QString deviceName = s.left(0,s.find(BLANK) ); 
 //             s=s.remove(0,s.find(BLANK)+1 ); // devicename
           
 //             s=s.remove(0,s.find(BLANK)+1 ); // mountpoint
 //             QStringt mountPoint= s.left(0,s.find(BLANK) ); 
 //             s=s.remove(0,s.find(BLANK)+1 ); // fs
 //             QString filesystemType= s.left(0,s.find(BLANK) );           
 //         }
 //     }
 //  }
 //  f.close();
 // }
 }
 
 QString FormatterApp::getFileSystemType(const QString &currentText) {
 
     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") );
               pclose(fp);             
               return false;
           } else {
 //               outDlg->OutputEdit->append( currentText + tr("\nhas been successfully umounted."));
 //             outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
               while ( fgets( line, sizeof line, fp)) {
                   if( ((QString)line).find("busy",0,TRUE) != -1) {
                       qDebug("Could not find '" + umountS); 
                       QMessageBox::warning( this, tr("Formatter"), tr("Could not umount.\nDevice is busy!"), tr("&OK") );
                       pclose(fp);             
               return false;
                   } else {
                       QString lineStr = line;
                       lineStr=lineStr.left(lineStr.length()-1);
                       outDlg->OutputEdit->append(lineStr);
                       outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
                   }
               }
           }
           pclose(fp);             
 /////////////////////////////////////
           fp = popen(  (const char *) cmd, "r"); 
           while ( fgets( line, sizeof line, fp)) {
               if( ((QString)line).find("No such device",0,TRUE) != -1) {