[libgepub] Fixed resource path for relative and doc paths
- From: Daniel Garcia Moreno <danigm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgepub] Fixed resource path for relative and doc paths
- Date: Tue, 31 May 2016 17:59:53 +0000 (UTC)
commit f85d11b293b4a4bbf574f23b269298f08fbc5739
Author: Daniel Garcia Moreno <danigm wadobo com>
Date: Tue May 31 19:59:05 2016 +0200
Fixed resource path for relative and doc paths
libgepub/gepub-doc.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/libgepub/gepub-doc.c b/libgepub/gepub-doc.c
index 272f89e..1729b16 100644
--- a/libgepub/gepub-doc.c
+++ b/libgepub/gepub-doc.c
@@ -173,8 +173,14 @@ gepub_doc_initable_init (GInitable *initable,
return FALSE;
len = strlen (file);
- while (file[i++] != '/' && i < len);
- doc->content_base = g_strndup (file, i);
+ doc->content_base = g_strdup ("");
+ for (i=0; i<len; i++) {
+ if (file[i] == '/') {
+ g_free (doc->content_base);
+ doc->content_base = g_strndup (file, i+1);
+ break;
+ }
+ }
gepub_doc_fill_resources (doc);
gepub_doc_fill_spine (doc);
@@ -361,14 +367,10 @@ guchar *
gepub_doc_get_resource_v (GepubDoc *doc, gchar *v, gsize *bufsize)
{
guchar *res = NULL;
- gchar *path = NULL;
- path = g_strdup_printf ("%s%s", doc->content_base, v);
- if (!gepub_archive_read_entry (doc->archive, path, &res, bufsize)) {
- g_free (path);
+ if (!gepub_archive_read_entry (doc->archive, v, &res, bufsize)) {
return NULL;
}
- g_free (path);
return res;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]