1 files changed, 116 insertions, 99 deletions

diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index f89ad30..0a9f921 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -7,17 +7,17 @@
     *   This program is free software; you can redistribute it and/or modify  *
     *   it under the terms of the GNU General Public License as published by  *
     *   the Free Software Foundation; either version 2 of the License, or     *
     *   (at your option) any later version.                                   *
     ***************************************************************************/
 #include "advancedfm.h"
-#include "inputDialog.h"
 #include "output.h"
 #include "filePermissions.h"
 
 #include <opie/otabwidget.h>
+#include <opie/oprocess.h>
 
 #include <qpe/lnkproperties.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
@@ -230,13 +230,13 @@ void AdvancedFm::localDelete() {
         switch ( QMessageBox::warning(this,tr("Delete Directory?"),tr("Really delete\n")+f+
                                       "\nand all it's contents ?"
                                       ,tr("Yes"),tr("No"),0,0,1) ) {
         case 0: {
           f=f.left(f.length()-1);
           QString cmd="rm -rf "+f;
-          system( cmd.latin1());
+          startProcess( (const QString)cmd.latin1() );
           populateLocalView();
         }
           break;
         case 1:
           // exit
           break;
@@ -252,13 +252,12 @@ void AdvancedFm::localDelete() {
         };
           }
         QString cmd="rm "+f;
         QFile file(f);
         if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1)
             file.remove();
-          //                   system( cmd.latin1());
       }
     }
   }
   populateLocalView();
 }
 
@@ -295,13 +294,13 @@ void AdvancedFm::remoteDelete() {
                 switch ( QMessageBox::warning(this,tr("Delete Directory"),tr("Really delete\n")+f+
                                               "\nand all it's contents ?",
                                               tr("Yes"),tr("No"),0,0,1) ) {
                   case 0: {
                       f=f.left(f.length()-1);
                       QString cmd="rm -rf "+f;
-                      system( cmd.latin1());
+                      startProcess( (const QString)cmd );
                       populateRemoteView();
                   }
                       break;
                   case 1:
                         // exit
                       break;
@@ -317,13 +316,12 @@ void AdvancedFm::remoteDelete() {
                     };
                 }
                 QString cmd="rm "+f;
                 QFile file(f);
                 if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1)
                     file.remove();
-                  //                   system( cmd.latin1());
             }
         }
     }
     populateRemoteView();
 }
 
