From 30ad58c9cd015276f1a5bed8fcf4cf4e92fdd9be Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Thu, 7 Feb 2019 14:09:16 -0600 Subject: [PATCH] fu-common-cab: Correct handling of CAB files w/ nested directories and older libgcab CABs like this are commonly created by `makecab.exe` on Windows. ``` DriverPackage\filename.bin DriverPackage\filename.metainfo.xml ``` On gcab < 1.0 the comparison needs to be made without this directory name. --- src/fu-common-cab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fu-common-cab.c b/src/fu-common-cab.c index e1c747dee..a8cc0099a 100644 --- a/src/fu-common-cab.c +++ b/src/fu-common-cab.c @@ -33,7 +33,7 @@ _gcab_cabinet_get_file_by_name (GCabCabinet *cabinet, const gchar *basename) g_autoptr(GSList) files = gcab_folder_get_files (cabfolder); for (GSList *l = files; l != NULL; l = l->next) { GCabFile *cabfile = GCAB_FILE (l->data); - if (g_strcmp0 (gcab_file_get_name (cabfile), basename) == 0) + if (g_strcmp0 (gcab_file_get_extract_name (cabfile), basename) == 0) return cabfile; } #endif