# HG changeset patch # User zas_ # Date 1211366793 0 # Node ID 7638e83fed2acefc2ea7b3770c6702f9c41f1d38 # Parent 9a145206ec2c000c13dfb31ec5237b92db38bc3e Use g_build_filename() instead of g_strconcat(). diff -r 9a145206ec2c -r 7638e83fed2a src/utilops.c --- a/src/utilops.c Wed May 21 10:11:56 2008 +0000 +++ b/src/utilops.c Wed May 21 10:46:33 2008 +0000 @@ -2065,12 +2065,16 @@ gchar *new_name; new_name = file_util_rename_multiple_auto_format_name(format, fd->name, n); - dest = g_strconcat(base, "/", new_name, NULL); + dest = g_build_filename(base, new_name, NULL); g_free(new_name); } else { - dest = g_strdup_printf("%s/%s%0*d%s", base, front, padding, n, end); + gchar *new_name; + + new_name = g_strdup_printf("%s%0*d%s", front, padding, n, end); + dest = g_build_filename(base, new_name, NULL); + g_free(new_name); } if (isname(dest)) success = FALSE; @@ -2117,12 +2121,16 @@ gchar *new_name; new_name = file_util_rename_multiple_auto_format_name(format, fd->name, n); - dest = g_strconcat(base, "/", new_name, NULL); + dest = g_build_filename(base, new_name, NULL); g_free(new_name); } else { - dest = g_strdup_printf("%s/%s%0*d%s", base, front, padding, n, end); + gchar *new_name; + + new_name = g_strdup_printf("%s%0*d%s", front, padding, n, end); + dest = g_build_filename(base, new_name, NULL); + g_free(new_name); } if (!file_data_add_change_info(fd, FILEDATA_CHANGE_RENAME, fd->path, dest) ||