From fde4b17b3614d7b51e220e02053b97f66ddd0652 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Tue, 26 Sep 2017 20:55:36 +0200 Subject: Create parent directories when opening a file for writing - this affects callers of Inkscape::IO::fopen_utf8name - fixes at least two issues: - creating custom shortcuts failed when "/inkscape/keys" was missing in the configuration directory, see https://bugs.launchpad.net/inkscape/+bug/1719629 - autosaving probably failed if a non-existent directory was specified --- src/io/sys.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/io/sys.cpp') diff --git a/src/io/sys.cpp b/src/io/sys.cpp index b06b550dd..833dee437 100644 --- a/src/io/sys.cpp +++ b/src/io/sys.cpp @@ -71,10 +71,20 @@ FILE *Inkscape::IO::fopen_utf8name( char const *utf8name, char const *mode ) gchar *filename = g_filename_from_utf8( utf8name, -1, NULL, NULL, NULL ); if ( filename ) { + // ensure we open the file in binary mode (not needed in POSIX but doesn't hurt either) Glib::ustring how( mode ); if ( how.find("b") == Glib::ustring::npos ) { - how.append("b"); // not needed in POSIX but doesn't hurt either + how.append("b"); + } + // when opening a file for writing: create parent directories if they don't exist already + if ( how.find("w") != Glib::ustring::npos ) + { + gchar *dirname = g_path_get_dirname(utf8name); + if (g_mkdir_with_parents(dirname, 0777)) { + g_warning("Could not create directory '%s'", dirname); + } + g_free(dirname); } fp = g_fopen(filename, how.c_str()); g_free(filename); -- cgit v1.2.3