luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-21 08:28:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Win32] Avoid superfluous '/' from g_file_resolve_relative_path()

Browse Source 
Patch from bug #591532.
This commit is contained in:
Shixin Zeng
2009-08-14 23:21:12 +03:00
committed by Tor Lillqvist
parent 1b298d6a1b
commit 406c3aa019
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gio/win32/gwinhttpfile.c
View File

@@ -375,9 +375,19 @@ g_winhttp_file_resolve_relative_path (GFile *file,
if (*wnew_path != '/') if (*wnew_path != '/')
{ {
wchar_t *tmp = g_new (wchar_t, wcslen (winhttp_file->url.lpszUrlPath) + 1 + wcslen (wnew_path) + 1); wchar_t *tmp = NULL;
wcscpy (tmp, winhttp_file->url.lpszUrlPath); int trailing_slash = winhttp_file->url.lpszUrlPath[winhttp_file->url.dwUrlPathLength-1] == L'/'? 1 : 0;
wcscat (tmp, L"/"); if (trailing_slash)
{
tmp = g_new (wchar_t, wcslen (winhttp_file->url.lpszUrlPath) + wcslen (wnew_path) + 1);
wcscpy (tmp, winhttp_file->url.lpszUrlPath);
}
else
{
tmp = g_new (wchar_t, wcslen (winhttp_file->url.lpszUrlPath) + 1 + wcslen (wnew_path) + 1);
wcscpy (tmp, winhttp_file->url.lpszUrlPath);
wcscat (tmp, L"/");
}
wcscat (tmp, wnew_path); wcscat (tmp, wnew_path);
g_free (wnew_path); g_free (wnew_path);