isa/make_ext4fs
1
0
Fork 0
mirror of https://git.openwrt.org/project/make_ext4fs.git synced 2025-08-04 13:54:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make_ext4fs: Remove off64_t in favor of standard off_t

Browse Source 
This fixes building against cygwin which does not define off64_t. off_t
under modern versions of OS X(or macOS) defaults to 64-bit. Furthermore,
_FILE_OFFSET_BITS is defined to 64-bit which eliminates the need for
using off64_t directly. Also, musl just like OS X defines off_t as 64-bit
in all situations. Also removed some code related to this.

Signed-off by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2017-04-08 10:38:12 -07:00
committed by Jo-Philipp Wich
parent 484903e433
commit bb9cf91795
6 changed files with 38 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libsparse/output_file.c
View File

@@ -35,13 +35,6 @@
#include "sparse_crc32.h"
#include "sparse_format.h"
#if defined(__APPLE__) && defined(__MACH__)
#define lseek64 lseek
#define ftruncate64 ftruncate
#define mmap64 mmap
#define off64_t off_t
#endif
#define min(a, b) \
({ typeof(a) _a = (a); typeof(b) _b = (b); (_a < _b) ? _a : _b; })
@@ -119,12 +112,12 @@ static int file_open(struct output_file *out, int fd)
static int file_skip(struct output_file *out, int64_t cnt)
{
off64_t ret;
off_t ret;
struct output_file_normal *outn = to_output_file_normal(out);
ret = lseek64(outn->fd, cnt, SEEK_CUR);
ret = lseek(outn->fd, cnt, SEEK_CUR);
if (ret < 0) {
error_errno("lseek64");
error_errno("lseek");
return -1;
}
return 0;
@@ -135,7 +128,7 @@ static int file_pad(struct output_file *out, int64_t len)
int ret;
struct output_file_normal *outn = to_output_file_normal(out);
ret = ftruncate64(outn->fd, len);
ret = ftruncate(outn->fd, len);
if (ret < 0) {
return -errno;
}
@@ -191,7 +184,7 @@ static int gz_file_open(struct output_file *out, int fd)
static int gz_file_skip(struct output_file *out, int64_t cnt)
{
off64_t ret;
off_t ret;
struct output_file_gz *outgz = to_output_file_gz(out);
ret = gzseek(outgz->gz_fd, cnt, SEEK_CUR);
@@ -204,7 +197,7 @@ static int gz_file_skip(struct output_file *out, int64_t cnt)
static int gz_file_pad(struct output_file *out, int64_t len)
{
off64_t ret;
off_t ret;
struct output_file_gz *outgz = to_output_file_gz(out);
ret = gztell(outgz->gz_fd);
@@ -699,7 +692,7 @@ int write_fd_chunk(struct output_file *out, unsigned int len,
aligned_diff = offset - aligned_offset;
buffer_size = len + aligned_diff;
char *data = mmap64(NULL, buffer_size, PROT_READ, MAP_SHARED, fd,
char *data = mmap(NULL, buffer_size, PROT_READ, MAP_SHARED, fd,
aligned_offset);
if (data == MAP_FAILED) {
return -errno;

23
libsparse/sparse_read.c
View File

@@ -35,11 +35,6 @@
#include "sparse_file.h"
#include "sparse_format.h"
#if defined(__APPLE__) && defined(__MACH__)
#define lseek64 lseek
#define off64_t off_t
#endif
#define SPARSE_HEADER_MAJOR_VER 1
#define SPARSE_HEADER_LEN (sizeof(sparse_header_t))
#define CHUNK_HEADER_LEN (sizeof(chunk_header_t))
@@ -126,7 +121,7 @@ static int process_raw_chunk(struct sparse_file *s, unsigned int chunk_size,
len -= chunk;
}
} else {
lseek64(fd, len, SEEK_CUR);
lseek(fd, len, SEEK_CUR);
}
return 0;
@@ -216,7 +211,7 @@ static int process_crc32_chunk(int fd, unsigned int chunk_size, uint32_t crc32)
return 0;
}
static int process_chunk(struct sparse_file *s, int fd, off64_t offset,
static int process_chunk(struct sparse_file *s, int fd, off_t offset,
unsigned int chunk_hdr_sz, chunk_header_t *chunk_header,
unsigned int cur_block, uint32_t *crc_ptr)
{
@@ -277,7 +272,7 @@ static int sparse_file_read_sparse(struct sparse_file *s, int fd, bool crc)
uint32_t crc32 = 0;
uint32_t *crc_ptr = 0;
unsigned int cur_block = 0;
off64_t offset;
off_t offset;
if (!copybuf) {
copybuf = malloc(COPY_BUF_SIZE);
@@ -316,7 +311,7 @@ static int sparse_file_read_sparse(struct sparse_file *s, int fd, bool crc)
/* Skip the remaining bytes in a header that is longer than
* we expected.
*/
lseek64(fd, sparse_header.file_hdr_sz - SPARSE_HEADER_LEN, SEEK_CUR);
lseek(fd, sparse_header.file_hdr_sz - SPARSE_HEADER_LEN, SEEK_CUR);
}
for (i = 0; i < sparse_header.total_chunks; i++) {
@@ -329,10 +324,10 @@ static int sparse_file_read_sparse(struct sparse_file *s, int fd, bool crc)
/* Skip the remaining bytes in a header that is longer than
* we expected.
*/
lseek64(fd, sparse_header.chunk_hdr_sz - CHUNK_HEADER_LEN, SEEK_CUR);
lseek(fd, sparse_header.chunk_hdr_sz - CHUNK_HEADER_LEN, SEEK_CUR);
}
offset = lseek64(fd, 0, SEEK_CUR);
offset = lseek(fd, 0, SEEK_CUR);
ret = process_chunk(s, fd, offset, sparse_header.chunk_hdr_sz, &chunk_header,
cur_block, crc_ptr);
@@ -451,7 +446,7 @@ struct sparse_file *sparse_file_import(int fd, bool verbose, bool crc)
return NULL;
}
ret = lseek64(fd, 0, SEEK_SET);
ret = lseek(fd, 0, SEEK_SET);
if (ret < 0) {
verbose_error(verbose, ret, "seeking");
sparse_file_destroy(s);
@@ -480,12 +475,12 @@ struct sparse_file *sparse_file_import_auto(int fd, bool crc, bool verbose)
return s;
}
len = lseek64(fd, 0, SEEK_END);
len = lseek(fd, 0, SEEK_END);
if (len < 0) {
return NULL;
}
lseek64(fd, 0, SEEK_SET);
lseek(fd, 0, SEEK_SET);
s = sparse_file_new(4096, len);
if (!s) {