From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 18 Sep 2014 19:26:36 +0000 (-0400)
Subject: gresource: Make extract work better
X-Git-Tag: 2.42.0~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=174ebaefcc2b1b94f4a628e60f150b7209230dbf;p=platform%2Fupstream%2Fglib.git

gresource: Make extract work better

When no section is specified, look for the resource to extract
in all sections - previously, we would stop after the first
section.
---

diff --git a/gio/gresource-tool.c b/gio/gresource-tool.c
index bbe43c3..cc4e78b 100644
--- a/gio/gresource-tool.c
+++ b/gio/gresource-tool.c
@@ -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;