.

fuse/server.go

@@ -185,26 +185,6 @@ func NewServer(fs RawFileSystem, mountPoint string, opts *MountOptions) (*Server
 		o.Name = strings.Replace(name[:l], ",", ";", -1)
 	}
 
-    // XXX: Is this really the correct place where we should adjust
-    // the options? How's if we simply change 'optionsStrings' method?
-    //
-    // git grep "optionsStrings"
-    //    fuse/mount_darwin.go:           "-o", strings.Join(opts.optionsStrings(), ","),
-    //    fuse/mount_linux.go:    if s := opts.optionsStrings(); len(s) > 0 {
-    //    fuse/server.go: for _, s := range o.optionsStrings() {
-    //    fuse/server.go:func (o *MountOptions) optionsStrings() []string {
-    //
-    // Because 'optionsStrings' is called in the mount_* files, maybe it's indeed
-    // sufficient to change optionsStrings?
-    // This also makes sense, because we don't change the internal representation of
-    // our mount options with the escaped version, which is more difficult to handle
-    // and which shouldn't matter for the user. go-fuse could take care of escaping
-    // without the user having to think about this..
-
-	for _, s := range o.optionsStrings() {
-        escapeComma(s)
-	}
-
 	maxReaders := runtime.GOMAXPROCS(0)
 	if maxReaders < minMaxReaders {
 		maxReaders = minMaxReaders
@@ -302,7 +282,12 @@ func (o *MountOptions) optionsStrings() []string {
 		r = append(r, "daemon_timeout=0")
 	}
 
-	return r
+	var rEscaped []string
+	for _, s := range r {
+		rEscaped = append(rEscaped, escapeComma(s))
+	}
+
+	return rEscaped
 }
 
 // DebugData returns internal status information for debugging