1 files changed, 7 insertions, 8 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index a9ba3c2..a378170 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -202,341 +202,340 @@ AdvancedFm::AdvancedFm( )
      connect(TabWidget,SIGNAL(currentChanged(QWidget *)),
             this,SLOT(tabChanged(QWidget*)));
 
 //     tab_3 = new QWidget( TabWidget, "tab_3" );
 //      tabLayout_3 = new QGridLayout( tab_3 );
 //      tabLayout_3->setSpacing( 2);
 //      tabLayout_3->setMargin( 2);
 
 //     OFileSelector *fileSelector;
 //     fileSelector = new OFileSelector(tab_3,0,0,"/","","*");
 //     tabLayout_3->addMultiCellWidget( fileSelector, 0, 0, 0, 3 );
     
 //     TabWidget->insertTab( tab_3, tr( "Files" ) );
 
     currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     currentDir.setPath( QDir::currentDirPath());
 
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     currentRemoteDir.setPath( QDir::currentDirPath());
 
     b = TRUE;
     currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
     currentPathCombo->setEditable(TRUE);
     layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 7);
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
     connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
               this, SLOT(  currentPathComboActivated( const QString & ) ) );
 
     connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
              this,SLOT(currentPathComboChanged()));
 
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
     layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 7);
 
     filterStr="*";
     b=FALSE;
     populateLocalView();
     populateRemoteView();
 }
 
 AdvancedFm::~AdvancedFm()
 {
 }
 
 void AdvancedFm::cleanUp()
 {
     QString sfile=QDir::homeDirPath();
     if(sfile.right(1) != "/")
         sfile+="/._temp";
     else
         sfile+="._temp";
     QFile file( sfile);
     if(file.exists())
         file.remove();
 }
 
 void AdvancedFm::tabChanged(QWidget *w)
 {
     if (TabWidget->currentPageIndex() == 0) {
             currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
             viewMenu->setItemChecked(viewMenu->idAt(0),TRUE);
             viewMenu->setItemChecked(viewMenu->idAt(1),FALSE);
     }
   if (TabWidget->currentPageIndex() == 1) {
             currentPathCombo->lineEdit()->setText( currentRemoteDir.canonicalPath());
             viewMenu->setItemChecked(viewMenu->idAt(1),TRUE);
             viewMenu->setItemChecked(viewMenu->idAt(0),FALSE);
     }
 }
 
 
 void AdvancedFm::populateLocalView()
 {
     QPixmap pm;
     Local_View->clear();
     currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     currentDir.setMatchAllDirs(TRUE);
     currentDir.setNameFilter(filterStr);
     QString fileL, fileS, fileDate;
 //    qDebug(currentDir.canonicalPath());
 //     struct stat buf;
 //     mode_t mode;
     QString fs= getFileSystemType((const QString &) currentDir.canonicalPath());
     setCaption("AdvancedFm :: "+fs);   
     bool isDir=FALSE;
     const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
     QFileInfoListIterator it(*list);
     QFileInfo *fi;
     while ( (fi=it.current()) ) {
         if (fi->isSymLink() ) {
             QString symLink=fi->readLink();
 //         qDebug("Symlink detected "+symLink);
             QFileInfo sym( symLink);
             fileS.sprintf( "%10li", sym.size() );
-            fileL.sprintf( "%s ->  %s",  sym.fileName().data(),sym.absFilePath().data() );
+            fileL.sprintf( "%s ->  %s",  fi->fileName().data(),sym.absFilePath().data() );
             fileDate = sym.lastModified().toString();
         } else {
             fileS.sprintf( "%10li", fi->size() );
             fileL.sprintf( "%s",fi->fileName().data() );
             fileDate= fi->lastModified().toString();
             if( QDir(QDir::cleanDirPath( currentDir.canonicalPath()+"/"+fileL)).exists() ) {
                 fileL+="/";
                 isDir=TRUE;
 //     qDebug( fileL);
             }
         }
         QFileInfo fileInfo(  currentDir.canonicalPath()+"/"+fileL);
         if(fileL !="./" && fi->exists()) {
             item= new QListViewItem( Local_View, fileL, fileS , fileDate);
             
             if(isDir || fileL.find("/",0,TRUE) != -1) {
                 
                 if( !QDir( fi->filePath() ).isReadable()) //is directory
                     pm = Resource::loadPixmap( "lockedfolder" );
                 else
                     pm= Resource::loadPixmap( "folder" );
 //                 item->setPixmap( 0,pm );
             } else if( (fileInfo.permission( QFileInfo::ExeUser)
                      | fileInfo.permission( QFileInfo::ExeGroup)
                        | fileInfo.permission( QFileInfo::ExeOther)) & fs.find("vfat",0,TRUE) == -1) {
                     pm = Resource::loadPixmap( "exec");
 //                 else { //is exec
 //                  pm = Resource::loadPixmap( "exec");
 //                 }
 // //                 item->setPixmap( 0,pm);
             } else if( !fi->isReadable() ) { 
                 pm = Resource::loadPixmap( "locked" );
 //                 item->setPixmap( 0,pm);
             } else { //everything else goes by mimetype
                 MimeType mt(fi->filePath());
                 pm=mt.pixmap(); //sets the correct pixmap for mimetype
                 if(pm.isNull())
                     pm =  Resource::loadPixmap( "UnknownDocument-14" );
 //                 item->setPixmap( 0,pm);
             }
             item->setPixmap( 0,pm);
             if(  fi->isSymLink() && fileL.find("->",0,TRUE) != -1) {
                   // overlay link image
                 pm= Resource::loadPixmap( "folder" );
                 QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
                 QPainter painter( &pm );
                 painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
                 pm.setMask( pm.createHeuristicMask( FALSE ) );
                 item->setPixmap( 0, pm);
             }
         }
         isDir=FALSE;
         ++it;
      }
 
     if(currentDir.canonicalPath().find("dev",0,TRUE) != -1) {
         struct stat buf;
 //         struct stat st;
         dev_t devT;
 //         mode_t mode;
         DIR *dir;
 //         int fd = 0;
         struct dirent *mydirent;
 //         int i = 1;
         if((dir = opendir( currentDir.canonicalPath().latin1())) != NULL)
             while ((mydirent = readdir(dir)) != NULL) {
                 lstat( mydirent->d_name, &buf);
                 qDebug(mydirent->d_name);
 //                 mode = buf.st_mode;
                 fileL.sprintf("%s", mydirent->d_name);
 //                fileS.sprintf("%d, %d",  ); //this isn't correct
                 devT = buf.st_dev;
                 fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
 //                fileS.sprintf("%d,%d", devT,  devT);
                 fileDate.sprintf("%s", ctime( &buf.st_mtime));
                 if( fileL.find(".") == -1 ){
                     item= new QListViewItem( Local_View, fileL, fileS, fileDate);
                     pm =  Resource::loadPixmap( "UnknownDocument-14" );
                     item->setPixmap( 0,pm);
                 }
             }
             
         closedir(dir);
     }
     
     Local_View->setSorting( 3,FALSE);
     fillCombo( (const QString &) currentDir.canonicalPath());
 }
 
 
 void AdvancedFm::populateRemoteView()
 {
 //     QList<QListViewItem> * getSelectedItems( QListView * Local_View );
 //     QListViewItemIterator it( Remote_View );
 //     for ( ; it.current(); ++it ) {
 //         if ( it.current()->isSelected() ) {
 //             QString strItem = it.current()->text(0);
 //             QString localFile = currentRemoteDir.canonicalPath()+"/"+strItem;
 //             QFileInfo fi(localFile);
 //         }
 //     }
     QPixmap pm;
     Remote_View->clear();
     currentRemoteDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     currentRemoteDir.setMatchAllDirs(TRUE);
     currentRemoteDir.setNameFilter(filterStr);
     QString fileL, fileS, fileDate;
 
     QString fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
     setCaption("AdvancedFm :: "+fs);   
     bool isDir=FALSE;
     const QFileInfoList *list = currentRemoteDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
     QFileInfoListIterator it(*list);
     QFileInfo *fi;
     while ( (fi=it.current()) ) {
         if (fi->isSymLink() ){
             QString symLink=fi->readLink();
 //         qDebug("Symlink detected "+symLink);
             QFileInfo sym( symLink);
             fileS.sprintf( "%10li", sym.size() );
-            fileL.sprintf( "%s ->  %s",  sym.fileName().data(),sym.absFilePath().data() );
+            fileL.sprintf( "%s ->  %s",  fi->fileName().data(),sym.absFilePath().data() );
             fileDate = sym.lastModified().toString();
         } else {
 //        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
             fileS.sprintf( "%10li", fi->size() );
             fileL.sprintf( "%s",fi->fileName().data() );
             fileDate= fi->lastModified().toString();
             if( QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+fileL)).exists() ) {
                 fileL+="/";
                 isDir=TRUE;
 //     qDebug( fileL);
             }
         }
         QFileInfo fileInfo(  currentDir.canonicalPath()+"/"+fileL);
         if(fileL !="./" && fi->exists()) {
             item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
             QPixmap pm;
 
             if(isDir || fileL.find("/",0,TRUE) != -1) {
                 if( !QDir( fi->filePath() ).isReadable())
                     pm = Resource::loadPixmap( "lockedfolder" );
                 else
                     pm= Resource::loadPixmap( "folder" );
 //                 item->setPixmap( 0,pm );
-             } else if( (fileInfo.permission( QFileInfo::ExeUser)
-                         | fileInfo.permission( QFileInfo::ExeGroup)
-                        | fileInfo.permission( QFileInfo::ExeOther)) & fs.find("vfat",0,TRUE) == -1) {
-                     pm = Resource::loadPixmap( "exec");
+            } else if( (fileInfo.permission( QFileInfo::ExeUser)
+                     | fileInfo.permission( QFileInfo::ExeGroup)
+                       | fileInfo.permission( QFileInfo::ExeOther)) & fs.find("vfat",0,TRUE) == -1) {
 /////                }  else if(fileInfo.isExecutable()){ //is exec <<<< BROKEN!!
                   pm = Resource::loadPixmap( "exec");
 //                     item->setPixmap( 0,pm);
             } else if( !fi->isReadable() ) {
                 pm = Resource::loadPixmap( "locked" );
 //                     item->setPixmap( 0,pm);
             } else {
                 MimeType mt(fi->filePath());
                 pm=mt.pixmap(); //sets the correct pixmap for mimetype
                 if(pm.isNull())
                     pm =  Resource::loadPixmap( "UnknownDocument-14" );
 //                     item->setPixmap( 0,pm);
             }
         if(  fi->isSymLink() && fileL.find("->",0,TRUE) != -1) {
               // overlay link image
             pm= Resource::loadPixmap( "folder" );
             QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
             QPainter painter( &pm );
             painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
             pm.setMask( pm.createHeuristicMask( FALSE ) );
 //                 item->setPixmap( 0, pm);
         }
         item->setPixmap( 0, pm);
     }
     isDir=FALSE;
         ++it;
     }
 
     if(currentRemoteDir.canonicalPath().find("dev",0,TRUE) != -1) {
         struct stat buf;
 //         struct stat st;
 //         mode_t mode;
         DIR *dir;
 //         int fd = 0;
         struct dirent *mydirent;
 //         int i = 1;
         if((dir = opendir( currentRemoteDir.canonicalPath().latin1())) != NULL)
             while ((mydirent = readdir(dir)) != NULL) {
                 lstat( mydirent->d_name, &buf);
                 qDebug(mydirent->d_name);
 //                 mode = buf.st_mode;
                 fileL.sprintf("%s", mydirent->d_name);
 //                fileS.sprintf("%d, %d",  ); //this isn't correct
                 fileS.sprintf("%d,%d", (int) (buf.st_dev>>8)&0xFF, (int) buf.st_dev &0xFF);
                 fileDate.sprintf("%s", ctime( &buf.st_mtime));
                 if( fileL.find(".") == -1 ){
                     item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
                     pm =  Resource::loadPixmap( "UnknownDocument-14" );
                     item->setPixmap( 0,pm);
                 }
             }
             
         closedir(dir);
     }
 
     Remote_View->setSorting( 3,FALSE);
     fillCombo( (const QString &) currentRemoteDir.canonicalPath() );
 }
 
 void AdvancedFm::localListClicked(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() ) {
                 currentDir.cd(strItem2, TRUE);
                 populateLocalView();
             }
         } else { // not a symlink
             if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
                 if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) {
                     strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
                     currentDir.cd(strItem,FALSE);
                     populateLocalView();
                 } else {
                     currentDir.cdUp();
                     populateLocalView();
                 }
                 if(QDir(strItem).exists()){
                     currentDir.cd(strItem, TRUE);
                     populateLocalView();
                 }
             } else {
                 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
                 if( QFile::exists(strItem ) ) {
 //                 qDebug("upload "+strItem);
                 }
             } //end not symlink
             chdir(strItem.latin1());
         }
     }
 }