@@ -807,55 +805,41 @@ bool AdvancedFm::copyFile( const QString & dest, const QString & src ) {
   }
 
   return success;
 }
 
 void AdvancedFm::runCommand() {
-  QString curFile;
-  if (TabWidget->getCurrentTab() == 0) {
-    if( Local_View->currentItem())
-      curFile = currentDir.canonicalPath() +"/"+ Local_View->currentItem()->text(0);
-  } else {
-    if(Remote_View->currentItem())
-      curFile = currentRemoteDir.canonicalPath() + "/"+Remote_View->currentItem()->text(0);
-  }
-
-  InputDialog *fileDlg;
-  fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
-  fileDlg->setInputText(curFile);
-  fileDlg->exec();
-  QString command;
-  if( fileDlg->result() == 1 ) {
-    command = fileDlg->LineEdit1->text();
-
-    Output *outDlg;
-    outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
-    outDlg->showMaximized();
-    outDlg->show();
-    qApp->processEvents();
-    FILE *fp;
-    char line[130];
-    sleep(1);
-    command +=" 2>&1";
-    fp = popen(  (const char *) command, "r");
-    if ( !fp ) {
-      qDebug("Could not execute '" + command + "'! err=%d", fp);
-      QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
-      pclose(fp);
-      return;
+    QString curFile;
+    if (TabWidget->getCurrentTab() == 0) {
+        if( Local_View->currentItem())
+            curFile = currentDir.canonicalPath() +"/"+ Local_View->currentItem()->text(0);
     } else {
-      while ( fgets( line, sizeof line, fp)) {
-        QString lineStr = line;
-        lineStr=lineStr.left(lineStr.length()-1);
-        outDlg->OutputEdit->append(lineStr);
-        outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
-      }
+        if(Remote_View->currentItem())
+            curFile = currentRemoteDir.canonicalPath() + "/"+Remote_View->currentItem()->text(0);
     }
-    pclose(fp);
 
-  }
+    InputDialog *fileDlg;
+    fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
+    fileDlg->setInputText(curFile);
+    fileDlg->exec();
+      //QString command;
+
+    if( fileDlg->result() == 1 ) {
+        qDebug(fileDlg->LineEdit1->text());
+        QStringList command;
+
+        command << "/bin/sh";
+        command << "-c";
+        command <<  fileDlg->LineEdit1->text();
+        Output *outDlg;
+        outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
+        outDlg->showMaximized();
+        outDlg->exec();
+        qApp->processEvents();
+
+    }
 }
 
 void AdvancedFm::runCommandStd() {
   QString curFile;
   if (TabWidget->getCurrentTab() == 0) {
     if( Local_View->currentItem())
@@ -867,53 +851,66 @@ void AdvancedFm::runCommandStd() {
   }
 
   InputDialog *fileDlg;
   fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
   fileDlg->setInputText(curFile);
   fileDlg->exec();
-  QString command;
+
   if( fileDlg->result() == 1 ) {
-    qApp->processEvents();
-    command = fileDlg->LineEdit1->text() + " &";
-    system(command.latin1());
+      qApp->processEvents();
+      startProcess( (const QString)fileDlg->LineEdit1->text().latin1());
   }
 }
 
 void AdvancedFm::fileStatus() {
   QString curFile;
   if (TabWidget->getCurrentTab() == 0) {
     curFile = Local_View->currentItem()->text(0);
   } else {
     curFile = Remote_View->currentItem()->text(0);
   }
-  QString command = " stat -l "+ curFile +" 2>&1";
-  Output *outDlg;
-  outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
-  outDlg->showMaximized();
-  outDlg->show();
-  qApp->processEvents();
-  FILE *fp;
-  char line[130];
-  sleep(1);
-  fp = popen(  (const char *) command, "r");
-  if ( !fp ) {
-    qDebug("Could not execute '" + command + "'! err=%d", fp);
-    QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
-    pclose(fp);
-    return;
-  } else {
-    while ( fgets( line, sizeof line, fp)) {
-      outDlg->OutputEdit->append(line);
-      outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
 
-    }
+    QStringList command;
+    command << "/bin/sh";
+    command << "-c";
+    command << "stat -l "+ curFile;
 
-  }
-  pclose(fp);
+    Output *outDlg;
+    outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
+    outDlg->showMaximized();
+    outDlg->exec();
+    qApp->processEvents();
+
+
+//   Output *outDlg;
+//   outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
+//   outDlg->showMaximized();
+//   outDlg->show();
+//   qApp->processEvents();
+
+//   FILE *fp;
+//   char line[130];
+//   sleep(1);
+//   fp = popen(  (const char *) command, "r");
+//   if ( !fp ) {
+//     qDebug("Could not execute '" + command + "'! err=%d", fp);
+//     QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
+//     pclose(fp);
+//     return;
+//   } else {
+//     while ( fgets( line, sizeof line, fp)) {
+//       outDlg->OutputEdit->append(line);
+//       outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
+
+//     }
+
+//   }
+//   pclose(fp);
 }
 
+
 void AdvancedFm::mkDir() {
   if (TabWidget->getCurrentTab() == 0)
     localMakDir();
   else
     remoteMakDir();
 
@@ -932,45 +929,45 @@ void AdvancedFm::del() {
     localDelete();
   else
     remoteDelete();
 }
 
 void AdvancedFm::mkSym() {
-  QString cmd;
-  QStringList curFileList = getPath();
-  if( curFileList.count() > 0) {
+    QString cmd;
+    QStringList curFileList = getPath();
+    if( curFileList.count() > 0) {
 
-    if (TabWidget->getCurrentTab() == 0) {
-      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+        if (TabWidget->getCurrentTab() == 0) {
+            for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
-        QString destName = currentRemoteDir.canonicalPath()+"/"+(*it);
-        if(destName.right(1) == "/") destName = destName.left( destName.length() -1);
-        QString curFile =  currentDir.canonicalPath()+"/"+(*it);
-        if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
-        cmd = "ln -s "+curFile+" "+destName;
-        qDebug(cmd);
-        system(cmd.latin1() );
-      }
-      populateRemoteView();
-      TabWidget->setCurrentTab(1);
-    } else {
-      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+                QString destName = currentRemoteDir.canonicalPath()+"/"+(*it);
+                if(destName.right(1) == "/") destName = destName.left( destName.length() -1);
+                QString curFile =  currentDir.canonicalPath()+"/"+(*it);
+                if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
+                cmd = "ln -s "+curFile+" "+destName;
+                qDebug(cmd);
+                startProcess( (const QString)cmd );
+            }
+            populateRemoteView();
+            TabWidget->setCurrentTab(1);
+        } else {
+            for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
-        QString destName = currentDir.canonicalPath()+"/"+(*it);
-        if(destName.right(1) == "/") destName = destName.left( destName.length() -1);
-        QString curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
-        if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
+                QString destName = currentDir.canonicalPath()+"/"+(*it);
+                if(destName.right(1) == "/") destName = destName.left( destName.length() -1);
+                QString curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
+                if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
 
-        cmd = "ln -s "+curFile+" "+destName;
-        qDebug(cmd);
-        system(cmd.latin1() );
-      }
-      populateLocalView();
-      TabWidget->setCurrentTab(0);
+                cmd = "ln -s "+curFile+" "+destName;
+                qDebug(cmd);
+                startProcess( (const QString)cmd );
+            }
+            populateLocalView();
+            TabWidget->setCurrentTab(0);
+        }
     }
-  }
 }
 
 void AdvancedFm::doBeam() {
   Ir ir;
   if(!ir.supported()){
   } else {
@@ -1015,6 +1012,26 @@ void AdvancedFm::selectAll() {
         Local_View->setSelected( Local_View->firstChild(),false);
     } else {
         Remote_View->selectAll(true);
         Remote_View->setSelected( Remote_View->firstChild(),false);
     }
 }
+
+void AdvancedFm::startProcess(const QString & cmd) {
+      QStringList command;
+      OProcess *process;
+      process = new OProcess();
+      connect(process, SIGNAL(processExited(OProcess *)),
+              this, SLOT( processEnded()));
+
+      command << "/bin/sh";
+      command << "-c";
+      command << cmd.latin1();
+      *process << command;
+      if(!process->start(OProcess::NotifyOnExit) )
+          qDebug("could not start process");
+}
+
+void AdvancedFm::processEnded() {
+  populateLocalView();
+  populateRemoteView();
+}