-rw-r--r-- | noncore/net/opie-smb/qsmb.cpp | 33 |
1 files changed, 27 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 @@ -187,25 +187,29 @@ void Qsmb::hostSelected(int /*index*/ ) 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; @@ -315,32 +319,30 @@ void Qsmb::DoIt() 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 @@ -393,24 +395,43 @@ bool Qsmb::runCommand(const QStringList & command) { //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; +} |