@@ -1254,196 +1253,196 @@ void AdvancedFm::copyAs()
         }
     }
 }
 
 void AdvancedFm::move() {
 
     QStringList curFileList = getPath();
     QString curFile;
 //    qDebug(curFile);
     QString destFile;
 
     if (TabWidget->currentPageIndex() == 0) {
         for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
             QString destFile =  currentRemoteDir.canonicalPath();
                 if(destFile.right(1).find("/",0,TRUE) == -1)
                     destFile+="/";
                 destFile +=(*it);
             curFile = currentDir.canonicalPath();
             qDebug("Destination file is "+destFile);
             if(curFile.right(1).find("/",0,TRUE) == -1)
                 curFile +="/";
             curFile+=(*it);
 
             QFile f(destFile);
             if( f.exists())
                 f.remove();
             if(!copyFile( destFile, curFile) ) {
                 QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile));
                 return;
             }
             QFile::remove(curFile);
         }
         TabWidget->setCurrentPage(1);
     } else {
         for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
             QString destFile = currentRemoteDir.canonicalPath();
                 if(destFile.right(1).find("/",0,TRUE) == -1)
                     destFile+="/";
                 destFile +=(*it);
             qDebug("Destination file is "+destFile);
             curFile = currentDir.canonicalPath();
             if(curFile.right(1).find("/",0,TRUE) == -1)
                 curFile +="/";
             curFile+=(*it);
 
             QFile f(destFile);
             if( f.exists())
                 f.remove();
             if(!copyFile(destFile, curFile) ) {
                 QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile));
                 return;
             }
             QFile::remove(curFile);
             TabWidget->setCurrentPage(0);
         }
     }
         populateRemoteView();
         populateLocalView();
  }
 
  bool AdvancedFm::copyFile( const QString & dest, const QString & src )
 {
     char bf[ 50000 ];
     int  bytesRead;
     bool success = TRUE;
     struct stat status;
 
     QFile s( src );
     QFile d( dest );
 
     if( s.open( IO_ReadOnly | IO_Raw ) &&  d.open( IO_WriteOnly | IO_Raw ) )  {
         while( (bytesRead = s.readBlock( bf, sizeof( bf ) )) == sizeof( bf ) ) {
             if( d.writeBlock( bf, sizeof( bf ) ) != sizeof( bf ) ){
                 success = FALSE;
                 break;
             }
         }
         if( success && (bytesRead > 0) ){
             d.writeBlock( bf, bytesRead );
         }
     } else {
         success = FALSE;
     }
 
       // Set file permissions
     if( stat( (const char *) src, &status ) == 0 ){
         chmod( (const char *) dest, status.st_mode );
     }
 
     return success;
 }
 
 void AdvancedFm::runCommand() {
      QString curFile;
      if (TabWidget->currentPageIndex() == 0) {
          if( Local_View->currentItem())
-         curFile = currentDir.canonicalPath() + Local_View->currentItem()->text(0);
+         curFile = currentDir.canonicalPath() +"/"+ Local_View->currentItem()->text(0);
      } else {
          if(Remote_View->currentItem())
-         curFile = currentRemoteDir.canonicalPath() + Remote_View->currentItem()->text(0);
+         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();
 
 //         int err=0;
         Output *outDlg;
         outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
         outDlg->showMaximized();
         outDlg->show();
         qApp->processEvents();
         FILE *fp;
         char line[130];
         sleep(1);
 //         if(command.find("2>",0,TRUE) != -1)
             command +=" 2>&1";
         fp = popen(  (const char *) command, "r"); 
         if ( !fp ) {
             qDebug("Could not execute '" + command + "'! err=%d", fp); 
             QMessageBox::warning( this, tr("AdvancedFm"), tr("command failed!"), tr("&OK") );
             pclose(fp);             
             return;
         } 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);
             }
         }
     }
 }
 
 void AdvancedFm::runCommandStd() {
     QString curFile;
     if (TabWidget->currentPageIndex() == 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 ) {
         qApp->processEvents();
         command = fileDlg->LineEdit1->text() + " &";
         system(command.latin1());
     }
 }
 
 void AdvancedFm::fileStatus() {
     QString curFile;
     if (TabWidget->currentPageIndex() == 0) {
         curFile = Local_View->currentItem()->text(0);
     } else {
         curFile = Remote_View->currentItem()->text(0);
     }
     QString command = " stat -l "+ curFile +" 2>&1";
 //     int err=0;
     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, tr("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);
                   
         }
               
     }
 }
 
 void AdvancedFm::mkDir() {
     if (TabWidget->currentPageIndex() == 0) 
         localMakDir();