Fix path escaping in Spotlight so paths with spaces or special charac…

…ters

can be properly matched to tracker paths.

etc/afpd/spotlight.c

@@ -855,6 +855,9 @@ static int sl_rpc_openQuery(AFPObj *obj,
     sl_query = dalloc_value_for_key(query, "DALLOC_CTX", 0,
                                     "DALLOC_CTX", 1,
                                     "kMDQueryString");
+
+    LOG(log_debug, logtype_sl, "Spotlight query pre-conversion: \"%s\"", sl_query);
+
     if (sl_query == NULL) {
         EC_FAIL;
     }
@@ -890,14 +893,23 @@ static int sl_rpc_openQuery(AFPObj *obj,
 
     scope_array = dalloc_value_for_key(query, "DALLOC_CTX", 0, "DALLOC_CTX", 1,
                                        "kMDScopeArray");
+    char *scope;
+
     if (scope_array == NULL) {
-        slq->slq_scope = talloc_strdup(slq, v->v_path);
+        scope = g_uri_escape_string(v->v_path, 
+                                    G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
     } else {
-        slq->slq_scope = talloc_strdup(slq, scope_array->dd_talloc_array[0]);
+        scope = g_uri_escape_string(scope_array->dd_talloc_array[0], 
+                                    G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
     }
-    if (slq->slq_scope == NULL) {
+
+
+    if (scope == NULL) {
         LOG(log_error, logtype_sl, "failed to setup search scope");
         EC_FAIL;
+    } else {
+        LOG(log_debug, logtype_sl, "Search scope - escaped: \"%s\"", scope);
+	slq->slq_scope = talloc_strdup(slq, scope);
     }
 
     LOG(log_debug, logtype_sl, "Search scope: \"%s\"", slq->slq_scope);