-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*/ ) | |||
163 | { | 163 | { |
164 | QListViewItem *element; | 164 | QListViewItem *element; |
165 | // QListViewItem *parent; | 165 | // QListViewItem *parent; |
166 | 166 | ||
167 | QString text = CBHost->currentText(); | 167 | QString text = CBHost->currentText(); |
168 | ListViewScan->clear(); | 168 | ListViewScan->clear(); |
169 | 169 | ||
170 | if (scanning) return; | 170 | if (scanning) return; |
171 | scanning = true; | 171 | scanning = true; |
172 | 172 | ||
173 | QString cmd; | 173 | QString cmd; |
174 | QStringList ccmd; | 174 | QStringList ccmd; |
175 | 175 | ||
176 | LScan->setText("Scanning..."); | 176 | LScan->setText("Scanning..."); |
177 | 177 | ||
178 | ccmd << "/usr/bin/smbclient"; | 178 | ccmd << "/usr/bin/smbclient"; |
179 | ccmd << "-L"; | 179 | ccmd << "-L"; |
180 | ccmd << CBHost->currentText(); | 180 | ccmd << CBHost->currentText(); |
181 | ccmd << "-N"; | 181 | ccmd << "-N"; |
182 | 182 | ||
183 | if(username->text().isEmpty()) { | 183 | if(username->text().isEmpty()) { |
184 | //do nothing | 184 | //do nothing |
185 | } else { | 185 | } else { |
186 | ccmd << "-U"; | 186 | ccmd << "-U"; |
187 | ccmd << username->text()+"\%"+ password->text(); | 187 | ccmd << username->text()+"\%"+ password->text(); |
188 | } | 188 | } |
189 | runCommand(ccmd); | 189 | runCommand(ccmd); |
190 | QTextStream s(&out, IO_ReadOnly); | 190 | QTextStream s(&out, IO_ReadOnly); |
191 | 191 | ||
192 | while ( !s.atEnd() ) { | 192 | while ( !s.atEnd() ) { |
193 | QString share; | 193 | QString share; |
194 | QString comment; | 194 | QString comment; |
195 | QString mount; | ||
195 | QString tmp = s.readLine(); | 196 | QString tmp = s.readLine(); |
196 | 197 | ||
197 | if( tmp.find("$") == -1 && tmp.find("Disk") != -1) { | 198 | if( tmp.find("$") == -1 && tmp.find("Disk") != -1) { |
198 | QStringList token = QStringList::split(' ', tmp ); | 199 | QStringList token = QStringList::split(' ', tmp ); |
199 | share = token[0]; | 200 | share = token[0]; |
200 | comment = token[2]; | 201 | comment = token[2]; |
201 | share = share.stripWhiteSpace(); | 202 | share = share.stripWhiteSpace(); |
202 | comment = comment.stripWhiteSpace(); | 203 | comment = comment.stripWhiteSpace(); |
203 | element = new QListViewItem(ListViewScan, share, comment); | 204 | // if(isMounted(share)) |
205 | |||
206 | mount = getMount(share); | ||
207 | element = new QListViewItem(ListViewScan, share, comment, mount); | ||
204 | element->setOpen(true); | 208 | element->setOpen(true); |
205 | // top_element = element; | 209 | // top_element = element; |
206 | // parent = element; | 210 | // parent = element; |
207 | } | 211 | } |
208 | 212 | ||
209 | } | 213 | } |
210 | // owarn << "i="<< index << "cmd:" << cmd << oendl; | 214 | // owarn << "i="<< index << "cmd:" << cmd << oendl; |
211 | 215 | ||
212 | TextViewOutput->append(cmd); | 216 | TextViewOutput->append(cmd); |
213 | 217 | ||
214 | /* run smbclient & read output */ | 218 | /* run smbclient & read output */ |
215 | // if ((pipe = popen(cmd.latin1(), "r")) == NULL) { | 219 | // if ((pipe = popen(cmd.latin1(), "r")) == NULL) { |
216 | // snprintf(result, 256, "Error: Can't run %s", cmd.latin1()); | 220 | // snprintf(result, 256, "Error: Can't run %s", cmd.latin1()); |
217 | // // cmd = "Error: Can't run "+cmd; | 221 | // // cmd = "Error: Can't run "+cmd; |
218 | // TextViewOutput->append(result); | 222 | // TextViewOutput->append(result); |
219 | // return; | 223 | // return; |
220 | // } | 224 | // } |
221 | 225 | ||
222 | /* parse output and display in ListViewScan */ | 226 | /* parse output and display in ListViewScan */ |
223 | // while(fgets(result, 256, pipe) != NULL) { | 227 | // while(fgets(result, 256, pipe) != NULL) { |
224 | // /* put result into TextViewOutput */ | 228 | // /* put result into TextViewOutput */ |
225 | // TextViewOutput->append(result); | 229 | // TextViewOutput->append(result); |
226 | 230 | ||
227 | // if( strchr(result, '$') == NULL ) { | 231 | // if( strchr(result, '$') == NULL ) { |
228 | // char share[256], *ptr1; | 232 | // char share[256], *ptr1; |
229 | 233 | ||
230 | // strcpy(share,result); | 234 | // strcpy(share,result); |
231 | // ptr1 = strchr(share,' '); | 235 | // ptr1 = strchr(share,' '); |
232 | // share[ptr1 - share]='\0'; | 236 | // share[ptr1 - share]='\0'; |
233 | 237 | ||
234 | // owarn<< "add share: " << share << oendl; | 238 | // owarn<< "add share: " << share << oendl; |
235 | 239 | ||
@@ -291,126 +295,143 @@ void Qsmb::DoIt() | |||
291 | QString cmd2; | 295 | QString cmd2; |
292 | QString text = mountpt->currentText(); | 296 | QString text = mountpt->currentText(); |
293 | QStringList ccmd; | 297 | QStringList ccmd; |
294 | 298 | ||
295 | LScan->setText("Mounting..."); | 299 | LScan->setText("Mounting..."); |
296 | qApp->processEvents(); | 300 | qApp->processEvents(); |
297 | 301 | ||
298 | if( !QFileInfo(text).exists()) { | 302 | if( !QFileInfo(text).exists()) { |
299 | ccmd << "mkdir"; | 303 | ccmd << "mkdir"; |
300 | ccmd << "-p"; | 304 | ccmd << "-p"; |
301 | ccmd << text; | 305 | ccmd << text; |
302 | 306 | ||
303 | qWarning( "cmd: "+ ccmd.join(" ")); | 307 | qWarning( "cmd: "+ ccmd.join(" ")); |
304 | runCommand(ccmd); | 308 | runCommand(ccmd); |
305 | } | 309 | } |
306 | 310 | ||
307 | share = element->text(0); | 311 | share = element->text(0); |
308 | qWarning("selected share is "+share); | 312 | qWarning("selected share is "+share); |
309 | 313 | ||
310 | QString service = CBHost->currentText(); | 314 | QString service = CBHost->currentText(); |
311 | service = service.stripWhiteSpace(); | 315 | service = service.stripWhiteSpace(); |
312 | if(mount.left(1) != "/") | 316 | if(mount.left(1) != "/") |
313 | mount = QDir::currentDirPath()+"/"+mount; | 317 | mount = QDir::currentDirPath()+"/"+mount; |
314 | mount = mount.stripWhiteSpace(); | 318 | mount = mount.stripWhiteSpace(); |
315 | ccmd.clear(); | 319 | ccmd.clear(); |
316 | 320 | ||
317 | ccmd << "/usr/bin/smbmount"; | 321 | ccmd << "/usr/bin/smbmount"; |
318 | ccmd << "//"+ service+"/"+share; | 322 | ccmd << "//"+ service+"/"+share; |
319 | ccmd << mount; | 323 | ccmd << mount; |
320 | ccmd << "-o"; | 324 | ccmd << "-o"; |
321 | ccmd << "username="+username->text()+",password="+password->text()+""; | 325 | ccmd << "username="+username->text()+",password="+password->text()+""; |
322 | 326 | ||
323 | TextViewOutput->append(ccmd.join(" ").latin1()); | ||
324 | |||
325 | if(onbootBtn->isChecked()) { | 327 | if(onbootBtn->isChecked()) { |
326 | qWarning("Saving Setting permanently..."); | 328 | qWarning("Saving Setting permanently..."); |
327 | QFile sambenv("/opt/QtPalmtop/etc/samba.env"); | 329 | QFile sambenv("/opt/QtPalmtop/etc/samba.env"); |
328 | QTextStream smbv(&sambenv); | 330 | QTextStream smbv(&sambenv); |
329 | sambenv.open(IO_WriteOnly); | 331 | sambenv.open(IO_WriteOnly); |
330 | smbv << ccmd.join(" ") ; | 332 | smbv << ccmd.join(" ") ; |
331 | sambenv.close(); | 333 | sambenv.close(); |
332 | } | 334 | } |
333 | 335 | ||
334 | noerr = runCommand(ccmd); | 336 | noerr = runCommand(ccmd); |
335 | 337 | ||
336 | LScan->setText(""); | 338 | LScan->setText(""); |
337 | 339 | ||
338 | if(noerr) { | 340 | if(noerr && isMounted(mount)) { |
339 | element->setText(2, mount); | 341 | element->setText(2, mount); |
340 | TextViewOutput->append("\n\n================CheckMounts==================\n"); | 342 | TextViewOutput->append("\n\n================CheckMounts==================\n"); |
341 | ccmd = "/bin/mount"; | 343 | ccmd = "/bin/mount"; |
342 | runCommand(ccmd); | 344 | runCommand(ccmd); |
343 | TextViewOutput->append("\n\n============================================\n"); | 345 | TextViewOutput->append("\n\n============================================\n"); |
344 | qApp->processEvents(); | 346 | qApp->processEvents(); |
345 | } else { | 347 | } else { |
346 | //do nothing | 348 | //do nothing |
347 | } | 349 | } |
348 | 350 | ||
349 | scanning = false; | 351 | scanning = false; |
350 | } | 352 | } |
351 | 353 | ||
352 | void Qsmb::umountIt() | 354 | void Qsmb::umountIt() |
353 | { | 355 | { |
354 | QString mount = mountpt->currentText(); | 356 | QString mount = mountpt->currentText(); |
355 | if(!isMounted(mount)) { | 357 | if(!isMounted(mount)) { |
356 | qWarning(mount +" is not mounted"); | 358 | qWarning(mount +" is not mounted"); |
357 | TextViewOutput->append(mount +" is not mounted"); | 359 | TextViewOutput->append(mount +" is not mounted"); |
358 | return; | 360 | return; |
359 | } | 361 | } |
360 | 362 | ||
361 | QStringList ccmd; | 363 | QStringList ccmd; |
362 | QString share; | 364 | QString share; |
363 | QListViewItem *element; | 365 | QListViewItem *element; |
364 | element = ListViewScan->selectedItem(); | 366 | element = ListViewScan->selectedItem(); |
365 | share = element->text(0); | 367 | share = element->text(0); |
366 | qWarning("selected share is "+share); | 368 | qWarning("selected share is "+share); |
367 | 369 | ||
368 | if(mount.left(1) != "/") | 370 | if(mount.left(1) != "/") |
369 | mount = QDir::currentDirPath()+"/"+mount; | 371 | mount = QDir::currentDirPath()+"/"+mount; |
370 | mount = mount.stripWhiteSpace(); | 372 | mount = mount.stripWhiteSpace(); |
371 | 373 | ||
372 | ccmd << "/usr/bin/smbumount"; | 374 | ccmd << "/usr/bin/smbumount"; |
373 | ccmd << mount; | 375 | ccmd << mount; |
374 | runCommand(ccmd); | 376 | runCommand(ccmd); |
375 | 377 | ||
376 | element->setText(2, ""); | 378 | element->setText(2, ""); |
377 | 379 | ||
378 | ccmd = "/bin/mount"; | 380 | ccmd = "/bin/mount"; |
379 | runCommand(ccmd); | 381 | runCommand(ccmd); |
380 | } | 382 | } |
381 | 383 | ||
382 | bool Qsmb::runCommand(const QStringList & command) { | 384 | bool Qsmb::runCommand(const QStringList & command) { |
383 | qWarning( "runCommand " + command.join(" ") ); | 385 | qWarning( "runCommand " + command.join(" ") ); |
384 | TextViewOutput->append(command.join(" ")); | 386 | TextViewOutput->append(command.join(" ")); |
385 | out = ""; | 387 | out = ""; |
386 | Process ipkg_status( command); | 388 | Process ipkg_status( command); |
387 | bool r = ipkg_status.exec("",out); | 389 | bool r = ipkg_status.exec("",out); |
388 | 390 | ||
389 | qWarning("result is %d"+ r ); | 391 | qWarning("result is %d"+ r ); |
390 | qWarning("Output " + out ); | 392 | qWarning("Output " + out ); |
391 | TextViewOutput->append(out); | 393 | TextViewOutput->append(out); |
392 | 394 | ||
393 | //very hacky | 395 | //very hacky |
394 | if(out.find("failed") !=-1) { | 396 | if(out.find("failed") !=-1) { |
395 | r = false; | 397 | r = false; |
396 | } | 398 | } |
397 | return r; | 399 | return r; |
398 | } | 400 | } |
399 | 401 | ||
400 | 402 | ||
401 | bool Qsmb::isMounted(const QString &mountPoint) { | 403 | bool Qsmb::isMounted(const QString &mountPoint) |
404 | { | ||
402 | struct mntent *me; | 405 | struct mntent *me; |
403 | bool mounted = false; | 406 | bool mounted = false; |
404 | FILE *mntfp = setmntent( "/etc/mtab", "r" ); | 407 | FILE *mntfp = setmntent( "/etc/mtab", "r" ); |
405 | if ( mntfp ){ | 408 | if ( mntfp ){ |
406 | while ( (me = getmntent( mntfp )) != 0 ) { | 409 | while ( (me = getmntent( mntfp )) != 0 ) { |
407 | QString deviceName = me->mnt_fsname; | 410 | QString deviceName = me->mnt_fsname; |
408 | QString mountDir = me->mnt_dir; | 411 | QString mountDir = me->mnt_dir; |
409 | QString fsType = me->mnt_type; | 412 | QString fsType = me->mnt_type; |
410 | if( fsType == "smbfs" && mountDir.find(mountPoint) !=-1) | 413 | if( fsType == "smbfs" && (mountDir.find(mountPoint) != -1 | deviceName.find(mountPoint) != -1)) |
411 | mounted = true; | 414 | mounted = true; |
412 | } | 415 | } |
413 | } | 416 | } |
414 | endmntent( mntfp ); | 417 | endmntent( mntfp ); |
415 | return mounted; | 418 | return mounted; |
416 | } | 419 | } |
420 | |||
421 | QString Qsmb::getMount(const QString &shareName) | ||
422 | { | ||
423 | struct mntent *me; | ||
424 | QString mount; | ||
425 | FILE *mntfp = setmntent( "/etc/mtab", "r" ); | ||
426 | if ( mntfp ){ | ||
427 | while ( (me = getmntent( mntfp )) != 0 ) { | ||
428 | QString deviceName = me->mnt_fsname; | ||
429 | QString mountDir = me->mnt_dir; | ||
430 | QString fsType = me->mnt_type; | ||
431 | if( fsType == "smbfs" && deviceName.find(shareName) != -1) | ||
432 | mount = mountDir; | ||
433 | } | ||
434 | } | ||
435 | endmntent( mntfp ); | ||
436 | return mount; | ||
437 | } | ||
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 @@ | |||
1 | #ifndef QSMB_H | 1 | #ifndef QSMB_H |
2 | #define QSMB_H | 2 | #define QSMB_H |
3 | 3 | ||
4 | #include "qsmbbase.h" | 4 | #include "qsmbbase.h" |
5 | 5 | ||
6 | #include <stdlib.h> | 6 | #include <stdlib.h> |
7 | #include <stdlib.h> | 7 | #include <stdlib.h> |
8 | #include <stdio.h> | 8 | #include <stdio.h> |
9 | 9 | ||
10 | #include <qlistview.h> | 10 | #include <qlistview.h> |
11 | #include <pthread.h> | 11 | #include <pthread.h> |
12 | 12 | ||
13 | class Qsmb : public FormQPESMBBase | 13 | class Qsmb : public FormQPESMBBase |
14 | { | 14 | { |
15 | Q_OBJECT | 15 | Q_OBJECT |
16 | 16 | ||
17 | public: | 17 | public: |
18 | static QString appName() { return QString::fromLatin1("opie-smb"); } | 18 | static QString appName() { return QString::fromLatin1("opie-smb"); } |
19 | Qsmb( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 19 | Qsmb( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
20 | ~Qsmb(); | 20 | ~Qsmb(); |
21 | void scan(); | 21 | void scan(); |
22 | void DoIt(); | 22 | void DoIt(); |
23 | 23 | ||
24 | private: | 24 | private: |
25 | QListViewItem *top_element; | 25 | QListViewItem *top_element; |
26 | QComboBox *hosts; | 26 | QComboBox *hosts; |
27 | pthread_t tpid; | 27 | pthread_t tpid; |
28 | bool scanning; | 28 | bool scanning; |
29 | bool isMounted(const QString &); | 29 | bool isMounted(const QString &); |
30 | QString getMount(const QString &); | ||
30 | 31 | ||
31 | public slots: | 32 | public slots: |
32 | void clear(); | 33 | void clear(); |
33 | void scanClicked(); | 34 | void scanClicked(); |
34 | void hostSelected(int); | 35 | void hostSelected(int); |
35 | void DoItClicked(); | 36 | void DoItClicked(); |
36 | void umountIt(); | 37 | void umountIt(); |
37 | QString out; | 38 | QString out; |
38 | bool runCommand(const QStringList &); | 39 | bool runCommand(const QStringList &); |
39 | 40 | ||
40 | }; | 41 | }; |
41 | void* runit(void *arg); | 42 | void* runit(void *arg); |
42 | void* runitm(void *arg); | 43 | void* runitm(void *arg); |
43 | 44 | ||
44 | #endif // QSMB_H | 45 | #endif // QSMB_H |