Modify storage_get_storage_level

[platform/core/system/libstorage.git] / src / statvfs.c

diff --git a/src/statvfs.c b/src/statvfs.c
index eda17bd..99ed755 100644 (file)
--- a/src/statvfs.c
+++ b/src/statvfs.c
@@ -37,24 +37,6 @@
 #define EXTERNAL_MEMORY_NODE   "sdcard"
 #define STORAGE_CONF_FILE      "/etc/storage/libstorage.conf"
 
-/* it's for 32bit file offset */
-struct statvfs_32 {
-       unsigned long int f_bsize;
-       unsigned long int f_frsize;
-       unsigned long int f_blocks;
-       unsigned long int f_bfree;
-       unsigned long int f_bavail;
-       unsigned long int f_files;
-       unsigned long int f_ffree;
-       unsigned long int f_favail;
-       unsigned long int f_fsid;
-#ifdef _STATVFSBUF_F_UNUSED
-       int __f_unused;
-#endif
-       unsigned long int f_flag;
-       unsigned long int f_namemax;
-       int __f_spare[6];
-};
 
 #define MAX_LINE    128
 #define MAX_SECTION 64
@@ -252,9 +234,9 @@ API int storage_get_internal_memory_size(struct statvfs *buf)
                return -EINVAL;
        }
 
-       ret = get_memory_size(tzplatform_getenv(TZ_SYS_HOME), &temp);
+       ret = get_memory_size(tzplatform_getenv(TZ_SYS_USER), &temp);
        if (ret || temp.f_bsize == 0) {
-               _E("fail to get memory size"); //LCOV_EXCL_LINE
+               _E("fail to get memory size %d", ret); //LCOV_EXCL_LINE
                return -errno; //LCOV_EXCL_LINE System Error
        }
 
@@ -285,7 +267,7 @@ API int storage_get_internal_memory_size64(struct statvfs *buf)
                return -EINVAL;
        }
 
-       ret = statvfs(tzplatform_getenv(TZ_SYS_HOME), buf);
+       ret = statvfs(tzplatform_getenv(TZ_SYS_USER), buf);
        if (ret) {
                _E("fail to get memory size"); //LCOV_EXCL_LINE
                return -errno; //LCOV_EXCL_LINE System Error
@@ -346,6 +328,10 @@ int storage_get_external_memory_size_with_path(char *path, struct statvfs *buf)
        if (path)
                snprintf(ext_path, sizeof(ext_path), "%s", path);
        else {
+               if (!storage_ext_is_supported()) {
+                       _D("Block module is not enabled");
+                       goto out_nodev;
+               }
                ret = get_external_path(ext_path, sizeof(ext_path));
                if (ret == -ENODEV)
                        goto out_nodev;
@@ -358,10 +344,10 @@ int storage_get_external_memory_size_with_path(char *path, struct statvfs *buf)
        if (!mount_check(ext_path))
                goto out_nodev;
 
-       ret = get_memory_size(ext_path, &temp);
+       ret = storage_ext_get_statvfs(ext_path, &temp);
        if (ret) {
                _E("fail to get memory size"); //LCOV_EXCL_LINE
-               return -errno; //LCOV_EXCL_LINE System Error
+               return ret; //LCOV_EXCL_LINE System Error
        }
 
        memcpy(buf, &temp, sizeof(temp));
@@ -386,6 +372,10 @@ int storage_get_external_memory_size64_with_path(char *path, struct statvfs *buf
        if (path)
                snprintf(ext_path, sizeof(ext_path), "%s", path);
        else {
+               if (!storage_ext_is_supported()) {
+                       _D("Block module is not enabled");
+                       goto out_nodev;
+               }
                ret = get_external_path(ext_path, sizeof(ext_path));
                if (ret == -ENODEV)
                        goto out_nodev;
@@ -398,7 +388,7 @@ int storage_get_external_memory_size64_with_path(char *path, struct statvfs *buf
        if (!mount_check(ext_path))
                goto out_nodev;
 
-       ret = statvfs(ext_path, buf);
+       ret = storage_ext_get_statvfs_size64(ext_path, buf);
        if (ret) {
        //LCOV_EXCL_START System Error
                _E("fail to get memory size");