marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

appdata: Only rename complete matches of the id 

We don't want to rename partial hits of the desktop id, nor
inside any other tag.

Fixes https://github.com/flatpak/flatpak/issues/1118

Closes: #83
Approved by: alexlarsson
tingping/wmclass
Alexander Larsson 2017-12-13 15:02:33 +01:00 committed by Atomic Bot
parent 6529c39083
commit 960c36ab88
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/builder-manifest.c
View File

@ -2279,6 +2279,8 @@ builder_manifest_cleanup (BuilderManifest *self,
g_autofree char *contents;
const char *to_replace;
const char *match;
g_autofree char *replace_src = NULL;
g_autofree char *replace_dst = NULL;
g_autoptr(GString) new_contents = NULL;
if (!g_file_load_contents (appdata_file, NULL, &contents, NULL, NULL, error))
@ -2288,11 +2290,17 @@ builder_manifest_cleanup (BuilderManifest *self,
to_replace = contents;
while ((match = strstr (to_replace, self->rename_desktop_file)) != NULL)
/* We only want to replace entire matches to id tag, so add the brackets
* and the end-tag. That way we don't do partial matches, or match
* other tags, while still handling e.g. <id type="desktop">foo.desktop</id> */
replace_src = g_strdup_printf (">%s</id", self->rename_desktop_file);
replace_dst = g_strdup_printf (">%s</id", desktop_basename);
while ((match = strstr (to_replace, replace_src)) != NULL)
{
g_string_append_len (new_contents, to_replace, match - to_replace);
g_string_append (new_contents, desktop_basename);
to_replace = match + strlen (self->rename_desktop_file);
g_string_append (new_contents, replace_dst);
to_replace = match + strlen (replace_src);
}
g_string_append (new_contents, to_replace);