From 73699b12ea0da23780ed9691094d3d3ffbc4b3cf Mon Sep 17 00:00:00 2001
From: Sebastian Ramacher <sebastian+dev@ramacher.at>
Date: Sun, 6 Dec 2015 21:04:24 +0100
Subject: [PATCH] Handle URIs in :open

Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
---
 zathura/commands.c |  6 +++---
 zathura/zathura.c  | 43 +++++++++++++++++++++++++++++++------------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/zathura/commands.c b/zathura/commands.c
index fcea1cb..c697be0 100644
--- a/zathura/commands.c
+++ b/zathura/commands.c
@@ -238,9 +238,9 @@ cmd_open(girara_session_t* session, girara_list_t* argument_list)
       document_close(zathura, false);
     }
 
-    document_open(zathura, girara_list_nth(argument_list, 0),
-                  (argc == 2) ? girara_list_nth(argument_list, 1) : NULL,
-                  ZATHURA_PAGE_NUMBER_UNSPECIFIED);
+    document_open_idle(zathura, girara_list_nth(argument_list, 0),
+                       (argc == 2) ? girara_list_nth(argument_list, 1) : NULL,
+                       ZATHURA_PAGE_NUMBER_UNSPECIFIED, NULL, NULL);
   } else {
     girara_notify(session, GIRARA_ERROR, _("No arguments given."));
     return false;
diff --git a/zathura/zathura.c b/zathura/zathura.c
index a6a71b9..86cc1e8 100644
--- a/zathura/zathura.c
+++ b/zathura/zathura.c
@@ -46,11 +46,11 @@
 
 typedef struct zathura_document_info_s {
   zathura_t* zathura;
-  const char* path;
-  const char* password;
+  char* path;
+  char* password;
   int page_number;
-  const char* mode;
-  const char* synctex;
+  char* mode;
+  char* synctex;
 } zathura_document_info_t;
 
 
@@ -63,6 +63,20 @@ static void zathura_jumplist_save(zathura_t* zathura);
 static gboolean zathura_signal_sigterm(gpointer data);
 #endif
 
+static void
+free_document_info(zathura_document_info_t* document_info)
+{
+  if (document_info == NULL) {
+    return;
+  }
+
+  g_free(document_info->path);
+  g_free(document_info->password);
+  g_free(document_info->mode);
+  g_free(document_info->synctex);
+  g_free(document_info);
+}
+
 /* function implementation */
 zathura_t*
 zathura_create(void)
@@ -610,7 +624,7 @@ document_info_open(gpointer data)
     }
   }
 
-  g_free(document_info);
+  free_document_info(document_info);
   return FALSE;
 }
 
@@ -1043,9 +1057,8 @@ void
 document_open_idle(zathura_t* zathura, const char* path, const char* password,
                    int page_number, const char* mode, const char* synctex)
 {
-  if (zathura == NULL || path == NULL) {
-    return;
-  }
+  g_return_if_fail(zathura != NULL);
+  g_return_if_fail(path != NULL);
 
   zathura_document_info_t* document_info = g_try_malloc0(sizeof(zathura_document_info_t));
   if (document_info == NULL) {
@@ -1053,11 +1066,17 @@ document_open_idle(zathura_t* zathura, const char* path, const char* password,
   }
 
   document_info->zathura     = zathura;
-  document_info->path        = path;
-  document_info->password    = password;
+  document_info->path        = g_strdup(path);
+  if (password != NULL) {
+    document_info->password  = g_strdup(password);
+  }
   document_info->page_number = page_number;
-  document_info->mode        = mode;
-  document_info->synctex     = synctex;
+  if (mode != NULL) {
+    document_info->mode      = g_strdup(mode);
+  }
+  if (synctex != NULL) {
+    document_info->synctex   = g_strdup(synctex);
+  }
 
   gdk_threads_add_idle(document_info_open, document_info);
 }