Browse Source

dialog: Use case-insensitive filter matching on portal dialogs

On most implementations, filter pattern matching is case-sensitive. For case-insensitive matching of a pattern such as '*.png', the pattern *.[pP][nN][gG]' must be used.
Frank Praznik 2 weeks ago
parent
commit
387439d009
1 changed files with 16 additions and 1 deletions
  1. 16 1
      src/dialog/unix/SDL_portaldialog.c

+ 16 - 1
src/dialog/unix/SDL_portaldialog.c

@@ -86,10 +86,25 @@ static void DBus_AppendFilter(SDL_DBusContext *dbus, DBusMessageIter *parent, co
     dbus->message_iter_append_basic(&filter_entry, DBUS_TYPE_STRING, &filter.name);
     dbus->message_iter_open_container(&filter_entry, DBUS_TYPE_ARRAY, "(us)", &filter_array);
 
-    patterns = SDL_strdup(filter.pattern);
+    /* Copy the filter string, converting to a case-insensitive version.
+     * For example, for case-insensitive matching of '*.png', the pattern '*.[pP][nN][gG]' is used.
+     */
+    const size_t len = SDL_strlen(filter.pattern) + 1;
+    patterns = SDL_malloc(len * 4); // Single characters may be expanded to 4 characters.
     if (!patterns) {
         goto cleanup;
     }
+    for (size_t i = 0, p = 0; i < len; ++i) {
+        if ((filter.pattern[i] >= 'a' && filter.pattern[i] <= 'z') ||
+            (filter.pattern[i] >= 'A' && filter.pattern[i] <= 'Z')) {
+            patterns[p++] = '[';
+            patterns[p++] = SDL_tolower(filter.pattern[i]);
+            patterns[p++] = SDL_toupper(filter.pattern[i]);
+            patterns[p++] = ']';
+        } else {
+            patterns[p++] = filter.pattern[i];
+        }
+    }
 
     pattern = SDL_strtok_r(patterns, ";", &state);
     while (pattern) {