| -rw-r--r-- | noncore/net/opie-smb/qsmb.cpp | 33 | ||||
| -rw-r--r-- | noncore/net/opie-smb/qsmb.h | 1 |
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 @@ -163,73 +163,77 @@ void Qsmb::hostSelected(int /*index*/ ) { QListViewItem *element; // QListViewItem *parent; QString text = CBHost->currentText(); ListViewScan->clear(); if (scanning) return; scanning = true; QString cmd; QStringList ccmd; LScan->setText("Scanning..."); ccmd << "/usr/bin/smbclient"; ccmd << "-L"; ccmd << CBHost->currentText(); ccmd << "-N"; 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) { // snprintf(result, 256, "Error: Can't run %s", cmd.latin1()); // // cmd = "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); // if( strchr(result, '$') == NULL ) { // char share[256], *ptr1; // strcpy(share,result); // ptr1 = strchr(share,' '); // share[ptr1 - share]='\0'; // owarn<< "add share: " << share << oendl; @@ -291,126 +295,143 @@ void Qsmb::DoIt() QString cmd2; QString text = mountpt->currentText(); QStringList ccmd; LScan->setText("Mounting..."); qApp->processEvents(); if( !QFileInfo(text).exists()) { ccmd << "mkdir"; ccmd << "-p"; ccmd << text; qWarning( "cmd: "+ ccmd.join(" ")); runCommand(ccmd); } share = element->text(0); qWarning("selected share is "+share); 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()) { 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; } void Qsmb::umountIt() { QString mount = mountpt->currentText(); if(!isMounted(mount)) { qWarning(mount +" is not mounted"); TextViewOutput->append(mount +" is not mounted"); return; } 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) { qWarning( "runCommand " + command.join(" ") ); TextViewOutput->append(command.join(" ")); out = ""; Process ipkg_status( command); bool r = ipkg_status.exec("",out); 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 @@ -1,44 +1,45 @@ #ifndef QSMB_H #define QSMB_H #include "qsmbbase.h" #include <stdlib.h> #include <stdlib.h> #include <stdio.h> #include <qlistview.h> #include <pthread.h> class Qsmb : public FormQPESMBBase { 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(); 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); void* runitm(void *arg); #endif // QSMB_H |