2ec9b6c Actually align everything on off_t is a better idea — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Actually align everything on off_t is a better idea

Baptiste Daroussin committed 11 years ago

commit 2ec9b6cc3964072f9142e0d7940c8fa6753028a7
parent 85e7617

5 files changed +9 -9

modified libpkg/pkg.c

@@ -399,7 +399,7 @@ pkg_set_from_fileat(int fd, struct pkg *pkg, pkg_attr attr, const char *path,

     bool trimcr)
 {
 	char *buf = NULL;
 	size_t size = 0;
 	off_t size = 0;
 	int ret = EPKG_OK;
 	assert(pkg != NULL);

@@ -422,7 +422,7 @@ int

 pkg_set_from_file(struct pkg *pkg, pkg_attr attr, const char *path, bool trimcr)
 {
 	char *buf = NULL;
 	size_t size = 0;
 	off_t size = 0;
 	int ret = EPKG_OK;
 	assert(pkg != NULL);

@@ -867,7 +867,7 @@ pkg_addscript_fileat(int fd, struct pkg *pkg, const char *filename)

 	char *data;
 	pkg_script type;
 	int ret = EPKG_OK;
 	size_t sz = 0;
 	off_t sz = 0;
 	assert(pkg != NULL);
 	assert(filename != NULL);

modified libpkg/pkg_manifest.c

@@ -739,7 +739,7 @@ pkg_parse_manifest_fileat(int dfd, struct pkg *pkg, const char *file,

 	ucl_object_t *obj = NULL;
 	int rc;
 	char *data;
 	size_t sz = 0;
 	off_t sz = 0;
 	assert(pkg != NULL);
 	assert(file != NULL);

modified libpkg/private/utils.h

@@ -88,8 +88,8 @@ void sbuf_free(struct sbuf *);

 ssize_t sbuf_size(struct sbuf *);
 int mkdirs(const char *path);
 int file_to_buffer(const char *, char **, size_t *);
 int file_to_bufferat(int, const char *, char **, size_t *);
 int file_to_buffer(const char *, char **, off_t *);
 int file_to_bufferat(int, const char *, char **, off_t *);
 int format_exec_cmd(char **, const char *, const char *, const char *, char *,
     int argc, char **argv);
 int is_dir(const char *);

modified libpkg/rsa.c

@@ -214,7 +214,7 @@ rsa_verify(const char *path, const char *key, unsigned char *sig,

 	bool need_close = false;
 	struct rsa_verify_cbdata cbdata;
 	unsigned char *key_buf;
 	size_t key_len;
 	off_t key_len;
 	if (file_to_buffer(key, (char**)&key_buf, &key_len) != EPKG_OK) {
 		pkg_emit_errno("rsa_verify", "cannot read key");

modified libpkg/utils.c

@@ -146,7 +146,7 @@ mkdirs(const char *_path)

 	return (EPKG_OK);
 }
 int
 file_to_bufferat(int dfd, const char *path, char **buffer, size_t *sz)
 file_to_bufferat(int dfd, const char *path, char **buffer, off_t *sz)
 {
 	int fd = -1;
 	struct stat st;

@@ -195,7 +195,7 @@ file_to_bufferat(int dfd, const char *path, char **buffer, size_t *sz)

 }
 int
 file_to_buffer(const char *path, char **buffer, size_t *sz)
 file_to_buffer(const char *path, char **buffer, off_t *sz)
 {
 	int fd = -1;
 	struct stat st;