1 files changed, 25 insertions, 55 deletions

diff --git a/noncore/net/opie-smb/qsmb.cpp b/noncore/net/opie-smb/qsmb.cpp
index d6d1b23..c1ee9a9 100644
--- a/noncore/net/opie-smb/qsmb.cpp
+++ b/noncore/net/opie-smb/qsmb.cpp
@@ -1,222 +1,192 @@
 #include "qsmb.h"
 #include <qpushbutton.h>
 #include <qpe/qpeapplication.h>
 
 #include <string.h>
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 
 #include <qpe/process.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
 #include <qstringlist.h>
 #include <qcheckbox.h>
 #include <qtextview.h>
 #include <qmessagebox.h>
+#include <qtextstream.h>
 
 
 #include <pthread.h>
 #include <signal.h>
 #include <ctype.h>
 
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include <rpc/clnt.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()));
 
    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;
 
    QString match;
-   char lmhosts[512];
    QString cmd;
-   char result[256];
-
-   FILE *pipe, *pipe2;
-
    LScan->setText("Scanning...");
    qApp->processEvents();
 
    sockaddr_in my_addr;
    get_myaddress( &my_addr);
 
    QString ip = inet_ntoa( my_addr.sin_addr);
    owarn << "IP Address : " << ip<< oendl;
 
    match = ip.left(5);
 
-   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;
-   }
+   QStringList ccmd;
+   TextViewOutput->append("smbfind");
 
+   QFile lmhosts("/etc/samba/lmhosts");
+   QTextStream lms(&lmhosts);
+   lmhosts.open(IO_WriteOnly);
+   lms << "127.0.0.1 localhost\n";
+    
    /* parse output and display in ListViewScan */
-   while(fgets(result, 256, pipe) != NULL) {
-      /* put result into TextViewOutput */
-      TextViewOutput->append(result);
-
-      if( strstr(result, match.latin1()) != 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;
-         
+   ccmd = "smbfind";
+   owarn <<"cmd: " << ccmd << oendl;
+         runCommand(ccmd);
+
+   QTextStream s(&out, IO_ReadOnly);
+
+   while ( !s.atEnd() ) {
+      QString ip_addr, host, output;
+      QString tmp = s.readLine();
+      bool ok;
+      tmp.left(1).toInt( &ok, 10 );
+      if(ok) {
+         QStringList token = QStringList::split(' ',  tmp );
+         ip_addr =  token[0];
+         host = token[1];
          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;
-         }
+         lms <<  ip_addr+" "+host+"\n";
       }
    }
+   lmhosts.close();
 
    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(username->text().isEmpty())
       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;