Fix mediastorage root path

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

diff --git a/lib/include/media-util.h b/lib/include/media-util.h
index f4e12fc..0e3ea86 100755 (executable)
--- a/lib/include/media-util.h
+++ b/lib/include/media-util.h
@@ -34,7 +34,7 @@
 
 #include <tzplatform_config.h>
 
-#define MEDIA_ROOT_PATH_INTERNAL       tzplatform_getenv(TZ_USER_HOME)
+#define MEDIA_ROOT_PATH_INTERNAL       tzplatform_getenv(TZ_USER_CONTENT)
 #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_USB            tzplatform_getenv(TZ_SYS_STORAGE)

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 20d8320..3448fa8 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.2.109
+Version:    0.2.110
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/mediadb-update.c b/src/mediadb-update.c
index 625c27b..c7f7ce9 100755 (executable)
--- a/src/mediadb-update.c
+++ b/src/mediadb-update.c
@@ -94,7 +94,7 @@ void print_help()
        printf("\n");
        printf("db-update --help for check this messages.\n");
        printf("\n");
-       printf("A file or directory must exists under %s or %s.\n", tzplatform_getenv(TZ_USER_HOME), tzplatform_mkpath(TZ_SYS_STORAGE, "sdcard"));
+       printf("A file or directory must exists under %s or %s.\n", tzplatform_getenv(TZ_USER_CONTENT), tzplatform_mkpath(TZ_SYS_STORAGE, "sdcard"));
        printf("Using %s is allowed SD card is mounted.\n", tzplatform_mkpath(TZ_SYS_STORAGE, "sdcard"));
        printf("\n");
        printf("=======================================================================================\n");
@@ -374,7 +374,7 @@ static int __get_storage_id(const char *path, char *storage_id, uid_t uid)
        char *err_msg = NULL;
        int ret = 0;
 
-       if (strncmp(tzplatform_getenv(TZ_USER_HOME), path, strlen(tzplatform_getenv(TZ_USER_HOME))) != 0 && strncmp(tzplatform_getenv(TZ_SYS_STORAGE), path, strlen(tzplatform_getenv(TZ_SYS_STORAGE))) != 0) {
+       if (strncmp(tzplatform_getenv(TZ_USER_CONTENT), path, strlen(tzplatform_getenv(TZ_USER_CONTENT))) != 0 && strncmp(tzplatform_getenv(TZ_SYS_STORAGE), path, strlen(tzplatform_getenv(TZ_SYS_STORAGE))) != 0) {
                printf("Not support path[%s]\n", path);
                return -1;
        }