2 files changed, 28 insertions, 6 deletions

diff --git a/noncore/net/opie-smb/qsmb.cpp b/noncore/net/opie-smb/qsmb.cpp
index e2ddc7f..7f3ae89 100644
--- a/noncore/net/opie-smb/qsmb.cpp
+++ b/noncore/net/opie-smb/qsmb.cpp
@@ -183,33 +183,37 @@ void Qsmb::hostSelected(int /*index*/ )
    if(username->text().isEmpty()) {
       //do nothing
    } else {
       ccmd << "-U";
       ccmd << username->text()+"\%"+ password->text();
    }
    runCommand(ccmd);
    QTextStream s(&out, IO_ReadOnly);
 
    while ( !s.atEnd() ) {
       QString share;
       QString comment;
+      QString mount;
       QString tmp = s.readLine();
       
       if( tmp.find("$") == -1 && tmp.find("Disk") != -1) {
          QStringList token = QStringList::split(' ',  tmp );
          share = token[0];
          comment = token[2];
          share = share.stripWhiteSpace();
          comment = comment.stripWhiteSpace();
-         element = new QListViewItem(ListViewScan, share, comment);
+//         if(isMounted(share))
+
+         mount = getMount(share);
+         element = new QListViewItem(ListViewScan, share, comment, mount);
          element->setOpen(true);
 //             top_element = element;
 //             parent = element;
       }
 
    }
 //   owarn << "i="<< index << "cmd:" <<  cmd << oendl;
 
    TextViewOutput->append(cmd);
 
    /* run smbclient & read output */
 //    if ((pipe = popen(cmd.latin1(), "r")) == NULL) {
@@ -311,40 +315,38 @@ void Qsmb::DoIt()
    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()) {
       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);
    
    LScan->setText("");
 
-   if(noerr) {
+   if(noerr && isMounted(mount)) {
       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
  }
 
    scanning = false;
 }
@@ -389,28 +391,47 @@ bool Qsmb::runCommand(const QStringList & command) {
    qWarning("result is %d"+ r );
    qWarning("Output " + out );
    TextViewOutput->append(out);
 
 //very hacky
    if(out.find("failed") !=-1) {
       r = false;
    }
    return r;
 }
 
 
-bool Qsmb::isMounted(const QString &mountPoint) {
+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)
+            if( fsType == "smbfs" && (mountDir.find(mountPoint) != -1 | deviceName.find(mountPoint) != -1))
                mounted = true;
         }
     }
     endmntent( mntfp );
     return mounted;
 }
+
+QString Qsmb::getMount(const QString &shareName)
+{
+   struct mntent *me;
+    QString mount;
+    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" &&  deviceName.find(shareName) != -1)
+               mount = mountDir;
+        }
+    }
+    endmntent( mntfp );
+    return mount;
+}
diff --git a/noncore/net/opie-smb/qsmb.h b/noncore/net/opie-smb/qsmb.h
index fba94d0..abf27da 100644
--- a/noncore/net/opie-smb/qsmb.h
+++ b/noncore/net/opie-smb/qsmb.h
@@ -18,24 +18,25 @@ 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();
 
 private:
    QListViewItem *top_element;
    QComboBox *hosts;
    pthread_t tpid;
    bool scanning;
    bool isMounted(const QString &);
+   QString getMount(const QString &);
 
 public slots:
    void clear();
 	 void scanClicked();
    void hostSelected(int);
    void DoItClicked();
    void umountIt();
    QString out;
    bool runCommand(const QStringList &);
 
 };
 void* runit(void *arg);