summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2005-08-16 09:32:25 (UTC)
committer llornkcor <llornkcor>2005-08-16 09:32:25 (UTC)
commit8c44cc4fdb67ea6b96cf7e49ec648de4049a9f1c (patch) (side-by-side diff)
tree28fbe8466b5b93173513402f7b46e6c7ce5222ac
parent2176aa6c353e794798aa8ecddc28be365e94989c (diff)
downloadopie-8c44cc4fdb67ea6b96cf7e49ec648de4049a9f1c.zip
opie-8c44cc4fdb67ea6b96cf7e49ec648de4049a9f1c.tar.gz
opie-8c44cc4fdb67ea6b96cf7e49ec648de4049a9f1c.tar.bz2
add current mount when selecting server
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opie-smb/qsmb.cpp33
-rw-r--r--noncore/net/opie-smb/qsmb.h1
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
@@ -189,21 +189,25 @@ void Qsmb::hostSelected(int /*index*/ )
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;
}
}
@@ -317,14 +321,12 @@ void Qsmb::DoIt()
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(" ") ;
@@ -332,13 +334,13 @@ void Qsmb::DoIt()
}
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();
@@ -395,22 +397,41 @@ bool Qsmb::runCommand(const QStringList & command) {
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
@@ -24,12 +24,13 @@ public:
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();