damned QFileInfo::isExecutable bug...

1 files changed, 9 insertions, 2 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index e3ab76b..7cd8644 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -541,404 +541,411 @@ void AdvancedFm::localListClicked(QListViewItem *selectedItem)
 }
 
 void AdvancedFm::remoteListClicked(QListViewItem *selectedItem)
 {
     if(selectedItem) {
         QString strItem=selectedItem->text(0);
         QString strSize=selectedItem->text(1);
         strSize=strSize.stripWhiteSpace();
         if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
               // is symlink
             QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
             if(QDir(strItem2).exists() ) {
                 currentRemoteDir.cd(strItem2, TRUE);
                 populateRemoteView();
             }
         } else { // not a symlink
             if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
                 if(QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem)).exists() ) {
                     strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem);
                     currentRemoteDir.cd(strItem,FALSE);
                     populateRemoteView();
                 } else {
                     currentRemoteDir.cdUp();
                     populateRemoteView();
                 }
                 if(QDir(strItem).exists()){
                     currentRemoteDir.cd(strItem, TRUE);
                     populateRemoteView();
                 }
             } else {
                 strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem);
                 if( QFile::exists(strItem ) ) {
 //                 qDebug("upload "+strItem);
                 }
             } //end not symlink
             chdir(strItem.latin1());
         }
     }
 }
 
 void AdvancedFm::doLocalCd()
 {
     localListClicked( Local_View->currentItem());
 }
 
 void AdvancedFm::doRemoteCd()
 {
     localListClicked( Remote_View->currentItem());
 }
 
 void AdvancedFm::showHidden()
 {
     if (b) {
     currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
 //     localMenu->setItemChecked(localMenu->idAt(0),TRUE);
 //    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=FALSE;
 
     }  else {
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
 //     localMenu->setItemChecked(localMenu->idAt(0),FALSE);
 //    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=TRUE;
     }
     populateLocalView();
         
 }
 
 void AdvancedFm::showRemoteHidden()
 {
     if (b) {
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
 //     viewMenu->setItemChecked(localMenu->idAt(0),TRUE);
 //    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=TRUE;
 
     }  else {
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
 //     localMenu->setItemChecked(localMenu->idAt(0),FALSE);
 //    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=FALSE;
     }
     populateRemoteView();
 }
 
 void AdvancedFm::localListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
 {
     switch (mouse) {
       case 1:
           break;
       case 2:
           showLocalMenu(item);
           Local_View->clearSelection();
     break;
     };
 }
 
 void AdvancedFm::remoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
 {
  switch (mouse) {
       case 1:
           break;
       case 2:
           showRemoteMenu(item);
           Remote_View->clearSelection();
       break;
     };
 }
 
 void AdvancedFm::showLocalMenu(QListViewItem * item)
 {
     if(item) {
         QPopupMenu  m;
         m.insertItem(  tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
         m.insertSeparator();
         if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) !=-1)
             m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
         else
             m.insertItem( tr( "Open" ), this, SLOT( runThis() ));
         m.insertItem( tr( "Open as Text" ), this, SLOT( runText() ));
         m.insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
         m.insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
         m.insertSeparator();
         m.insertItem( tr( "Rename" ), this, SLOT( localRename() ));
         m.insertItem( tr( "Copy" ), this, SLOT( copy() ));
         m.insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
         m.insertItem( tr( "Move" ), this, SLOT( move() ));
         m.insertSeparator();
         m.insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() ));
         m.insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
         m.insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
         m.insertSeparator();
         m.insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
         m.insertSeparator();
         m.insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
         m.insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
         m.setCheckable(TRUE);
         if (!b)
             m.setItemChecked(m.idAt(0),TRUE);
         else
             m.setItemChecked(m.idAt(0),FALSE);
         m.exec( QCursor::pos() );
     }
 }
 
 void AdvancedFm::showRemoteMenu(QListViewItem * item)
 {
     if(item) {
         QPopupMenu  m;
         m.insertItem(  tr( "Show Hidden Files" ), this,  SLOT( showRemoteHidden() ));
         m.insertSeparator();
         if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) !=-1)
             m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() ));
         else
             m.insertItem( tr( "Open" ), this, SLOT( runThis() ));
         m.insertItem( tr( "Open as Text" ), this, SLOT( runText() ));
         m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
         m.insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
         m.insertSeparator();
         m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
         m.insertItem( tr( "Copy" ), this, SLOT( copy() ));
         m.insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
         m.insertItem( tr( "Move" ), this, SLOT( move() ));
         m.insertSeparator();
         m.insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() ));
         m.insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
         m.insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
         m.insertSeparator();
         m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
         m.insertSeparator();
         m.insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
         m.insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
         m.setCheckable(TRUE);
         if (!b)
             m.setItemChecked(m.idAt(0),TRUE);
         else
             m.setItemChecked(m.idAt(0),FALSE);
         m.exec( QCursor::pos() );
     }    
 }
 
 void AdvancedFm::runThis() {
 //    QFileInfo *fi;
 QString fs;    
     if (TabWidget->currentPageIndex() == 0) {
         QString curFile = Local_View->currentItem()->text(0);
 
         fs= getFileSystemType((const QString &) currentDir.canonicalPath());
         QFileInfo fileInfo( currentDir.canonicalPath()+"/"+curFile);
         qDebug( fileInfo.owner());
-         if( fileInfo.isExecutable() || fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+        if( (fileInfo.permission( QFileInfo::ExeUser)
+             | fileInfo.permission( QFileInfo::ExeGroup)
+             | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
+            | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+//        if( fileInfo.isExecutable() |
              QCopEnvelope e("QPE/System", "execute(QString)" );
              e << curFile;
          } else {
         curFile =  currentDir.canonicalPath()+"/"+curFile;
             DocLnk nf(curFile);
             QString execStr = nf.exec();
             qDebug( execStr);
             if( execStr.isEmpty() ) {
             } else {
                 nf.execute();
             }
          }
 //         MimeType mt( curFile);
     } else {
         QString curFile = Remote_View->currentItem()->text(0);
         fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
         qDebug("Filesystemtype is "+fs);
         QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+curFile);
-         if(fileInfo.isExecutable() || fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+        if( (fileInfo.permission( QFileInfo::ExeUser)
+             | fileInfo.permission( QFileInfo::ExeGroup)
+             | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
+            | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
                  QCopEnvelope e("QPE/System", "execute(QString)" );
                  e << curFile;
          } else {
         curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
             DocLnk nf(curFile);
             QString execStr = nf.exec();
             qDebug(execStr);
             if( execStr.isEmpty() ) {
             } else {
                 nf.execute();
             }
          }
 //         MimeType mt( curFile);
     }
 }
 
 void AdvancedFm::runText() {
     if (TabWidget->currentPageIndex() == 0) {
         QString curFile = Local_View->currentItem()->text(0);
         curFile =  currentDir.canonicalPath()+"/"+curFile;
         QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
         e << curFile;
     } else {
         QString curFile = Remote_View->currentItem()->text(0);
         curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
         DocLnk nf(curFile);
         QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
         e << curFile;
     }
 }
 
 void AdvancedFm::localMakDir()
 {
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
        QString  filename = fileDlg->LineEdit1->text();
        currentDir.mkdir( currentDir.canonicalPath()+"/"+filename);
     }
     populateLocalView();
 }
 
 void AdvancedFm::remoteMakDir()
 {
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
        QString  filename = fileDlg->LineEdit1->text();
         currentRemoteDir.mkdir(  currentRemoteDir.canonicalPath()+"/"+filename);
     }
     populateRemoteView();
 }
 
 void AdvancedFm::localDelete()
 {
     QStringList curFileList = getPath();
     QString myFile;
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
         myFile = (*it);
         if( myFile.find(" -> ",0,TRUE) != -1)
             myFile = myFile.left( myFile.find(" -> ",0,TRUE));
                     
         QString f = currentDir.canonicalPath();
         if(f.right(1).find("/",0,TRUE) == -1)
             f+="/";
         f+=myFile;
         if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) {
             switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to 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());
                   populateLocalView();
               }
                   break;
               case 1:
                     // exit
                   break;
             };
 
         } else {
             switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
                                           +" ?",tr("Yes"),tr("No"),0,0,1) ) {
               case 0: {
                   QString cmd="rm "+f;
                   QFile file(f);
                   file.remove();
 //                   system( cmd.latin1());
                   populateLocalView();
               }
                   break;
               case 1:
                     // exit
                   break;
             };
         }
     }
 }
 
 void AdvancedFm::remoteDelete()
 {
     QStringList curFileList = getPath();
     QString myFile;
 
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
         myFile = (*it);
         if(myFile.find(" -> ",0,TRUE) != -1)
             myFile = myFile.left(myFile.find(" -> ",0,TRUE));
         QString f = currentRemoteDir.canonicalPath();
          if(f.right(1).find("/",0,TRUE) == -1)
              f+="/";
         f+=myFile;
         if(QDir(f).exists() && !QFileInfo(f).isSymLink()  ) {
             switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to 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());
                   populateRemoteView();
               }
                   break;
               case 1:
                     // exit
                   break;
             };
 
         } else {
             switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
                                           +" ?",tr("Yes"),tr("No"),0,0,1) ) {
               case 0: {
                   QString cmd="rm "+f;
                   QFile file(f);
                   file.remove();
 //                   system( cmd.latin1());
                   populateRemoteView();
               }
                   break;
               case 1:
                     // exit
                   break;
             };
         }
     }
 }
 
 void AdvancedFm::localRename()
 {
     QString curFile = Local_View->currentItem()->text(0);
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
     fileDlg->setInputText((const QString &)curFile);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         QString oldname = currentDir.canonicalPath() + "/" + curFile;
         QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
         if( rename(oldname.latin1(), newName.latin1())== -1)
             QMessageBox::message(tr("Note"),tr("Could not rename"));
     }
     populateLocalView();
 }
 
 void AdvancedFm::remoteRename()
 {
     QString curFile = Local_View->currentItem()->text(0);
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
     fileDlg->setInputText((const QString &)curFile);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         QString oldname = currentRemoteDir.canonicalPath() + "/" + curFile;
         QString newName = currentRemoteDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
         if( rename(oldname.latin1(), newName.latin1())== -1)
             QMessageBox::message(tr("Note"),tr("Could not rename"));
     }
     populateRemoteView();
 }
 
 void AdvancedFm::switchToLocalTab()
 {
     TabWidget->setCurrentPage(0);
     Local_View->setFocus();
 }
 
 void AdvancedFm::switchToRemoteTab()
 {
     TabWidget->setCurrentPage(1);