use shell script smbfind and not perl script findsmb

2 files changed, 2 insertions, 2 deletions

diff --git a/noncore/net/opie-smb/opie-smb.control b/noncore/net/opie-smb/opie-smb.control
index 98a23b4..fc8c316 100644
--- a/noncore/net/opie-smb/opie-smb.control
+++ b/noncore/net/opie-smb/opie-smb.control
@@ -1,11 +1,11 @@
 Package: opie-smb
-Files: plugins/application/libopie-smb.so* bin/opie-smb pics/opie-smb apps/Applications/opie-smb.desktop
+Files: plugins/application/libopie-smb.so* bin/opie-smb bin/smbfind pics/opie-smb apps/Applications/opie-smb.desktop
 Version: $QPE_VERSION$EXTRAVERSION
 Architecture: arm
 Arch: arm
 Maintainer: Kurt Korbatits (support@midget.net.au)
 Section: Network
 Priority: optional
 Description: Gui front end for samba utilities.
 Source:
 Depends: smbclient
diff --git a/noncore/net/opie-smb/qsmb.cpp b/noncore/net/opie-smb/qsmb.cpp
index 527ab38..880573b 100644
--- a/noncore/net/opie-smb/qsmb.cpp
+++ b/noncore/net/opie-smb/qsmb.cpp
@@ -1,402 +1,402 @@
 #include "qsmb.h"
 #include <qpushbutton.h>
 #include <qpe/qpeapplication.h>
 
 #include <string.h>
 #include <qstring.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
 #include <qstringlist.h>
 #include <qcheckbox.h>
 #include <qtextview.h>
 #include <qmessagebox.h>
 
 
 #include <pthread.h>
 #include <signal.h>
 #include <ctype.h>
 
 
 #include <opie2/odebug.h>
 using namespace Opie::Core;
 
 
 Qsmb::Qsmb( QWidget* parent,  const char* name, WFlags fl )
    : FormQPESMBBase( parent, name, fl )
 {
    connect(CBHost, SIGNAL(activated(int)), this, SLOT(hostSelected(int)));
    connect(DoItBtn, SIGNAL(clicked()), this, SLOT(DoItClicked()));
    connect(BtnScan, SIGNAL(clicked()), this, SLOT(scanClicked()));
    connect(BtnClear, SIGNAL(clicked()), this, SLOT(clear()));
 
 //TODO configurable mount points
    if(!QFileInfo("/mnt/samba1").exists()) system("mkdir /mnt/samba1");
    if(!QFileInfo("/mnt/samba2").exists()) system("mkdir /mnt/samba2");
    if(!QFileInfo("/mnt/samba2").exists()) system("mkdir /mnt/samba3");
     
    mountpt->insertItem("/mnt/samba1",-1);
    mountpt->insertItem("/mnt/samba2",-1);
    mountpt->insertItem("/mnt/samba3",-1);
 
    top_element = NULL;
    scanning = false;
 }
 
 Qsmb::~Qsmb()
 {
 }
 
 void Qsmb::clear() 
 {
    if (scanning) return;
    ListViewScan->clear();	
    TextViewOutput->setText("");
    top_element = NULL;	
 }
 
 void Qsmb::scanClicked() 
 {
    if (scanning) return;
    pthread_create(&tpid, NULL, runit, (void *)this);
 }
 
 void Qsmb::DoItClicked() 
 {
 
    if(! ListViewScan->selectedItem()) {
       QMessageBox::warning(this, tr("Error"),tr("<p>No share selected!</p>"));
       return;
    }
    if (scanning) return;
    pthread_create(&tpid, NULL, runitm, (void *)this);
 }
 
 void* runit(void* arg) 
 {
    Qsmb* caller = (Qsmb*)arg;
    caller->scan();
    return(0);
 }
 
 void* runitm(void* arg) 
 {
    Qsmb* caller = (Qsmb*)arg;
    caller->DoIt();
    return(0);
 }
 
 void Qsmb::scan() 
 {
    int i;
 
    if (scanning) return;
    scanning = true;
 
    char match[512], lmhosts[512];
    QString cmd;
    char result[256];
 
    FILE *pipe, *pipe2;
 
    LScan->setText("Scanning...");
    qApp->processEvents();
 
    cmd = "ifconfig |grep 'addr:'|awk '{print $2}'|awk 'BEGIN{FS=\":\"}{print $2}'|sed 's/\\.[0-9]*$//'|head -n1";
 
    owarn << "cmd: " << cmd << oendl;
 
    /* run findsmb & read output */
    if ((pipe = popen(cmd.latin1(), "r")) == NULL) {
       snprintf(result, 256, "Error: Can't run %s", cmd.latin1());
       TextViewOutput->append(result);
       return;
    }
    while(fgets(result, 256, pipe) != NULL) {
       strcpy( match, result);
       match[5]='\0';
       break;
    }
    owarn << "match: " << match << oendl;
 
-   cmd = "/usr/bin/findsmb";
+   cmd = "smbfind";
    owarn <<"cmd: " << cmd << oendl;
 	
    TextViewOutput->append(cmd);
 
    snprintf(lmhosts, 512, "echo '127.0.0.1 localhost'>/etc/samba/lmhosts");
    
    if ((pipe2 = popen(lmhosts, "r")) == NULL) {
       snprintf(result, 256, "Error: Can't run %s", lmhosts);
       //TextViewOutput->append(result);
       return;
    }
 	
    /* run command & read output */
    if ((pipe = popen(cmd.latin1(), "r")) == NULL) {
       snprintf(result, 256, "Error: Can't run %s", cmd.latin1());
       TextViewOutput->append(result);
       return;
    }
 
    /* parse output and display in ListViewScan */
    while(fgets(result, 256, pipe) != NULL) {
       /* put result into TextViewOutput */
       TextViewOutput->append(result);
 
       if( strstr(result, match) != NULL ) { 
          char ip_addr[256], host[256], *ptr1;
 
          strcpy( ip_addr, result);
          ptr1 = strchr(ip_addr,' ');
          strcpy( host, ptr1);
          ip_addr[ptr1 - ip_addr]='\0';
 
          for(i = 0; i < 256; i++)  {
             if(host[i]!=' ') {
                strcpy( host, host + i);
                break; 
             }
          } 
          ptr1 = strchr(host,' ');
          host[ptr1 - host] = '\0'; 
 
          owarn << "add host: " << host << oendl;
          
          CBHost->insertItem( host, -1);
          snprintf( lmhosts, 512, "echo '%s %s'>>/etc/samba/lmhosts", ip_addr,host);
 
          owarn << "lmhosts: " << lmhosts << oendl;
 
          if ((pipe2 = popen(lmhosts, "r")) == NULL) {
             snprintf(result, 256, "Error: Can't run %s", lmhosts);
             return;
          }
       }
    }
 
    TextViewOutput->append("\n\n============================================\n");
    LScan->setText("");
    scanning = false;
 }
 
 void Qsmb::hostSelected(int index)
 {
    owarn << "hostSelected" << oendl;
    int  i;
 
    QListViewItem *element;
    QListViewItem *parent;
 
    QString text = CBHost->currentText();
 
    if (scanning) return;
    scanning = true;
 
    QString cmd;
    char result[256];
 
    FILE *pipe;
 
    LScan->setText("Scanning...");
 
    if((const char *)username->text() == '\0')
       cmd = "/usr/bin/smbclient -L //"+CBHost->currentText()+" -N 2>&1 |grep Disk";
    else
       cmd = "/usr/bin/smbclient -L //"+CBHost->currentText()+" -N -U"+username->text()+":"+password->text()+" 2>&1 |grep Disk";
 
    for(i = 0; i < 512; i++) {
       if(cmd[i]==':') {
          cmd[i]='%';
          break;
       }
       if(cmd[i]=='\0')
          break;
    }
 
    owarn << "i="<< index << "cmd:" <<  cmd << oendl;
 
    TextViewOutput->append(cmd);
 
    /* run smbclient & read output */
    if ((pipe = popen(cmd.latin1(), "r")) == NULL) {
       snprintf(result, 256, "Error: Can't run %s", cmd.latin1());
 //      cmd = "Error: Can't run "+cmd;
       TextViewOutput->append(result);
       return;
    }
 
    /* parse output and display in ListViewScan */
    while(fgets(result, 256, pipe) != NULL) {
       /* put result into TextViewOutput */
       TextViewOutput->append(result);
 
       if( strchr(result, '$') == NULL ) { 
          char share[256], *ptr1;
 
          strcpy(share,result);
          ptr1 = strchr(share,' ');
          share[ptr1 - share]='\0';
 
          owarn<< "add share: " << share << oendl;
 
          if(top_element != NULL) {
             bool found = false;
             element = top_element;
 
             while(element != NULL && !found) {
                if(strcmp( element->text(0).ascii(), share)==0) {
                   parent = element;
                   found = true;
                }
                element = element->nextSibling();
             }
 
             if(!found) {
                element = new QListViewItem(ListViewScan,share);
                element->setOpen(true);
                parent=element;
             }
          } else {
             element = new QListViewItem(ListViewScan,share);
             element->setOpen(true);
             top_element = element;
             parent = element;
          }
       }
    }
 
    TextViewOutput->append("\n\n============================================\n");
    LScan->setText("");
    scanning = false;
 }
 
 void Qsmb::DoIt()
 {
    QListViewItem *element;
    element = ListViewScan->selectedItem();
    if(!element) {
       QMessageBox::warning(this, tr("Error!!"),tr("<p><b>No</b> share selected!!</p>"));
       return;
    }
 
    if (scanning) return;
    scanning = true;
 
    int i;
 
    char share[512];
    QString cmd;
    QString cmd2;
    char result[256];
 //   QString result;
    QString text = mountpt->currentText();
 
    FILE *pipe,*pipe2;
 
    LScan->setText("Mounting...");
    qApp->processEvents();
    
    cmd = "mkdir -p "+ text;
 
    owarn<<"cmd: "<< cmd << oendl;
 
    /* make sure mount exists! */
    if ((pipe2 = popen(cmd.latin1(), "r")) == NULL)  {
 
       snprintf(result, 256, "Error: Can't run %s", cmd.latin1());
       //    result = "Error: Can't run " + cmd;
       TextViewOutput->append(result);
       return;
    }
 
    while(fgets(result, 256, pipe2) != NULL) {
       /* put result into TextViewOutput */
       TextViewOutput->append(result);
    }
 
 
    strcpy(share,(const char *)element->text(0));
 
    for(i = 0; i < 256; i++) {
       if(isalpha( share[i]))  {
          strcpy( share, share + i);
          break;
       }
    }
 
    cmd = "/usr/bin/smbmount  //"+CBHost->currentText()+"/"+share+" "+mountpt->currentText()+" -U"+username->text()+":"+password->text();
 
    for(i = 0; i < 512; i++) {
       if(cmd[i]==':') {
          cmd[i]='%';
          break;
       }
       if(cmd[i]=='\0')
          break;
    }
 
    owarn << "cmd: " << cmd << oendl;
    TextViewOutput->append(cmd.latin1());
 
 
    if(onbootBtn->isChecked()) {
       owarn << "Saving Setting permanently..." << oendl;
       cmd2 = "echo '" + cmd + "'>/opt/QtPalmtop/etc/samba.env";
       
       /* run command & read output */
       if ((pipe = popen(cmd2.latin1(), "r")) == NULL) {
 
          snprintf(result, 256, "Error: Can't run %s", cmd.latin1());
 //         result = "Error: Can't run "+ cmd;
          //TextViewOutput->append(result);
          return;
       }
       /* parse output and display in ListViewScan */
       while(fgets(result, 256, pipe) != NULL) {
          /* put result into TextViewOutput */
          //TextViewOutput->append(result);
       }
    }
 	
    /* run command & read output */
    if ((pipe = popen(cmd.latin1(), "r")) == NULL) {
 
 //         result = "Error: Can't run "+ cmd;
       snprintf(result, 256, "Error: Can't run %s", cmd.latin1());
       
       TextViewOutput->append(result);
       return;
    }
 
    /* parse output and display in ListViewScan */
    while(fgets(result, 256, pipe) != NULL) {
       /* put result into TextViewOutput */
       TextViewOutput->append(result);
    }
    TextViewOutput->append("\n\n================CheckMounts==================\n");
    LScan->setText("");
 
    cmd = "/bin/mount 2>&1";
    owarn << "cmd: " << cmd << oendl;
 
    if ((pipe2 = popen(cmd.latin1(), "r")) == NULL) {
 
       snprintf(result, 256, "Error: Can't run %s", cmd.latin1());
 //         result = "Error: Can't run "+ cmd;
 
       TextViewOutput->append(result);
       return;
    }
    /* parse output and display in ListViewScan */
    while(fgets(result, 256, pipe2) != NULL) {
       /* put result into TextViewOutput */
       TextViewOutput->append(result);
    }
 
    TextViewOutput->append("\n\n============================================\n");
    scanning = false;
 }