luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 15:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gresource: Make extract work better

Browse Source 
When no section is specified, look for the resource to extract
in all sections - previously, we would stop after the first
section.
This commit is contained in:
Matthias Clasen 2014-09-18 15:26:36 -04:00
parent 5c951e5b04
commit 174ebaefcc
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gio/gresource-tool.c
View File

@ -113,9 +113,8 @@ extract_resource (GResource *resource,
const gchar *path)
{
GBytes *bytes;
GError *error = NULL;
bytes = g_resource_lookup_data (resource, path, 0, &error);
bytes = g_resource_lookup_data (resource, path, 0, NULL);
if (bytes != NULL)
{
gconstpointer data;
@ -127,11 +126,6 @@ extract_resource (GResource *resource,
g_printerr ("Data truncated\n");
g_bytes_unref (bytes);
}
else
{
g_printerr ("%s\n", error->message);
g_error_free (error);
}
}
/* Elf functions {{{1 */
@ -230,10 +224,16 @@ resource_from_section (GElf_Shdr *shdr,
if (contents != MAP_FAILED)
{
GBytes *bytes;
GError *error = NULL;
bytes = g_bytes_new_static (contents + page_offset, shdr->sh_size);
resource = g_resource_new_from_data (bytes, NULL);
resource = g_resource_new_from_data (bytes, &error);
g_bytes_unref (bytes);
if (error)
{
g_printerr ("%s\n", error->message);
g_error_free (error);
}
}
else
{
@ -316,7 +316,10 @@ extract_resource_cb (GElf_Shdr *shdr,
extract_resource (resource, d->path);
g_resource_unref (resource);
return FALSE;
if (d->section)
return FALSE;
return TRUE;
}
static void
@ -397,7 +400,6 @@ cmd_list (const gchar *file,
GResource *resource;
#ifdef HAVE_LIBELF
Elf *elf;
int fd;