IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change uri functions to work with valid Windows file uri's

Browse Source 
Windows file uri's can be of the form 'file:///N:/bob.txt' so change
the gnc_uri_get_components to remove a left over '/' at the start so
gnc_resolve_file_path gets the absolute path correctly. Also change
gnc_uri_create_uri to add an extra '/' for Windows file uri's.
This commit is contained in:
Robert Fewell 2019-03-29 17:34:45 +00:00
parent 89d2cde979
commit 5eb6f76e63
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libgnucash/engine/gnc-uri-utils.c
View File

@ -176,6 +176,14 @@ void gnc_uri_get_components (const gchar *uri,
if ( gnc_uri_is_file_scheme ( *scheme ) ) if ( gnc_uri_is_file_scheme ( *scheme ) )
{ {
/* a true file uri on windows can start file:///N:/
so we come here with /N:/ */
if (g_str_has_prefix (splituri[1], "/") && g_strstr_len (splituri[1], -1, ":") != NULL)
{
gchar *ptr = splituri[1];
*path = gnc_resolve_file_path ( ptr + 1 );
}
else
*path = gnc_resolve_file_path ( splituri[1] ); *path = gnc_resolve_file_path ( splituri[1] );
g_strfreev ( splituri ); g_strfreev ( splituri );
return; return;
@ -304,15 +312,25 @@ gchar *gnc_uri_create_uri (const gchar *scheme,
* path info as is. * path info as is.
*/ */
gchar *abs_path; gchar *abs_path;
gchar *uri_scheme;
if (scheme && (!gnc_uri_is_known_scheme (scheme)) ) if (scheme && (!gnc_uri_is_known_scheme (scheme)) )
abs_path = g_strdup ( path ); abs_path = g_strdup ( path );
else else
abs_path = gnc_resolve_file_path ( path ); abs_path = gnc_resolve_file_path ( path );
if ( scheme == NULL )
uri = g_strdup_printf ( "file://%s", abs_path ); if (!scheme)
uri_scheme = g_strdup ("file");
else else
uri = g_strdup_printf ( "%s://%s", scheme, abs_path ); uri_scheme = g_strdup (scheme);
if (g_str_has_prefix (abs_path, "/"))
uri = g_strdup_printf ( "%s://%s", uri_scheme, abs_path );
else // for windows add an extra "/"
uri = g_strdup_printf ( "%s:///%s", uri_scheme, abs_path );
g_free (uri_scheme);
g_free (abs_path); g_free (abs_path);
return uri; return uri;
} }