By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] tdelibs : add support for udisks1 and udisks2 to mount/unmount removable drives (2)

tdelibs-14.0.0-mount_udisks.patch (text/plain), 6.44 KB, created by Francois Andriot on 2013-11-11 15:42:29 CST

(hide)

Description: tdelibs : add support for udisks1 and udisks2 to mount/unmount removable drives (2)

Filename:

MIME Type:

Creator: Francois Andriot

Created: 2013-11-11 15:42:29 CST

Size: 6.44 KB

patch

obsolete

>--- tdelibs/tdecore/tdehw/tdestoragedevice.cpp 2013-08-27 00:00:04.560040521 +0200 >+++ tdelibs/tdecore/tdehw/tdestoragedevice.cpp.new 2013-11-11 22:29:26.120599489 +0100 >@@ -32,6 +32,7 @@ > #include "tdeglobal.h" > #include "kiconloader.h" > #include "tdetempfile.h" >+#include <kstandarddirs.h> > > #include "tdehardwaredevices.h" > >@@ -601,45 +602,150 @@ > > TQString ret = mountPath(); > >+ // Device is already mounted > if (!ret.isNull()) { > return ret; > } > >- // Create dummy password file >- KTempFile passwordFile(TQString::null, "tmp", 0600); >- passwordFile.setAutoDelete(true); >+ TQString epath = getenv("PATH"); >+ TQString path = TQString::fromLatin1("/sbin:/bin"); >+ if (!epath.isEmpty()) { >+ path += ":" + epath; >+ } > >- TQString optionString; >- if (mountOptions["ro"] == "true") { >- optionString.append(" -r"); >- } >- >- if (mountOptions["atime"] != "true") { >- optionString.append(" -A"); >- } >- >- if (mountOptions["utf8"] == "true") { >- optionString.append(" -c utf8"); >- } >- >- if (mountOptions["sync"] == "true") { >- optionString.append(" -s"); >+ TQString command; >+ TQString devNode = deviceNode(); >+ devNode.replace("'", "'\\''"); >+ mediaName.replace("'", "'\\''"); >+ >+ // Removes 'iocharset' option on some filesystems >+ if( (mountOptions["filesystem"] != "fat") >+ && (mountOptions["filesystem"] != "iso9669") >+ && (mountOptions["filesystem"] != "jfs") >+ && (mountOptions["filesystem"] != "msdos") >+ && (mountOptions["filesystem"] != "ntfs") >+ && (mountOptions["filesystem"] != "umsdos") >+ && (mountOptions["filesystem"] != "vfat") >+ ) { >+ mountOptions["utf8"] = "false"; > } > >- if (mountOptions.contains("filesystem")) { >- optionString.append(TQString(" -t %1").arg(mountOptions["filesystem"])); >+ // Use 'pmount' command, if available >+ TQString pmountProg = TDEGlobal::dirs()->findExe("pmount", path); >+ >+ if (!pmountProg.isEmpty()) { >+ // Create dummy password file >+ KTempFile passwordFile(TQString::null, "tmp", 0600); >+ passwordFile.setAutoDelete(true); >+ >+ TQString optionString; >+ if (mountOptions["ro"] == "true") { >+ optionString.append(" -r"); >+ } >+ >+ if (mountOptions["atime"] != "true") { >+ optionString.append(" -A"); >+ } >+ >+ if (mountOptions["utf8"] == "true") { >+ optionString.append(" -c utf8"); >+ } >+ >+ if (mountOptions["sync"] == "true") { >+ optionString.append(" -s"); >+ } >+ >+ if (mountOptions.contains("filesystem")) { >+ optionString.append(TQString(" -t %1").arg(mountOptions["filesystem"])); >+ } >+ >+ if (mountOptions.contains("locale")) { >+ optionString.append(TQString(" -c %1").arg(mountOptions["locale"])); >+ } >+ >+ TQString passFileName = passwordFile.name(); >+ passFileName.replace("'", "'\\''"); >+ >+ command = TQString("pmount -p '%1' %2 '%3' '%4' 2>&1").arg(passFileName).arg(optionString).arg(devNode).arg(mediaName); > } > >- if (mountOptions.contains("locale")) { >- optionString.append(TQString(" -c %1").arg(mountOptions["locale"])); >+#ifdef WITH_UDISKS2 >+ if(command.isEmpty()) { >+ // Use 'udisksctl' command (from UDISKS2), if available >+ TQString udisksctlProg = TDEGlobal::dirs()->findExe("udisksctl", path); >+ if (!udisksctlProg.isEmpty()) { >+ TQString optionString; >+ >+ // Sends the filesystem options to 'udisks' command >+ optionString.append(TQString("-o rw")); >+ >+ if (mountOptions["ro"] == "true") { >+ optionString.append(",ro"); >+ } >+ >+ if (mountOptions["atime"] != "true") { >+ optionString.append(",noatime"); >+ } >+ >+ if (mountOptions["utf8"] == "true") { >+ optionString.append(",iocharset=utf8"); >+ } >+ >+ if (mountOptions["sync"] == "true") { >+ optionString.append(",sync"); >+ } >+ >+ if (mountOptions.contains("locale")) { >+ optionString.append(TQString(",iocharset=%1").arg(mountOptions["locale"])); >+ } >+ >+ if (mountOptions.contains("filesystem")) { >+ optionString.append(TQString(" -t %1").arg(mountOptions["filesystem"])); >+ } >+ >+ command = TQString("udisksctl mount -b '%1' %2 2>&1").arg(devNode).arg(optionString); >+ } > } >+#endif // WITH_UDISKS2 > >- TQString passFileName = passwordFile.name(); >- TQString devNode = deviceNode(); >- passFileName.replace("'", "'\\''"); >- devNode.replace("'", "'\\''"); >- mediaName.replace("'", "'\\''"); >- TQString command = TQString("pmount -p '%1' %2 '%3' '%4' 2>&1").arg(passFileName).arg(optionString).arg(devNode).arg(mediaName); >+#ifdef WITH_UDISKS >+ if(command.isEmpty()) { >+ // Use 'udisks' command (from UDISKS1), if available >+ TQString udisksProg = TDEGlobal::dirs()->findExe("udisks", path); >+ if (!udisksProg.isEmpty()) { >+ TQString optionString; >+ >+ // Sends the filesystem options to 'udisks' command >+ optionString.append(TQString("--mount-options rw")); >+ >+ if (mountOptions["ro"] == "true") { >+ optionString.append(",ro"); >+ } >+ >+ if (mountOptions["atime"] != "true") { >+ optionString.append(",noatime"); >+ } >+ >+ if (mountOptions["utf8"] == "true") { >+ optionString.append(",iocharset=utf8"); >+ } >+ >+ if (mountOptions["sync"] == "true") { >+ optionString.append(",sync"); >+ } >+ >+ if (mountOptions.contains("locale")) { >+ optionString.append(TQString(",iocharset=%1").arg(mountOptions["locale"])); >+ } >+ >+ if (mountOptions.contains("filesystem")) { >+ optionString.append(TQString(" --mount-fstype %1").arg(mountOptions["filesystem"])); >+ } >+ >+ command = TQString("udisks --mount '%1' %2 2>&1").arg(devNode).arg(optionString); >+ } >+ } >+#endif // WITH_UDISKS > > FILE *exepipe = popen(command.ascii(), "r"); > if (exepipe) { >@@ -741,13 +847,34 @@ > } > > TQString mountpoint = mountPath(); >+ TQString devNode = deviceNode(); > > if (mountpoint.isNull()) { > return true; > } > > mountpoint.replace("'", "'\\''"); >- TQString command = TQString("pumount '%1' 2>&1").arg(mountpoint); >+ >+ TQString epath = getenv("PATH"); >+ TQString path = TQString::fromLatin1("/sbin:/bin"); >+ if (!epath.isEmpty()) { >+ path += ":" + epath; >+ } >+ >+ TQString command; >+ >+ if(!(TDEGlobal::dirs()->findExe("pumount", path).isEmpty())) { >+ command = TQString("pumount '%1' 2>&1").arg(mountpoint); >+#ifdef WITH_UDISKS2 >+ } else if(!(TDEGlobal::dirs()->findExe("udisksctl", path).isEmpty())) { >+ command = TQString("udisksctl unmount -b '%1' 2>&1").arg(devNode); >+#endif // WITH_UDISKS2 >+#ifdef WITH_UDISKS >+ } else if(!(TDEGlobal::dirs()->findExe("udisks", path).isEmpty()) ){ >+ command = TQString("udisks --unmount '%1' 2>&1").arg(devNode); >+#endif // WITH_UDISKS >+ } >+ > FILE *exepipe = popen(command.ascii(), "r"); > if (exepipe) { > TQString pmount_output; View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]