From 00a88c01dc20c33da1936600d46974d460a23cc4 Mon Sep 17 00:00:00 2001 From: midipix Date: Wed, 8 Feb 2017 01:08:41 -0500 Subject: project: source tree: tidy up. --- src/helper/mdso_create_asm_source.c | 66 ------------------------------------- src/helper/mdso_create_output.c | 66 +++++++++++++++++++++++++++++++++++++ src/helper/mdso_map_input.c | 62 ++++++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+), 66 deletions(-) delete mode 100644 src/helper/mdso_create_asm_source.c create mode 100644 src/helper/mdso_create_output.c create mode 100644 src/helper/mdso_map_input.c (limited to 'src/helper') diff --git a/src/helper/mdso_create_asm_source.c b/src/helper/mdso_create_asm_source.c deleted file mode 100644 index b152697..0000000 --- a/src/helper/mdso_create_asm_source.c +++ /dev/null @@ -1,66 +0,0 @@ -/****************************************************************/ -/* mdso: midipix dso scavenger */ -/* Copyright (C) 2015--2017 Z. Gilboa */ -/* Released under GPLv2 and GPLv3; see COPYING.MDSO. */ -/****************************************************************/ - -#include -#include -#include -#include -#include -#include - -#include -#include "mdso_driver_impl.h" -#include "mdso_errinfo_impl.h" - -static FILE * mdso_create_output( - const struct mdso_driver_ctx * dctx, - const char * name) -{ - struct mdso_driver_ctx_impl * ictx; - uintptr_t addr; - int fdout; - FILE * fout; - - addr = (uintptr_t)dctx - offsetof(struct mdso_driver_ctx_impl,ctx); - ictx = (struct mdso_driver_ctx_impl *)addr; - - if ((fdout = openat(ictx->fddst,name, - O_CREAT|O_TRUNC|O_WRONLY|O_NOCTTY|O_NOFOLLOW, - S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)) < 0) { - MDSO_SYSTEM_ERROR(dctx); - return 0; - } - - if (!(fout = fdopen(fdout,"w"))) { - close(fdout); - MDSO_SYSTEM_ERROR(dctx); - return 0; - } - - return fout; -} - -FILE * mdso_create_asm_source( - const struct mdso_driver_ctx * dctx, - const char * asmname) -{ - if (!dctx->cctx->dstdir) - return stdout; - - return mdso_create_output(dctx,asmname); -} - -FILE * mdso_create_object( - const struct mdso_driver_ctx * dctx, - const char * objname) -{ - if (!dctx->cctx->dstdir) { - MDSO_CUSTOM_ERROR(dctx,MDSO_ERR_INVALID_DSTDIR); - return 0; - } - - return mdso_create_output(dctx,objname); -} diff --git a/src/helper/mdso_create_output.c b/src/helper/mdso_create_output.c new file mode 100644 index 0000000..b152697 --- /dev/null +++ b/src/helper/mdso_create_output.c @@ -0,0 +1,66 @@ +/****************************************************************/ +/* mdso: midipix dso scavenger */ +/* Copyright (C) 2015--2017 Z. Gilboa */ +/* Released under GPLv2 and GPLv3; see COPYING.MDSO. */ +/****************************************************************/ + +#include +#include +#include +#include +#include +#include + +#include +#include "mdso_driver_impl.h" +#include "mdso_errinfo_impl.h" + +static FILE * mdso_create_output( + const struct mdso_driver_ctx * dctx, + const char * name) +{ + struct mdso_driver_ctx_impl * ictx; + uintptr_t addr; + int fdout; + FILE * fout; + + addr = (uintptr_t)dctx - offsetof(struct mdso_driver_ctx_impl,ctx); + ictx = (struct mdso_driver_ctx_impl *)addr; + + if ((fdout = openat(ictx->fddst,name, + O_CREAT|O_TRUNC|O_WRONLY|O_NOCTTY|O_NOFOLLOW, + S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)) < 0) { + MDSO_SYSTEM_ERROR(dctx); + return 0; + } + + if (!(fout = fdopen(fdout,"w"))) { + close(fdout); + MDSO_SYSTEM_ERROR(dctx); + return 0; + } + + return fout; +} + +FILE * mdso_create_asm_source( + const struct mdso_driver_ctx * dctx, + const char * asmname) +{ + if (!dctx->cctx->dstdir) + return stdout; + + return mdso_create_output(dctx,asmname); +} + +FILE * mdso_create_object( + const struct mdso_driver_ctx * dctx, + const char * objname) +{ + if (!dctx->cctx->dstdir) { + MDSO_CUSTOM_ERROR(dctx,MDSO_ERR_INVALID_DSTDIR); + return 0; + } + + return mdso_create_output(dctx,objname); +} diff --git a/src/helper/mdso_map_input.c b/src/helper/mdso_map_input.c new file mode 100644 index 0000000..77401f3 --- /dev/null +++ b/src/helper/mdso_map_input.c @@ -0,0 +1,62 @@ +/****************************************************************/ +/* mdso: midipix dso scavenger */ +/* Copyright (C) 2015--2017 Z. Gilboa */ +/* Released under GPLv2 and GPLv3; see COPYING.MDSO. */ +/****************************************************************/ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include "mdso_errinfo_impl.h" + +int mdso_map_input( + const struct mdso_driver_ctx * dctx, + int fd, + const char * path, + int prot, + struct mdso_input * map) +{ + struct stat st; + bool fnew; + int ret; + + if ((fnew = (fd < 0))) + fd = open(path,O_RDONLY | O_CLOEXEC); + + if (fd < 0) + return MDSO_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 MDSO_SYSTEM_ERROR(dctx); + + else if (st.st_size == 0) + return MDSO_CUSTOM_ERROR( + dctx,MDSO_ERR_SOURCE_SIZE_ZERO); + + map->size = st.st_size; + map->addr = mmap(0,map->size,prot,MAP_PRIVATE,fd,0); + + if (fnew) + close(fd); + + return (map->addr == MAP_FAILED) + ? MDSO_SYSTEM_ERROR(dctx) + : 0; +} + +int mdso_unmap_input(struct mdso_input * map) +{ + return munmap(map->addr,map->size); +} -- cgit v1.2.3