|
18 | 18 | #include "hostfs.h"
|
19 | 19 | #include <utime.h>
|
20 | 20 |
|
21 |
| -static void stat64_to_hostfs(const struct stat64 *buf, struct hostfs_stat *p) |
| 21 | +static void statx_to_hostfs(const struct statx *buf, struct hostfs_stat *p) |
22 | 22 | {
|
23 |
| - p->ino = buf->st_ino; |
24 |
| - p->mode = buf->st_mode; |
25 |
| - p->nlink = buf->st_nlink; |
26 |
| - p->uid = buf->st_uid; |
27 |
| - p->gid = buf->st_gid; |
28 |
| - p->size = buf->st_size; |
29 |
| - p->atime.tv_sec = buf->st_atime; |
30 |
| - p->atime.tv_nsec = 0; |
31 |
| - p->ctime.tv_sec = buf->st_ctime; |
32 |
| - p->ctime.tv_nsec = 0; |
33 |
| - p->mtime.tv_sec = buf->st_mtime; |
34 |
| - p->mtime.tv_nsec = 0; |
35 |
| - p->blksize = buf->st_blksize; |
36 |
| - p->blocks = buf->st_blocks; |
37 |
| - p->rdev.maj = os_major(buf->st_rdev); |
38 |
| - p->rdev.min = os_minor(buf->st_rdev); |
39 |
| - p->dev.maj = os_major(buf->st_dev); |
40 |
| - p->dev.min = os_minor(buf->st_dev); |
| 23 | + p->ino = buf->stx_ino; |
| 24 | + p->mode = buf->stx_mode; |
| 25 | + p->nlink = buf->stx_nlink; |
| 26 | + p->uid = buf->stx_uid; |
| 27 | + p->gid = buf->stx_gid; |
| 28 | + p->size = buf->stx_size; |
| 29 | + p->atime.tv_sec = buf->stx_atime.tv_sec; |
| 30 | + p->atime.tv_nsec = buf->stx_atime.tv_nsec; |
| 31 | + p->ctime.tv_sec = buf->stx_ctime.tv_sec; |
| 32 | + p->ctime.tv_nsec = buf->stx_ctime.tv_nsec; |
| 33 | + p->mtime.tv_sec = buf->stx_mtime.tv_sec; |
| 34 | + p->mtime.tv_nsec = buf->stx_mtime.tv_nsec; |
| 35 | + if (buf->stx_mask & STATX_BTIME) { |
| 36 | + p->btime.tv_sec = buf->stx_btime.tv_sec; |
| 37 | + p->btime.tv_nsec = buf->stx_btime.tv_nsec; |
| 38 | + } else { |
| 39 | + memset(&p->btime, 0, sizeof(p->btime)); |
| 40 | + } |
| 41 | + p->blksize = buf->stx_blksize; |
| 42 | + p->blocks = buf->stx_blocks; |
| 43 | + p->rdev.maj = buf->stx_rdev_major; |
| 44 | + p->rdev.min = buf->stx_rdev_minor; |
| 45 | + p->dev.maj = buf->stx_dev_major; |
| 46 | + p->dev.min = buf->stx_dev_minor; |
41 | 47 | }
|
42 | 48 |
|
43 | 49 | int stat_file(const char *path, struct hostfs_stat *p, int fd)
|
44 | 50 | {
|
45 |
| - struct stat64 buf; |
| 51 | + struct statx buf; |
| 52 | + int flags = AT_SYMLINK_NOFOLLOW; |
46 | 53 |
|
47 | 54 | if (fd >= 0) {
|
48 |
| - if (fstat64(fd, &buf) < 0) |
49 |
| - return -errno; |
50 |
| - } else if (lstat64(path, &buf) < 0) { |
51 |
| - return -errno; |
| 55 | + flags |= AT_EMPTY_PATH; |
| 56 | + path = ""; |
52 | 57 | }
|
53 |
| - stat64_to_hostfs(&buf, p); |
| 58 | + |
| 59 | + if ((statx(fd, path, flags, STATX_BASIC_STATS | STATX_BTIME, &buf)) < 0) |
| 60 | + return -errno; |
| 61 | + |
| 62 | + statx_to_hostfs(&buf, p); |
54 | 63 | return 0;
|
55 | 64 | }
|
56 | 65 |
|
|
0 commit comments