From a1d58193b1f9973a4be0e646c69027681e69cf62 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sat, 8 Jun 2013 08:53:29 -0700 Subject: Fix usage of stat vs statfs Change-Id: Id59b79f079c587630f5f6ed0418a45f2b8cd99ff Conflicts: nandroid.c --- nandroid.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/nandroid.c b/nandroid.c index f343c1d..32b93f8 100644 --- a/nandroid.c +++ b/nandroid.c @@ -356,12 +356,13 @@ int nandroid_backup(const char* backup_path) if (is_data_media_volume_path(volume->mount_point)) volume = volume_for_path("/data"); int ret; - struct statfs s; + struct statfs sfs; + struct stat s; if (NULL != volume) { - if (0 != (ret = statfs(volume->mount_point, &s))) + if (0 != (ret = statfs(volume->mount_point, &sfs))) return print_and_error("Unable to stat backup path.\n"); - uint64_t bavail = s.f_bavail; - uint64_t bsize = s.f_bsize; + uint64_t bavail = sfs.f_bavail; + uint64_t bsize = sfs.f_bsize; uint64_t sdcard_free = bavail * bsize; uint64_t sdcard_free_mb = sdcard_free / (uint64_t)(1024 * 1024); ui_print("SD Card space free: %lluMB\n", sdcard_free_mb); @@ -605,19 +606,19 @@ int nandroid_restore_partition_extended(const char* backup_path, const char* mou int i = 0; while ((filesystem = filesystems[i]) != NULL) { sprintf(tmp, "%s/%s.%s.img", backup_path, name, filesystem); - if (0 == (ret = statfs(tmp, &file_info))) { + if (0 == (ret = stat(tmp, &file_info))) { backup_filesystem = filesystem; restore_handler = unyaffs_wrapper; break; } sprintf(tmp, "%s/%s.%s.tar", backup_path, name, filesystem); - if (0 == (ret = statfs(tmp, &file_info))) { + if (0 == (ret = stat(tmp, &file_info))) { backup_filesystem = filesystem; restore_handler = tar_extract_wrapper; break; } sprintf(tmp, "%s/%s.%s.dup", backup_path, name, filesystem); - if (0 == (ret = statfs(tmp, &file_info))) { + if (0 == (ret = stat(tmp, &file_info))) { backup_filesystem = filesystem; restore_handler = dedupe_extract_wrapper; break; -- cgit v1.1