From 8dc63ddc326ec54709c580a400536fcc4ef62622 Mon Sep 17 00:00:00 2001 From: midipix Date: Mon, 19 Feb 2024 01:54:51 +0000 Subject: library api's: _util_ (utility helper interfaces) namespace overhaul. --- src/helper/slbt_archive_import.c | 69 -------------------- src/helper/slbt_copy_file.c | 76 ---------------------- src/helper/slbt_dump_machine.c | 135 --------------------------------------- src/helper/slbt_map_input.c | 67 ------------------- src/helper/slbt_realpath.c | 101 ----------------------------- 5 files changed, 448 deletions(-) delete mode 100644 src/helper/slbt_archive_import.c delete mode 100644 src/helper/slbt_copy_file.c delete mode 100644 src/helper/slbt_dump_machine.c delete mode 100644 src/helper/slbt_map_input.c delete mode 100644 src/helper/slbt_realpath.c (limited to 'src/helper') diff --git a/src/helper/slbt_archive_import.c b/src/helper/slbt_archive_import.c deleted file mode 100644 index d339f78..0000000 --- a/src/helper/slbt_archive_import.c +++ /dev/null @@ -1,69 +0,0 @@ -/*******************************************************************/ -/* slibtool: a skinny libtool implementation, written in C */ -/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */ -/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */ -/*******************************************************************/ - -#include -#include "slibtool_driver_impl.h" -#include "slibtool_symlink_impl.h" -#include "slibtool_errinfo_impl.h" - -/* legacy fallback, no longer in use */ -extern int slbt_archive_import_mri( - const struct slbt_driver_ctx * dctx, - struct slbt_exec_ctx * ectx, - char * dstarchive, - char * srcarchive); - -/* use slibtool's in-memory archive merging facility */ -static int slbt_archive_import_impl( - const struct slbt_driver_ctx * dctx, - struct slbt_exec_ctx * ectx, - char * dstarchive, - char * srcarchive) -{ - int ret; - struct slbt_archive_ctx * arctxv[3] = {0,0,0}; - struct slbt_archive_ctx * arctx; - - (void)ectx; - - if (slbt_ar_get_archive_ctx(dctx,dstarchive,&arctxv[0]) < 0) - return SLBT_NESTED_ERROR(dctx); - - if (slbt_ar_get_archive_ctx(dctx,srcarchive,&arctxv[1]) < 0) { - slbt_ar_free_archive_ctx(arctxv[0]); - return SLBT_NESTED_ERROR(dctx); - } - - ret = slbt_ar_merge_archives(arctxv,&arctx); - - slbt_ar_free_archive_ctx(arctxv[0]); - slbt_ar_free_archive_ctx(arctxv[1]); - - if (ret == 0) { - ret = slbt_ar_store_archive(arctx,dstarchive,0644); - slbt_ar_free_archive_ctx(arctx); - } - - return (ret < 0) ? SLBT_NESTED_ERROR(dctx) : 0; -} - - -int slbt_archive_import( - const struct slbt_driver_ctx * dctx, - struct slbt_exec_ctx * ectx, - char * dstarchive, - char * srcarchive) -{ - if (slbt_symlink_is_a_placeholder( - slbt_driver_fdcwd(dctx), - srcarchive)) - return 0; - - return slbt_archive_import_impl( - dctx,ectx, - dstarchive, - srcarchive); -} diff --git a/src/helper/slbt_copy_file.c b/src/helper/slbt_copy_file.c deleted file mode 100644 index 8f4d264..0000000 --- a/src/helper/slbt_copy_file.c +++ /dev/null @@ -1,76 +0,0 @@ -/*******************************************************************/ -/* slibtool: a skinny libtool implementation, written in C */ -/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */ -/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */ -/*******************************************************************/ - -#include -#include "slibtool_driver_impl.h" -#include "slibtool_spawn_impl.h" -#include "slibtool_symlink_impl.h" -#include "slibtool_errinfo_impl.h" - -int slbt_copy_file( - const struct slbt_driver_ctx * dctx, - struct slbt_exec_ctx * ectx, - char * src, - char * dst) -{ - int fdcwd; - char ** oargv; - char * oprogram; - char * cp[4]; - int ret; - - /* fdcwd */ - fdcwd = slbt_driver_fdcwd(dctx); - - /* placeholder? */ - if (slbt_symlink_is_a_placeholder(fdcwd,src)) - return 0; - - /* cp argv */ - cp[0] = "cp"; - cp[1] = src; - cp[2] = dst; - cp[3] = 0; - - /* alternate argument vector */ - oprogram = ectx->program; - oargv = ectx->argv; - ectx->argv = cp; - ectx->program = "cp"; - - /* step output */ - if (!(dctx->cctx->drvflags & SLBT_DRIVER_SILENT)) { - if (dctx->cctx->mode == SLBT_MODE_LINK) { - if (slbt_output_link(dctx,ectx)) { - ectx->argv = oargv; - ectx->program = oprogram; - return SLBT_NESTED_ERROR(dctx); - } - } else { - if (slbt_output_install(dctx,ectx)) { - ectx->argv = oargv; - ectx->program = oprogram; - return SLBT_NESTED_ERROR(dctx); - } - } - } - - /* cp spawn */ - if ((slbt_spawn(ectx,true) < 0) && (ectx->pid < 0)) { - ret = SLBT_SPAWN_ERROR(dctx); - - } else if (ectx->exitcode) { - ret = SLBT_CUSTOM_ERROR( - dctx, - SLBT_ERR_COPY_ERROR); - } else { - ret = 0; - } - - ectx->argv = oargv; - ectx->program = oprogram; - return ret; -} diff --git a/src/helper/slbt_dump_machine.c b/src/helper/slbt_dump_machine.c deleted file mode 100644 index 40ef387..0000000 --- a/src/helper/slbt_dump_machine.c +++ /dev/null @@ -1,135 +0,0 @@ -/*******************************************************************/ -/* slibtool: a skinny libtool implementation, written in C */ -/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */ -/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */ -/*******************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include "slibtool_spawn_impl.h" -#include "slibtool_snprintf_impl.h" - -static void slbt_dump_machine_child( - char * program, - int fd[2]) -{ - char * compiler; - char * argv[3]; - - close(fd[0]); - - if ((compiler = strrchr(program,'/'))) - compiler++; - else - compiler = program; - - argv[0] = compiler; - argv[1] = "-dumpmachine"; - argv[2] = 0; - - if ((fd[0] = openat(AT_FDCWD,"/dev/null",O_RDONLY,0)) >= 0) - if (dup2(fd[0],0) == 0) - if (dup2(fd[1],1) == 1) - execvp(program,argv); - - _exit(EXIT_FAILURE); -} - -int slbt_dump_machine( - const char * compiler, - char * machine, - size_t buflen) -{ - ssize_t ret; - pid_t pid; - pid_t rpid; - int code; - int fd[2]; - char * mark; - char program[PATH_MAX]; - - /* setup */ - if (!machine || !buflen || !--buflen) { - errno = EINVAL; - return -1; - } - - if (slbt_snprintf(program,sizeof(program), - "%s",compiler) < 0) - return -1; - - /* fork */ - if (pipe(fd)) - return -1; - - if ((pid = fork()) < 0) { - close(fd[0]); - close(fd[1]); - return -1; - } - - /* child */ - if (pid == 0) - slbt_dump_machine_child( - program, - fd); - - /* parent */ - close(fd[1]); - - mark = machine; - - for (; buflen; ) { - ret = read(fd[0],mark,buflen); - - while ((ret < 0) && (errno == EINTR)) - ret = read(fd[0],mark,buflen); - - if (ret > 0) { - buflen -= ret; - mark += ret; - - } else if (ret == 0) { - close(fd[0]); - buflen = 0; - - } else { - close(fd[0]); - return -1; - } - } - - /* execve verification */ - rpid = waitpid( - pid, - &code, - 0); - - if ((rpid != pid) || code) { - errno = ESTALE; - return -1; - } - - /* newline verification */ - if ((mark == machine) || (*--mark != '\n')) { - errno = ERANGE; - return -1; - } - - *mark = 0; - - /* portbld <--> unknown synonym? */ - if ((mark = strstr(machine,"-portbld-"))) - memcpy(mark,"-unknown",8); - - /* all done */ - return 0; -} diff --git a/src/helper/slbt_map_input.c b/src/helper/slbt_map_input.c deleted file mode 100644 index ca0b06b..0000000 --- a/src/helper/slbt_map_input.c +++ /dev/null @@ -1,67 +0,0 @@ -/*******************************************************************/ -/* slibtool: a skinny libtool implementation, written in C */ -/* Copyright (C) 2015--2024 SysDeer Technologies, LLC */ -/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */ -/*******************************************************************/ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include "slibtool_driver_impl.h" -#include "slibtool_errinfo_impl.h" - -int slbt_map_input( - const struct slbt_driver_ctx * dctx, - int fd, - const char * path, - int prot, - struct slbt_input * map) -{ - int ret; - struct stat st; - bool fnew; - int fdcwd; - - fdcwd = slbt_driver_fdcwd(dctx); - - if ((fnew = (fd < 0))) - fd = openat(fdcwd,path,O_RDONLY | O_CLOEXEC); - - if (fd < 0) - return SLBT_SYSTEM_ERROR(dctx,path); - - if ((ret = fstat(fd,&st) < 0) && fnew) - close(fd); - - else if ((st.st_size == 0) && fnew) - close(fd); - - if (ret < 0) - return SLBT_SYSTEM_ERROR(dctx,path); - - if (st.st_size == 0) { - map->size = 0; - map->addr = 0; - } else { - 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) - ? SLBT_SYSTEM_ERROR(dctx,path) - : 0; -} - -int slbt_unmap_input(struct slbt_input * map) -{ - return map->size ? munmap(map->addr,map->size) : 0; -} diff --git a/src/helper/slbt_realpath.c b/src/helper/slbt_realpath.c deleted file mode 100644 index 936a9eb..0000000 --- a/src/helper/slbt_realpath.c +++ /dev/null @@ -1,101 +0,0 @@ -/*******************************************************************/ -/* slibtool: a skinny libtool implementation, written in C */ -/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */ -/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */ -/*******************************************************************/ - -#include -#include -#include -#include -#include -#include - -#include "slibtool_driver_impl.h" -#include "slibtool_readlink_impl.h" - -#ifdef HAVE_SYS_SYSCALL_H -#include -#endif - -#ifdef _MIDIPIX_ABI -#include -#endif - -#ifndef ENOTSUP -#define ENOTSUP EOPNOTSUPP -#endif - -#ifdef SYS___realpathat -extern long syscall(int, ...); -#endif - -int slbt_realpath( - int fdat, - const char * path, - int options, - char * buf, - size_t buflen) -{ - int ret; - int fd; - int fdproc; - struct stat st; - struct stat stproc; - char procfspath[36]; - - /* common validation */ - if (!buf || (options & O_CREAT)) { - errno = EINVAL; - return -1; - } - - /* framework-based wrapper */ -#ifdef _MIDIPIX_ABI - return __fs_rpath(fdat,path,options,buf,buflen); -#endif - -#ifdef SYS___realpathat - return syscall(SYS___realpathat,fdat,path,buf,buflen,0); -#endif - - /* buflen */ - if (buflen < PATH_MAX) { - errno = ENOBUFS; - return -1; - } - - /* AT_FDCWD */ - if (fdat == AT_FDCWD) { - return realpath(path,buf) ? 0 : -1; - } - - /* /proc/self/fd */ - if ((fd = openat(fdat,path,options,0)) < 0) - return -1; - - sprintf(procfspath,"/proc/self/fd/%d",fd); - - if (slbt_readlinkat(fdat,procfspath,buf,buflen)) { - close(fd); - return -1; - } - - if ((fdproc = openat(AT_FDCWD,buf,options|O_NOFOLLOW,0)) < 0) { - close(fd); - errno = ELOOP; - return -1; - } - - ret = fstat(fd,&st) || fstat(fdproc,&stproc); - - close(fd); - close(fdproc); - - if (ret || (st.st_dev != stproc.st_dev) || (st.st_ino != stproc.st_ino)) { - errno = ENOTSUP; - return -1; - } - - return 0; -} -- cgit v1.2.3