Use g_canonicalize_filename() instead

Change-Id: Ia6726c405434af9ea31333612f52901203fd5df0
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/include/media_util_private.h b/include/media_util_private.h
index 2b48fb6..187f282 100755 (executable)
--- a/include/media_util_private.h
+++ b/include/media_util_private.h
@@ -31,7 +31,6 @@ extern "C" {
  */
 bool _media_util_check_support_media_type(const char *path);
 int _media_util_check_file_exist(const char *path);
-void _media_util_trim_path(const char *input_path, char **output_path);
 int _media_util_get_file_time(const char *path);
 bool _media_util_is_ignorable_file(const char *path);
 bool _media_util_is_ignorable_dir(const char *dir_path);

diff --git a/include_product/media_util_private.h b/include_product/media_util_private.h
index d214db8..ad0dbb2 100644 (file)
--- a/include_product/media_util_private.h
+++ b/include_product/media_util_private.h
@@ -31,7 +31,6 @@ extern "C" {
  */
 bool _media_util_check_support_media_type(const char *path);
 int _media_util_check_file_exist(const char *path);
-void _media_util_trim_path(const char *input_path, char **output_path);
 int _media_util_get_file_time(const char *path);
 bool _media_util_is_ignorable_file(const char *path);
 bool _media_util_is_ignorable_dir(const char *dir_path);

diff --git a/src/media_util_private.c b/src/media_util_private.c
index 8aea3fa..f6e1e68 100755 (executable)
--- a/src/media_util_private.c
+++ b/src/media_util_private.c
@@ -77,35 +77,6 @@ int _media_util_check_file_exist(const char *path)
        return MEDIA_CONTENT_ERROR_NONE;
 }
 
-void _media_util_trim_path(const char *input_path, char **output_path)
-{
-       gchar **name_list = NULL;
-       gchar *tmp_path = NULL;
-
-       if (!STRING_VALID(input_path) || output_path == NULL)
-               return;
-
-       /* Workflow example
-               Input : /a/b//c/
-               After g_strsplit() : {'','a','b','','c',''}
-               After g_build_pathv() : a/b/c
-               After g_strdup_printf() : /a/b/c
-       */
-       name_list = g_strsplit(input_path, "/", -1);
-       if (!name_list)
-               return;
-
-       tmp_path = g_build_pathv(G_DIR_SEPARATOR_S, name_list);
-       g_strfreev(name_list);
-       if (!tmp_path)
-               return;
-
-       /* g_build_pathv does not add root '/' */
-       *output_path = g_strdup_printf("/%s", tmp_path);
-       g_free(tmp_path);
-}
-
-
 int _media_util_get_file_time(const char *path)
 {
        struct stat statbuf;
@@ -155,7 +126,7 @@ bool _media_util_is_ignorable_file(const char *path)
        /* Check symbolic directory */
        tmp_path = realpath(path, NULL);
        /* Get trimmed path */
-       _media_util_trim_path(path, &org_path);
+       org_path = g_canonicalize_filename(path, NULL);
 
 #ifdef _USE_TVPD_MODE
        if (g_strcmp0(tmp_path, org_path) != 0) {
@@ -279,7 +250,7 @@ int _media_content_check_dir(const char *path)
        /* Check symbolic link directory */
        real = realpath(path, NULL);
        /* Get trimmed path */
-       _media_util_trim_path(path, &origin);
+       origin = g_canonicalize_filename(path, NULL);
 
 #ifdef _USE_TVPD_MODE
        if (g_strcmp0(real, origin) != 0) {