Change strcmp to strncmp(Fix external storage path)

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

diff --git a/lib/include/media-util.h b/lib/include/media-util.h
index d7d4f18..7f9d95d 100755 (executable)
--- a/lib/include/media-util.h
+++ b/lib/include/media-util.h
@@ -36,7 +36,7 @@
 
 #define MEDIA_ROOT_PATH_INTERNAL       tzplatform_getenv(TZ_USER_HOME)
 #define MEDIA_ROOT_PATH_EXTERNAL       tzplatform_getenv(TZ_SYS_STORAGE)
-#define MEDIA_ROOT_PATH_SDCARD tzplatform_mkpath(TZ_SYS_STORAGE, "sdcard")
+#define MEDIA_ROOT_PATH_SDCARD tzplatform_mkpath(TZ_SYS_STORAGE, "Sdcard")
 #define MEDIA_ROOT_PATH_USB            tzplatform_getenv(TZ_SYS_STORAGE)
 #define MEDIA_ROOT_PATH_CLOUD  tzplatform_mkpath(TZ_SYS_STORAGE, "tnfs/cloud")
 #define MEDIA_DATA_PATH                tzplatform_mkpath(TZ_SYS_DATA, "file-manager-service")

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index e6dec13..ec0d909 100755 (executable)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -1770,9 +1770,9 @@ static int __msc_check_ignore_dir(const char *full_path, uid_t uid)
 
                if (strcmp(dir_path, user_path) == 0)
                        break;
-               else if (MS_STRING_VALID(MEDIA_ROOT_PATH_SDCARD) && (strcmp(dir_path, MEDIA_ROOT_PATH_SDCARD) == 0))
+               else if (MS_STRING_VALID(MEDIA_ROOT_PATH_SDCARD) && (strncmp(dir_path, MEDIA_ROOT_PATH_SDCARD, strlen(MEDIA_ROOT_PATH_SDCARD)) == 0))
                        break;
-               else if (MS_STRING_VALID(MEDIA_ROOT_PATH_USB) && (strcmp(dir_path, MEDIA_ROOT_PATH_USB) == 0))
+               else if (MS_STRING_VALID(MEDIA_ROOT_PATH_USB) && (strncmp(dir_path, MEDIA_ROOT_PATH_USB, strlen(MEDIA_ROOT_PATH_USB)) == 0))
                        break;
 
                leaf_path = strrchr(dir_path, '/');

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index 09b49ba..47ddcce 100755 (executable)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -1281,9 +1281,9 @@ static int __msc_check_ignore_dir(const char *full_path, uid_t uid)
                /*If root path, Stop Scanning*/
                if (strcmp(dir_path, usr_path) == 0)
                        break;
-               else if (MS_STRING_VALID(MEDIA_ROOT_PATH_SDCARD) && (strcmp(dir_path, MEDIA_ROOT_PATH_SDCARD) == 0))
+               else if (MS_STRING_VALID(MEDIA_ROOT_PATH_SDCARD) && (strncmp(dir_path, MEDIA_ROOT_PATH_SDCARD, strlen(MEDIA_ROOT_PATH_SDCARD)) == 0))
                        break;
-               else if (MS_STRING_VALID(MEDIA_ROOT_PATH_USB) && (strcmp(dir_path, MEDIA_ROOT_PATH_USB) == 0))
+               else if (MS_STRING_VALID(MEDIA_ROOT_PATH_USB) && (strncmp(dir_path, MEDIA_ROOT_PATH_USB, strlen(MEDIA_ROOT_PATH_USB)) == 0))
                        break;
 
                leaf_path = strrchr(dir_path, '/');
@@ -1703,19 +1703,7 @@ gboolean msc_metadata_update(void *data)
        /* send notification */
        ms_send_dir_update_noti(handle, INTERNAL_STORAGE_ID, start_path, NULL, MS_ITEM_UPDATE, scan_data->pid);
 
-       if (mmc_state == MS_STG_INSERTED) {
-               storage_type = MS_STORAGE_EXTERNAL;
-               if (MS_STRING_VALID(MEDIA_ROOT_PATH_SDCARD)) {
-                       start_path = strdup(MEDIA_ROOT_PATH_SDCARD);
-                       if (MS_STRING_VALID(start_path)) {
-                               ret = __msc_dir_scan_meta_update(handle, start_path, INTERNAL_STORAGE_ID, storage_type, scan_data->uid);
-                               /* send notification */
-                               ms_send_dir_update_noti(handle, MMC_STORAGE_ID, MEDIA_ROOT_PATH_SDCARD, NULL, MS_ITEM_UPDATE, scan_data->pid);
-                       }
-               }
-       }
-
-       /*__msc_dir_scan_meta_update For Each USB Storage*/
+       /*__msc_dir_scan_meta_update For Each External Storage*/
        ret = ms_get_storage_list(handle, &storage_list);
        if (ret != MS_MEDIA_ERR_NONE) {
                MS_DBG_ERR("ms_get_storage_list() fail");