diff options
| author | Jin Qian <jinqian@google.com> | 2017-05-03 23:38:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-03 23:38:36 +0000 |
| commit | d984ad62fc8db9e7c1c9e89b06f40fb3e8cea483 (patch) | |
| tree | 3e2162f35b3e0b7c4563916990aa6c80d4b97f21 | |
| parent | f1130df2455fc6dda2d61a4f31bb97dcff1c0acd (diff) | |
| parent | 0b69bcaa4078f3855bcc840f1638bd5f84672cfe (diff) | |
| download | e2fsprogs-d984ad62fc8db9e7c1c9e89b06f40fb3e8cea483.tar.gz | |
Merge "e2fsdroid: skip setting timestamp if src_dir is null" am: 930bc06448
am: 0b69bcaa40
Change-Id: I80400e2b51b0b1f849cf72cb1fb6cfa83fec9ba6
| -rw-r--r-- | contrib/android/perms.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/android/perms.c b/contrib/android/perms.c index 1e4c6db0..9a7a93f5 100644 --- a/contrib/android/perms.c +++ b/contrib/android/perms.c @@ -153,11 +153,12 @@ static errcode_t set_timestamp(ext2_filsys fs, ext2_ino_t ino, return retval; } - if (params->fixed_time == -1) { + if (params->fixed_time == -1 && params->src_dir) { /* replace mountpoint from filename with src_dir */ if (asprintf(&src_filename, "%s/%s", params->src_dir, - params->filename + strlen(params->mountpoint)) < 0) + params->filename + strlen(params->mountpoint)) < 0) { return -ENOMEM; + } retval = lstat(src_filename, &stat); if (retval < 0) { com_err(__func__, retval, |