[gimp] darktable: Add more shell escaping for Windows
- From: Tobias Ellinghaus <et src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] darktable: Add more shell escaping for Windows
- Date: Mon, 4 Sep 2017 11:00:10 +0000 (UTC)
commit 82dd06720d723e6a03535f8d46320e4ee14e99c1
Author: Tobias Ellinghaus <me houz org>
Date: Mon Sep 4 12:56:34 2017 +0200
darktable: Add more shell escaping for Windows
Apparently Lua chokes when it sees c:\darktable\... as a path to a script,
thinking the '\d' was an escape sequence. Thus we have to add an extra
layer of escaping. Houdini like. Who came up with the brilliant idea to
use '\' as a separator anyway? So much pain just to be different?
plug-ins/file-raw/file-darktable.c | 47 ++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 21 deletions(-)
---
diff --git a/plug-ins/file-raw/file-darktable.c b/plug-ins/file-raw/file-darktable.c
index 12b7db2..620563f 100644
--- a/plug-ins/file-raw/file-darktable.c
+++ b/plug-ins/file-raw/file-darktable.c
@@ -324,17 +324,19 @@ load_image (const gchar *filename,
GimpRunMode run_mode,
GError **error)
{
- gint32 image_ID = -1;
- GFile *lua_file = gimp_data_directory_file ("file-raw",
- "file-darktable-export-on-exit.lua",
- NULL);
- gchar *lua_script = g_file_get_path (lua_file);
- gchar *lua_quoted = g_shell_quote (lua_script);
- gchar *lua_cmd = g_strdup_printf ("dofile(%s)", lua_quoted);
- gchar *filename_out = gimp_temp_name ("exr");
- gchar *export_filename = g_strdup_printf ("lua/export_on_exit/export_filename=%s", filename_out);
-
- gchar *darktable_stdout = NULL;
+ gint32 image_ID = -1;
+ GFile *lua_file = gimp_data_directory_file ("file-raw",
+ "file-darktable-export-on-exit.lua",
+ NULL);
+ gchar *lua_script = g_file_get_path (lua_file);
+ gchar *lua_script_escaped = g_strescape (lua_script, "");
+ gchar *lua_quoted = g_shell_quote (lua_script_escaped);
+ gchar *lua_cmd = g_strdup_printf ("dofile(%s)", lua_quoted);
+ gchar *filename_out = gimp_temp_name ("exr");
+ gchar *export_filename = g_strdup_printf ("lua/export_on_exit/export_filename=%s",
+ filename_out);
+
+ gchar *darktable_stdout = NULL;
/* linear sRGB for now as GIMP uses that internally in many places anyway */
gboolean search_path = FALSE;
@@ -356,6 +358,7 @@ load_image (const gchar *filename,
g_object_unref (lua_file);
g_free (lua_script);
+ g_free (lua_script_escaped);
g_free (lua_quoted);
gimp_progress_init_printf (_("Opening '%s'"),
@@ -400,16 +403,17 @@ load_thumbnail_image (const gchar *filename,
gint *height,
GError **error)
{
- gint32 image_ID = -1;
- gchar *filename_out = gimp_temp_name ("jpg");
- gchar *size = g_strdup_printf ("%d", thumb_size);
- GFile *lua_file = gimp_data_directory_file ("file-raw",
- "file-darktable-get-size.lua",
- NULL);
- gchar *lua_script = g_file_get_path (lua_file);
- gchar *lua_quoted = g_shell_quote (lua_script);
- gchar *lua_cmd = g_strdup_printf ("dofile(%s)", lua_quoted);
- gchar *darktable_stdout = NULL;
+ gint32 image_ID = -1;
+ gchar *filename_out = gimp_temp_name ("jpg");
+ gchar *size = g_strdup_printf ("%d", thumb_size);
+ GFile *lua_file = gimp_data_directory_file ("file-raw",
+ "file-darktable-get-size.lua",
+ NULL);
+ gchar *lua_script = g_file_get_path (lua_file);
+ gchar *lua_script_escaped = g_strescape (lua_script_escaped, "");
+ gchar *lua_quoted = g_shell_quote (lua_script);
+ gchar *lua_cmd = g_strdup_printf ("dofile(%s)", lua_quoted);
+ gchar *darktable_stdout = NULL;
gboolean search_path = FALSE;
gchar *exec_path = file_raw_get_executable_path ("darktable", "-cli",
@@ -432,6 +436,7 @@ load_thumbnail_image (const gchar *filename,
g_object_unref (lua_file);
g_free (lua_script);
+ g_free (lua_script_escaped);
g_free (lua_quoted);
gimp_progress_init_printf (_("Opening thumbnail for '%s'"),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]