1 files changed, 39 insertions, 38 deletions

diff --git a/noncore/net/opie-smb/qsmb.cpp b/noncore/net/opie-smb/qsmb.cpp
index 8aa4987..d6d1b23 100644
--- a/noncore/net/opie-smb/qsmb.cpp
+++ b/noncore/net/opie-smb/qsmb.cpp
@@ -5,4 +5,5 @@
 #include <string.h>
 #include <qstring.h>
+#include <qstringlist.h>
 #include <qdir.h>
 #include <qfileinfo.h>
@@ -23,4 +24,10 @@
 
 
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <rpc/clnt.h>
+
+
 #include <opie2/odebug.h>
 using namespace Opie::Core;
@@ -93,5 +100,6 @@ void Qsmb::scan()
    scanning = true;
 
-   char match[512], lmhosts[512];
+   QString match;
+   char lmhosts[512];
    QString cmd;
    char result[256];
@@ -102,20 +110,11 @@ void Qsmb::scan()
    qApp->processEvents();
 
-   cmd = "ifconfig |grep 'addr:'|awk '{print $2}'|awk 'BEGIN{FS=\":\"}{print $2}'|sed 's/\\.[0-9]*$//'|head -n1";
+   sockaddr_in my_addr;
+   get_myaddress( &my_addr);
 
-   owarn << "cmd: " << cmd << oendl;
+   QString ip = inet_ntoa( my_addr.sin_addr);
+   owarn << "IP Address : " << ip<< 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;
+   match = ip.left(5);
 
    cmd = "smbfind";
@@ -144,5 +143,5 @@ void Qsmb::scan()
       TextViewOutput->append(result);
 
-      if( strstr(result, match) != NULL ) { 
+      if( strstr(result, match.latin1()) != NULL ) { 
          char ip_addr[256], host[256], *ptr1;
 
@@ -284,4 +283,5 @@ void Qsmb::DoIt()
 
    int i;
+   bool err = false;
 
    char share[512];
@@ -299,17 +299,24 @@ void Qsmb::DoIt()
 
    if(! QFileInfo(text).exists()) {
-      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);
-      }
+//       /* make sure mount exists! */
+
+//       cmd = "mkdir -p "+ text;
+//       owarn<<"cmd: "<< cmd << oendl;
+//       if ((pipe2 = popen(cmd.latin1(), "r")) == NULL)  {
+//          snprintf(result, 256, "Error: Can't run %s", cmd.latin1());
+//          TextViewOutput->append(result);
+//          return;
+//       }
+//       while(fgets(result, 256, pipe2) != NULL) {
+//          /* put result into TextViewOutput */
+//          TextViewOutput->append(result);
+//       }
+      QStringList ccmd;
+      ccmd << "mkdir";
+      ccmd << "-p";
+      ccmd << text;
+
+      owarn<<"cmd: "<< ccmd << oendl;
+      runCommand(ccmd);
    }
 
@@ -333,26 +340,18 @@ void Qsmb::DoIt()
       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;
@@ -364,4 +363,6 @@ void Qsmb::DoIt()
       TextViewOutput->append(result);
    }
+
+   
    TextViewOutput->append("\n\n================CheckMounts==================\n");
    LScan->setText("");