remove last popen. add umount.

3 files changed, 170 insertions, 109 deletions

diff --git a/noncore/net/opie-smb/qsmb.cpp b/noncore/net/opie-smb/qsmb.cpp
index 422b9f3..b978b46 100644
--- a/noncore/net/opie-smb/qsmb.cpp
+++ b/noncore/net/opie-smb/qsmb.cpp
@@ -7,6 +7,7 @@
 #include <qstringlist.h>
 #include <qdir.h>
 #include <qfileinfo.h>
+#include <qtabwidget.h>
 
 #include <qpe/process.h>
 #include <qlabel.h>
@@ -26,12 +27,13 @@
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
-
 #include <rpc/clnt.h>
 
+#include <sys/vfs.h>
+#include <mntent.h>
 
-#include <opie2/odebug.h>
-using namespace Opie::Core;
+// #include <opie2/odebug.h>
+// using namespace Opie::Core;
 
 
 Qsmb::Qsmb( QWidget* parent,  const char* name, WFlags fl )
@@ -39,13 +41,17 @@ Qsmb::Qsmb( QWidget* parent,  const char* name, WFlags fl )
 {
    connect(CBHost, SIGNAL(activated(int)), this, SLOT(hostSelected(int)));
    connect(DoItBtn, SIGNAL(clicked()), this, SLOT(DoItClicked()));
+   connect(UnmountBtn, SIGNAL(clicked()), this, SLOT(umountIt()));
    connect(BtnScan, SIGNAL(clicked()), this, SLOT(scanClicked()));
    connect(BtnClear, SIGNAL(clicked()), this, SLOT(clear()));
 
+   mountpt->setEditable(true);
    mountpt->insertItem("/mnt/samba1",-1);
    mountpt->insertItem("/mnt/samba2",-1);
    mountpt->insertItem("/mnt/samba3",-1);
-
+   
+//   TextViewOutput
+   
    top_element = NULL;
    scanning = false;
 }
