diff options
| author | Ariadne Conill <ariadne@dereferenced.org> | 2021-12-27 13:57:13 -0600 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2023-04-12 12:22:14 +0300 |
| commit | c50874bd5ba69acc16fb15109a9b57f02ea1c0ed (patch) | |
| tree | 181da70e0e409a00f91f1d8a4f4391593f264a37 | |
| parent | 77fd338f902074de3f0e9225f2bdc3a466a3804c (diff) | |
| download | apk-tools-c50874bd5ba69acc16fb15109a9b57f02ea1c0ed.tar.gz apk-tools-c50874bd5ba69acc16fb15109a9b57f02ea1c0ed.tar.bz2 apk-tools-c50874bd5ba69acc16fb15109a9b57f02ea1c0ed.tar.xz apk-tools-c50874bd5ba69acc16fb15109a9b57f02ea1c0ed.zip | |
use fstatat, not fstatat64
the stat64 family of functions were provided as transitional functions,
but when building on glibc with _GNU_SOURCE, or any other supported system,
the stat functions are equivalent to their stat64 counterparts
| -rw-r--r-- | src/database.c | 6 | ||||
| -rw-r--r-- | src/io.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/database.c b/src/database.c index 0c91f54..ba53ecb 100644 --- a/src/database.c +++ b/src/database.c @@ -1343,12 +1343,12 @@ static void handle_alarm(int sig) static char *find_mountpoint(int atfd, const char *rel_path) { struct mntent *me; - struct stat64 st; + struct stat st; FILE *f; char *ret = NULL; dev_t dev; - if (fstatat64(atfd, rel_path, &st, 0) != 0) + if (fstatat(atfd, rel_path, &st, 0) != 0) return NULL; dev = st.st_dev; @@ -1358,7 +1358,7 @@ static char *find_mountpoint(int atfd, const char *rel_path) while ((me = getmntent(f)) != NULL) { if (strcmp(me->mnt_fsname, "rootfs") == 0) continue; - if (fstatat64(atfd, me->mnt_dir, &st, 0) == 0 && + if (fstatat(atfd, me->mnt_dir, &st, 0) == 0 && st.st_dev == dev) { ret = strdup(me->mnt_dir); break; @@ -721,7 +721,7 @@ void apk_fileinfo_hash_xattr(struct apk_file_info *fi) int apk_fileinfo_get(int atfd, const char *filename, unsigned int flags, struct apk_file_info *fi, struct apk_atom_pool *atoms) { - struct stat64 st; + struct stat st; unsigned int checksum = flags & 0xff; unsigned int xattr_checksum = (flags >> 8) & 0xff; int atflags = 0; @@ -732,7 +732,7 @@ int apk_fileinfo_get(int atfd, const char *filename, unsigned int flags, if (flags & APK_FI_NOFOLLOW) atflags |= AT_SYMLINK_NOFOLLOW; - if (fstatat64(atfd, filename, &st, atflags) != 0) + if (fstatat(atfd, filename, &st, atflags) != 0) return -errno; *fi = (struct apk_file_info) { |