summaryrefslogtreecommitdiff
path: root/filesystems/simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'filesystems/simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp')
-rw-r--r--filesystems/simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp32
1 files changed, 32 insertions, 0 deletions
diff --git a/filesystems/simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp b/filesystems/simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp
new file mode 100644
index 000000000000..d1dbca44fbe2
--- /dev/null
+++ b/filesystems/simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp
@@ -0,0 +1,32 @@
+# Allow fake device file to use with fstab(5)
+
+--- src/simple-mtpfs-fuse.cpp.orig 2015-08-24 11:34:39 UTC
++++ src/simple-mtpfs-fuse.cpp
+@@ -309,12 +309,6 @@ bool SMTPFileSystem::parseOptions(int ar
+
+ --m_options.m_device_no;
+
+- // device file and -- device are mutually exclusive, fail if both set
+- if (m_options.m_device_no && m_options.m_device_file) {
+- m_options.m_good = false;
+- return false;
+- }
+-
+ m_options.m_good = true;
+ return true;
+ }
+@@ -379,11 +373,9 @@ bool SMTPFileSystem::exec()
+ return false;
+ }
+
+- if (m_options.m_device_file) {
+- // Try to use device file first, if provided
+- if (!m_device.connect(m_options.m_device_file))
+- return false;
+- } else {
++ // Try to use device file first, ignore otherwise
++ if (!m_options.m_device_file ||
++ !m_device.connect(m_options.m_device_file)) {
+ // Connect to MTP device by order number, if no device file supplied
+ if (!m_device.connect(m_options.m_device_no))
+ return false;