@@ -71,7 +77,7 @@ void Qsmb::scanClicked()
 void Qsmb::DoItClicked() 
 {
 
-   if(! ListViewScan->selectedItem()) {
+   if( !ListViewScan->selectedItem()) {
       QMessageBox::warning(this, tr("Error"),tr("<p>No share selected!</p>"));
       return;
    }
@@ -95,8 +101,6 @@ void* runitm(void* arg)
 
 void Qsmb::scan() 
 {
-//   int i;
-
    if (scanning) return;
    scanning = true;
 
@@ -109,7 +113,7 @@ void Qsmb::scan()
    get_myaddress( &my_addr);
 
    QString ip = inet_ntoa( my_addr.sin_addr);
-   owarn << "IP Address : " << ip<< oendl;
+   qWarning("IP Address : "+ip);
 
    match = ip.left(5);
 
@@ -147,13 +151,13 @@ void Qsmb::scan()
    scanning = false;
 }
 
-void Qsmb::hostSelected(int index)
+void Qsmb::hostSelected(int /*index*/ )
 {
-   owarn << "hostSelected" << oendl;
    QListViewItem *element;
-   QListViewItem *parent;
+//   QListViewItem *parent;
 
    QString text = CBHost->currentText();
+   ListViewScan->clear();
 
    if (scanning) return;
    scanning = true;
@@ -186,7 +190,9 @@ void Qsmb::hostSelected(int index)
          QStringList token = QStringList::split(' ',  tmp );
          share = token[0];
          comment = token[2];
-         element = new QListViewItem(ListViewScan,share, comment);
+         share = share.stripWhiteSpace();
+         comment = comment.stripWhiteSpace();
+         element = new QListViewItem(ListViewScan, share, comment);
          element->setOpen(true);
 //             top_element = element;
 //             parent = element;
@@ -250,125 +256,153 @@ void Qsmb::hostSelected(int index)
    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;
-   bool err = false;
+   QString mount = mountpt->currentText();
+   if(isMounted(mount)) {
+      qWarning(mount +" is already mounted");
+      TextViewOutput->append(mount +" is already mounted");
+      return;
+   }
+   
+   bool noerr = false;
 
-   char share[512];
+   QString share;
    QString cmd;
    QString cmd2;
-   char result[256];
-//   QString result;
    QString text = mountpt->currentText();
-
-   FILE *pipe,*pipe2;
+   QStringList ccmd;
 
    LScan->setText("Mounting...");
    qApp->processEvents();
 
-
-   if(! QFileInfo(text).exists()) {
-      QStringList ccmd;
+   if( !QFileInfo(text).exists()) {
       ccmd << "mkdir";
       ccmd << "-p";
       ccmd << text;
 
-      owarn<<"cmd: "<< ccmd << oendl;
+      qWarning( "cmd: "+ ccmd.join(" "));
       runCommand(ccmd);
    }
 
+   share = element->text(0);
+   qWarning("selected share is "+share);
 
-   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()+" -o username="+username->text()+",password="+password->text();
-
-   owarn << "cmd: " << cmd << oendl;
-   TextViewOutput->append(cmd.latin1());
+   QString service = CBHost->currentText();
+   service = service.stripWhiteSpace();
+   if(mount.left(1) != "/")
+      mount = QDir::currentDirPath()+"/"+mount;
+   mount = mount.stripWhiteSpace();
+   ccmd.clear();
+   
+   ccmd << "/usr/bin/smbmount";
+   ccmd << "//"+ service+"/"+share;
+   ccmd << mount;
+   ccmd << "-o";
+   ccmd << "username="+username->text()+",password="+password->text()+"";
 
+   TextViewOutput->append(ccmd.join(" ").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());
-         return;
-      }
-      /* parse output and display in ListViewScan */
-      while(fgets(result, 256, pipe) != NULL) {
-      }
-   }
-	
-
-   /* 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);
+      qWarning("Saving Setting permanently...");
+      QFile sambenv("/opt/QtPalmtop/etc/samba.env");
+      QTextStream smbv(&sambenv);
+      sambenv.open(IO_WriteOnly);
+      smbv << ccmd.join(" ") ;
+      sambenv.close();
    }
 
+   noerr = runCommand(ccmd);
    
-   TextViewOutput->append("\n\n================CheckMounts==================\n");
    LScan->setText("");
 
-   cmd = "/bin/mount 2>&1";
-   owarn << "cmd: " << cmd << oendl;
-
-   if ((pipe2 = popen(cmd.latin1(), "r")) == NULL) {
+   if(noerr) {
+      element->setText(2, mount);
+      TextViewOutput->append("\n\n================CheckMounts==================\n");
+      ccmd = "/bin/mount";
+      runCommand(ccmd);
+      TextViewOutput->append("\n\n============================================\n");
+      qApp->processEvents();
+   } else {
+   //do nothing
+ }
 
-      snprintf(result, 256, "Error: Can't run %s", cmd.latin1());
-//         result = "Error: Can't run "+ cmd;
+   scanning = false;
+}
 
-      TextViewOutput->append(result);
+void Qsmb::umountIt()
+{
+   QString mount = mountpt->currentText();
+   if(!isMounted(mount)) {
+      qWarning(mount +" is not mounted");
+      TextViewOutput->append(mount +" is not mounted");
       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;
+   QStringList ccmd;
+   QString share;
+   QListViewItem *element;
+   element = ListViewScan->selectedItem();
+   share = element->text(0);
+   qWarning("selected share is "+share);
+
+   if(mount.left(1) != "/")
+      mount = QDir::currentDirPath()+"/"+mount;
+   mount = mount.stripWhiteSpace();
+
+   ccmd << "/usr/bin/smbumount";
+   ccmd << mount;
+   runCommand(ccmd);
+
+   element->setText(2, "");
+
+   ccmd = "/bin/mount";
+   runCommand(ccmd);
 }
 
 bool Qsmb::runCommand(const QStringList & command) {
-   owarn << "runCommand " << command.join(" ") << oendl;
+   qWarning( "runCommand " + command.join(" ") );
+   TextViewOutput->append(command.join(" "));
    out = "";
    Process ipkg_status( command);
    bool r = ipkg_status.exec("",out);
 
-   if(!r) {
-      QMessageBox::warning(this, tr("Error!!"),tr("<p>"+out+"</p>"));
-   }
+   qWarning("result is %d"+ r );
+   qWarning("Output " + out );
+   TextViewOutput->append(out);
 
-   owarn << "Output " << out << oendl;
-   TextViewOutput->append(out.latin1());
+//very hacky
+   if(out.find("failed") !=-1) {
+      r = false;
+   }
    return r;
 }
 
 
+bool Qsmb::isMounted(const QString &mountPoint) {
+    struct mntent *me;
+    bool mounted = false;
+    FILE *mntfp = setmntent( "/etc/mtab", "r" );
+    if ( mntfp ){
+        while ( (me = getmntent( mntfp )) != 0 ) {
+            QString deviceName = me->mnt_fsname;
+            QString mountDir = me->mnt_dir;
+            QString fsType = me->mnt_type;
+            if( fsType == "smbfs" && mountDir.find(mountPoint) !=-1)
+               mounted = true;
+        }
+    }
+    endmntent( mntfp );
+    return mounted;
+}
diff --git a/noncore/net/opie-smb/qsmb.h b/noncore/net/opie-smb/qsmb.h
index b406a1e..fba94d0 100644
--- a/noncore/net/opie-smb/qsmb.h
+++ b/noncore/net/opie-smb/qsmb.h
@@ -12,26 +12,28 @@
 
 class Qsmb : public FormQPESMBBase
 { 
-    Q_OBJECT
+   Q_OBJECT
 
 public:
-    static QString appName() { return QString::fromLatin1("opie-smb"); }
-    Qsmb( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~Qsmb();
-     void scan();
-     void DoIt();
+   static QString appName() { return QString::fromLatin1("opie-smb"); }
+   Qsmb( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+   ~Qsmb();
+   void scan();
+   void DoIt();
 
 private:
-        QListViewItem *top_element;
-        QComboBox *hosts;
-        pthread_t tpid;
-	bool scanning;
+   QListViewItem *top_element;
+   QComboBox *hosts;
+   pthread_t tpid;
+   bool scanning;
+   bool isMounted(const QString &);
 
 public slots:
    void clear();
 	 void scanClicked();
    void hostSelected(int);
    void DoItClicked();
+   void umountIt();
    QString out;
    bool runCommand(const QStringList &);
 
diff --git a/noncore/net/opie-smb/qsmbbase.ui b/noncore/net/opie-smb/qsmbbase.ui
index 297eb2a..4692282 100644
--- a/noncore/net/opie-smb/qsmbbase.ui
+++ b/noncore/net/opie-smb/qsmbbase.ui
@@ -11,8 +11,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>250</width>
-            <height>352</height>
+            <width>259</width>
+            <height>395</height>
         </rect>
     </property>
     <property stdset="1">
@@ -68,7 +68,7 @@
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
-                        <number>0</number>
+                        <number>2</number>
                     </property>
                     <widget row="1"  column="0"  rowspan="1"  colspan="4" >
                         <class>QComboBox</class>
@@ -136,6 +136,20 @@
                                 <bool>true</bool>
                             </property>
                         </column>
+                        <column>
+                            <property>
+                                <name>text</name>
+                                <string>Mount</string>
+                            </property>
+                            <property>
+                                <name>clickable</name>
+                                <bool>true</bool>
+                            </property>
+                            <property>
+                                <name>resizeable</name>
+                                <bool>true</bool>
+                            </property>
+                        </column>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>ListViewScan</cstring>
@@ -178,18 +192,7 @@
                             <string>Reconnect on boot</string>
                         </property>
                     </widget>
-                    <widget row="5"  column="0"  rowspan="1"  colspan="2" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>DoItBtn</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>&amp;Mount</string>
-                        </property>
-                    </widget>
-                    <widget row="5"  column="2"  rowspan="1"  colspan="2" >
+                    <widget row="5"  column="2"  rowspan="2"  colspan="2" >
                         <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
@@ -276,6 +279,28 @@
                             </widget>
                         </grid>
                     </widget>
+                    <widget row="6"  column="0"  rowspan="1"  colspan="2" >
+                        <class>QPushButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>UnmountBtn</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>&amp;Umount</string>
+                        </property>
+                    </widget>
+                    <widget row="5"  column="0"  rowspan="1"  colspan="2" >
+                        <class>QPushButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>DoItBtn</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>&amp;Mount</string>
+                        </property>
+                    </widget>
                 </grid>
             </widget>
             <widget>
@@ -291,11 +316,11 @@
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>11</number>
+                        <number>2</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
-                        <number>6</number>
+                        <number>2</number>
                     </property>
                     <widget row="0"  column="0" >
                         <class>QTextView</class>