From a7c63916dcd5b63b7965174af87d0edb55bd6194 Mon Sep 17 00:00:00 2001 From: midipix Date: Fri, 30 May 2025 23:37:19 +0000 Subject: library api: _raw_ (raw image api) namespace overhaul. --- src/driver/pe_unit_ctx.c | 4 +-- src/logic/pe_image_raw_data.c | 66 +++++++++++++++++++++++++++++++++++++++++++ src/logic/pe_map_raw_image.c | 66 ------------------------------------------- 3 files changed, 68 insertions(+), 68 deletions(-) create mode 100644 src/logic/pe_image_raw_data.c delete mode 100644 src/logic/pe_map_raw_image.c (limited to 'src') diff --git a/src/driver/pe_unit_ctx.c b/src/driver/pe_unit_ctx.c index 8a88884..d1fea0e 100644 --- a/src/driver/pe_unit_ctx.c +++ b/src/driver/pe_unit_ctx.c @@ -18,7 +18,7 @@ static int pe_lib_free_unit_ctx_impl(struct pe_unit_ctx_impl * ctx, int ret) { if (ctx) { pe_meta_free_image_meta(ctx->meta); - pe_unmap_raw_image(&ctx->map); + pe_raw_unmap_raw_image(&ctx->map); free(ctx); } @@ -47,7 +47,7 @@ int pe_lib_get_unit_ctx( ? PROT_READ | PROT_WRITE : PROT_READ; - if (pe_map_raw_image(dctx,-1,path,prot,&ctx->map)) + if (pe_raw_map_raw_image(dctx,-1,path,prot,&ctx->map)) return pe_lib_free_unit_ctx_impl(ctx, PERK_NESTED_ERROR(dctx)); diff --git a/src/logic/pe_image_raw_data.c b/src/logic/pe_image_raw_data.c new file mode 100644 index 0000000..7ab6da6 --- /dev/null +++ b/src/logic/pe_image_raw_data.c @@ -0,0 +1,66 @@ +/***************************************************************/ +/* perk: PE Resource Kit */ +/* Copyright (C) 2015--2021 SysDeer Technologies, LLC */ +/* Released under GPLv2 and GPLv3; see COPYING.PERK. */ +/***************************************************************/ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include "perk_driver_impl.h" +#include "perk_errinfo_impl.h" + +int pe_raw_map_raw_image( + const struct pe_driver_ctx * dctx, + int fd, + const char * path, + int prot, + struct pe_raw_image * map) +{ + int ret; + struct stat st; + bool fnew; + int fdcwd; + + fdcwd = pe_driver_fdcwd(dctx); + + if ((fnew = (fd < 0))) + fd = openat(fdcwd,path,O_RDONLY | O_CLOEXEC); + + if (fd < 0) + return PERK_SYSTEM_ERROR(dctx); + + if ((ret = fstat(fd,&st) < 0) && fnew) + close(fd); + + else if ((st.st_size == 0) && fnew) + close(fd); + + if (ret < 0) + return PERK_SYSTEM_ERROR(dctx); + + else if (st.st_size == 0) + return PERK_CUSTOM_ERROR( + dctx,PERK_ERR_IMAGE_SIZE_ZERO); + + map->map_size = st.st_size; + map->map_addr = mmap(0,map->map_size,prot,MAP_PRIVATE,fd,0); + + if (fnew) + close(fd); + + return (map->map_addr == MAP_FAILED) + ? PERK_SYSTEM_ERROR(dctx) + : 0; +} + +int pe_raw_unmap_raw_image(struct pe_raw_image * map) +{ + return munmap(map->map_addr,map->map_size); +} diff --git a/src/logic/pe_map_raw_image.c b/src/logic/pe_map_raw_image.c deleted file mode 100644 index 03c47c7..0000000 --- a/src/logic/pe_map_raw_image.c +++ /dev/null @@ -1,66 +0,0 @@ -/***************************************************************/ -/* perk: PE Resource Kit */ -/* Copyright (C) 2015--2021 SysDeer Technologies, LLC */ -/* Released under GPLv2 and GPLv3; see COPYING.PERK. */ -/***************************************************************/ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include "perk_driver_impl.h" -#include "perk_errinfo_impl.h" - -int pe_map_raw_image( - const struct pe_driver_ctx * dctx, - int fd, - const char * path, - int prot, - struct pe_raw_image * map) -{ - int ret; - struct stat st; - bool fnew; - int fdcwd; - - fdcwd = pe_driver_fdcwd(dctx); - - if ((fnew = (fd < 0))) - fd = openat(fdcwd,path,O_RDONLY | O_CLOEXEC); - - if (fd < 0) - return PERK_SYSTEM_ERROR(dctx); - - if ((ret = fstat(fd,&st) < 0) && fnew) - close(fd); - - else if ((st.st_size == 0) && fnew) - close(fd); - - if (ret < 0) - return PERK_SYSTEM_ERROR(dctx); - - else if (st.st_size == 0) - return PERK_CUSTOM_ERROR( - dctx,PERK_ERR_IMAGE_SIZE_ZERO); - - map->map_size = st.st_size; - map->map_addr = mmap(0,map->map_size,prot,MAP_PRIVATE,fd,0); - - if (fnew) - close(fd); - - return (map->map_addr == MAP_FAILED) - ? PERK_SYSTEM_ERROR(dctx) - : 0; -} - -int pe_unmap_raw_image(struct pe_raw_image * map) -{ - return munmap(map->map_addr,map->map_size); -} -- cgit v1.2.3