[cutter-commit 02686] SF.net SVN: cutter:[2692] cutter/trunk

[<ik...@us...>]

Revision: 2692
          http://cutter.svn.sourceforge.net/cutter/?rev=2692&view=rev
Author:   ikezoe
Date:     2009-01-26 04:50:49 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
	* cutter/cut-test-context.c (cut_test_context_push_backtrace): Convert
	directory separator in relative_path.

Modified Paths:
--------------
    cutter/trunk/ChangeLog
    cutter/trunk/cutter/cut-test-context.c

Modified: cutter/trunk/ChangeLog
===================================================================
--- cutter/trunk/ChangeLog	2009-01-26 03:47:31 UTC (rev 2691)
+++ cutter/trunk/ChangeLog	2009-01-26 04:50:49 UTC (rev 2692)
@@ -10,6 +10,8 @@
 	handle NULL.
 	* test/cutter/test-cut-path.c,
 	test/fixtures/path/parent/sub/test-deep.c: Use G_DIR_SEPARATOR_S.
+	* cutter/cut-test-context.c (cut_test_context_push_backtrace): Convert
+	directory separator in relative_path.
 
 2009-01-23  Hiroyuki Ikezoe  <poi...@ik...>
 

Modified: cutter/trunk/cutter/cut-test-context.c
===================================================================
--- cutter/trunk/cutter/cut-test-context.c	2009-01-26 03:47:31 UTC (rev 2691)
+++ cutter/trunk/cutter/cut-test-context.c	2009-01-26 04:50:49 UTC (rev 2692)
@@ -1254,6 +1254,21 @@
         return g_strdup(filename);
 }
 
+static gchar *
+convert_directory_separator_in_relative_path (const gchar *relative_path)
+{
+    gchar *convert, *dirname, *basename;
+
+    dirname = g_path_get_dirname(relative_path);
+    basename = g_path_get_basename(relative_path);
+
+    convert = g_build_filename(dirname, basename, NULL);
+    g_free(dirname);
+    g_free(basename);
+
+    return convert;
+}
+
 void
 cut_test_context_push_backtrace (CutTestContext *context,
                                  const char     *relative_path,
@@ -1274,17 +1289,23 @@
     g_mutex_lock(priv->mutex);
     if (relative_path) {
         const gchar *source_directory = NULL;
+        gchar *convert_relative_path;
 
+        convert_relative_path =
+            convert_directory_separator_in_relative_path(relative_path);
+
         if (priv->run_context)
             source_directory =
                 cut_run_context_get_source_directory(priv->run_context);
         if (source_directory)
             full_filename = g_build_filename(source_directory,
-                                             relative_path,
+                                             convert_relative_path,
                                              filename,
                                              NULL);
         else
-            full_filename = g_build_filename(relative_path, filename, NULL);
+            full_filename = g_build_filename(convert_relative_path,
+                                             filename, NULL);
+        g_free(convert_relative_path);
     } else {
         full_filename = cut_test_context_build_source_filename(context,
                                                                filename);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.