aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-02-18 09:19:55 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-18 09:19:55 +0000
commit28eeb9acf34233d2cab6b7efa9262a528ff0029e (patch)
treedc37c3318883acea41e267cf269b0e2dc99f525b
parent5c557ec1b1ada3f1f2e81022e7eb34bec154a338 (diff)
parent1e92789a6262eec710f3ae4c50535b89538849d1 (diff)
downloadsquashfs-tools-28eeb9acf34233d2cab6b7efa9262a528ff0029e.tar.gz
Fix mac build
am: 1e92789a62 Change-Id: If71cb1bdc97168a69c8f3b8599c956dc7462afc9
-rw-r--r--squashfs-tools/android.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/squashfs-tools/android.c b/squashfs-tools/android.c
index eeef2aa..49d4dca 100644
--- a/squashfs-tools/android.c
+++ b/squashfs-tools/android.c
@@ -47,10 +47,14 @@ void android_fs_config(fs_config_func_t fs_config_func, const char *path, struct
const char *target_out_path, uint64_t *capabilities) {
// filesystem_config does not preserve file type bits
mode_t stat_file_type_mask = stat->st_mode & S_IFMT;
+ unsigned int uid = 0, gid = 0, mode = 0;
if (fs_config_func)
fs_config_func(path, S_ISDIR(stat->st_mode), target_out_path,
- &stat->st_uid, &stat->st_gid, &stat->st_mode, capabilities);
+ &uid, &gid, &mode, capabilities);
stat->st_mode |= stat_file_type_mask;
+ stat->st_uid = uid;
+ stat->st_gid = gid;
+ stat->st_mode = mode;
}