eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace off64_t with off_t

Browse Source 
AC_SYS_LARGEFILE autoconf macro is in use in configure script which will
add needed feature macros on commandline to enable 64bit off_t.

Also replace lseek64 with lseek, since it will be same when
_FILE_OFFSET_BITS=64 is defined on relevant platforms via AC_SYS_LARGEFILE

This fixes build with latest musl, where LFS64 interfaces are moved out
of _GNU_SOURCE feature test macros namespace [1]

[1] https://git.musl-libc.org/cgit/musl/commit/?id=25e6fee27f4a293728dd15b659170e7b9c7db9bc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2022-12-18 13:53:51 -08:00
committed by Milan Broz
parent 50e8879528
commit 8e7f07841e
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/utils_wipe.c
View File

@@ -150,7 +150,7 @@ static int wipe_block(struct crypt_device *cd, int devfd, crypt_wipe_pattern pat
if (blockdev && pattern == CRYPT_WIPE_ZERO &&
!wipe_zeroout(cd, devfd, offset, wipe_block_size)) {
/* zeroout ioctl does not move offset */
if (lseek64(devfd, offset + wipe_block_size, SEEK_SET) < 0) {
if (lseek(devfd, offset + wipe_block_size, SEEK_SET) < 0) {
log_err(cd, _("Cannot seek to device offset."));
return -EINVAL;
}
@@ -221,7 +221,7 @@ int crypt_wipe_device(struct crypt_device *cd,
if (r)
goto out;
if (lseek64(devfd, offset, SEEK_SET) < 0) {
if (lseek(devfd, offset, SEEK_SET) < 0) {
log_err(cd, _("Cannot seek to device offset."));
r = -EINVAL;
goto out;