From 3b884b09c8e0fd82a50cbb58f875e65c1ee0eb30 Mon Sep 17 00:00:00 2001 From: midipix Date: Sat, 25 Jun 2016 17:29:22 -0400 Subject: utility: improved box integration, removed need for build-time macro. --- src/driver/pe_amain.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/perk.c | 107 ------------------------------------------------ 2 files changed, 110 insertions(+), 107 deletions(-) create mode 100644 src/driver/pe_amain.c (limited to 'src') diff --git a/src/driver/pe_amain.c b/src/driver/pe_amain.c new file mode 100644 index 0000000..caebe58 --- /dev/null +++ b/src/driver/pe_amain.c @@ -0,0 +1,110 @@ +/***************************************************************/ +/* perk: PE Resource Kit */ +/* Copyright (C) 2015--2016 Z. Gilboa */ +/* Released under GPLv2 and GPLv3; see COPYING.PERK. */ +/***************************************************************/ + +#include +#include +#include +#include +#include "perk_driver_impl.h" + +#ifndef PERK_DRIVER_FLAGS +#define PERK_DRIVER_FLAGS PERK_DRIVER_VERBOSITY_ERRORS \ + | PERK_DRIVER_VERBOSITY_USAGE +#endif + +static const char vermsg[] = "%s%s%s (git://midipix.org/perk): " + "version %s%d.%d.%d%s.\n" + "[commit reference: %s%s%s]\n"; + +static const char * const pe_ver_color[6] = { + "\x1b[1m\x1b[35m","\x1b[0m", + "\x1b[1m\x1b[32m","\x1b[0m", + "\x1b[1m\x1b[34m","\x1b[0m" +}; + +static const char * const pe_ver_plain[6] = { + "","", + "","", + "","" +}; + +static ssize_t pe_version(struct pe_driver_ctx * dctx) +{ + const struct pe_source_version * verinfo; + const char * const * verclr; + + verinfo = pe_source_version(); + verclr = isatty(STDOUT_FILENO) ? pe_ver_color : pe_ver_plain; + + return fprintf(stdout,vermsg, + verclr[0],dctx->program,verclr[1], + verclr[2],verinfo->major,verinfo->minor, + verinfo->revision,verclr[3], + verclr[4],verinfo->commit,verclr[5]); +} + +static ssize_t pe_paragraph_break(struct pe_unit_ctx * uctx, int * fpara) +{ + if (*fpara) { + *fpara = 0; + + if (uctx->cctx->ioctx->fdout >= 0) + return write(uctx->cctx->ioctx->fdout,"\n",1); + else + return fputc('\n',stdout); + } else + return 0; +} + +static void pe_perform_unit_actions(struct pe_unit_ctx * uctx) +{ + int fpara = 0; + uint64_t flags = uctx->cctx->fmtflags; + + if (flags & PERK_OUTPUT_EXPORT_SYMS) { + uctx->status = pe_output_export_symbols(uctx->meta,uctx->cctx,0); + uctx->nerrors += !!uctx->status; + fpara += uctx->meta->summary.nexpsyms; + } + + if ((flags & PERK_OUTPUT_IMPORT_LIBS) || (flags & PERK_OUTPUT_IMPORT_SYMS)) { + pe_paragraph_break(uctx,&fpara); + uctx->status = pe_output_import_libraries(uctx->meta,uctx->cctx,0); + uctx->nerrors += !!uctx->status; + fpara += (uctx->meta->summary.nimplibs > 0); + } +} + +static int pe_exit(struct pe_driver_ctx * dctx, int nerrors) +{ + pe_free_driver_ctx(dctx); + return nerrors ? 2 : 0; +} + +int pe_main(int argc, char ** argv, char ** envp) +{ + int ret; + struct pe_driver_ctx * dctx; + struct pe_unit_ctx * uctx; + const char ** unit; + + if ((ret = pe_get_driver_ctx(argv,envp,PERK_DRIVER_FLAGS,&dctx))) + return (ret == PERK_USAGE) ? !--argc : 2; + + if (dctx->cctx->drvflags & PERK_DRIVER_VERSION) + if ((pe_version(dctx)) < 0) + return pe_exit(dctx,2); + + for (unit=dctx->units; *unit; unit++) { + if (!(pe_get_unit_ctx(dctx,*unit,&uctx))) { + pe_perform_unit_actions(uctx); + ret += uctx->nerrors; + pe_free_unit_ctx(uctx); + } + } + + return pe_exit(dctx,ret); +} diff --git a/src/perk.c b/src/perk.c index 3cce4f2..7e13657 100644 --- a/src/perk.c +++ b/src/perk.c @@ -4,116 +4,9 @@ /* Released under GPLv2 and GPLv3; see COPYING.PERK. */ /***************************************************************/ -#include -#include #include -#include -#include "perk_driver_impl.h" - -#ifndef PERK_DRIVER_FLAGS -#define PERK_DRIVER_FLAGS PERK_DRIVER_VERBOSITY_ERRORS \ - | PERK_DRIVER_VERBOSITY_USAGE -#endif - -static const char vermsg[] = "%s%s%s (git://midipix.org/perk): " - "version %s%d.%d.%d%s.\n" - "[commit reference: %s%s%s]\n"; - -static const char * const pe_ver_color[6] = { - "\x1b[1m\x1b[35m","\x1b[0m", - "\x1b[1m\x1b[32m","\x1b[0m", - "\x1b[1m\x1b[34m","\x1b[0m" -}; - -static const char * const pe_ver_plain[6] = { - "","", - "","", - "","" -}; - -static ssize_t pe_version(struct pe_driver_ctx * dctx) -{ - const struct pe_source_version * verinfo; - const char * const * verclr; - - verinfo = pe_source_version(); - verclr = isatty(STDOUT_FILENO) ? pe_ver_color : pe_ver_plain; - - return fprintf(stdout,vermsg, - verclr[0],dctx->program,verclr[1], - verclr[2],verinfo->major,verinfo->minor, - verinfo->revision,verclr[3], - verclr[4],verinfo->commit,verclr[5]); -} - -static ssize_t pe_paragraph_break(struct pe_unit_ctx * uctx, int * fpara) -{ - if (*fpara) { - *fpara = 0; - - if (uctx->cctx->ioctx->fdout >= 0) - return write(uctx->cctx->ioctx->fdout,"\n",1); - else - return fputc('\n',stdout); - } else - return 0; -} - -static void pe_perform_unit_actions(struct pe_unit_ctx * uctx) -{ - int fpara = 0; - uint64_t flags = uctx->cctx->fmtflags; - - if (flags & PERK_OUTPUT_EXPORT_SYMS) { - uctx->status = pe_output_export_symbols(uctx->meta,uctx->cctx,0); - uctx->nerrors += !!uctx->status; - fpara += uctx->meta->summary.nexpsyms; - } - - if ((flags & PERK_OUTPUT_IMPORT_LIBS) || (flags & PERK_OUTPUT_IMPORT_SYMS)) { - pe_paragraph_break(uctx,&fpara); - uctx->status = pe_output_import_libraries(uctx->meta,uctx->cctx,0); - uctx->nerrors += !!uctx->status; - fpara += (uctx->meta->summary.nimplibs > 0); - } -} - -static int pe_exit(struct pe_driver_ctx * dctx, int nerrors) -{ - pe_free_driver_ctx(dctx); - return nerrors ? 2 : 0; -} - -int pe_main(int argc, char ** argv, char ** envp) -{ - int ret; - struct pe_driver_ctx * dctx; - struct pe_unit_ctx * uctx; - const char ** unit; - - if ((ret = pe_get_driver_ctx(argv,envp,PERK_DRIVER_FLAGS,&dctx))) - return (ret == PERK_USAGE) ? !--argc : 2; - - if (dctx->cctx->drvflags & PERK_DRIVER_VERSION) - if ((pe_version(dctx)) < 0) - return pe_exit(dctx,2); - - for (unit=dctx->units; *unit; unit++) { - if (!(pe_get_unit_ctx(dctx,*unit,&uctx))) { - pe_perform_unit_actions(uctx); - ret += uctx->nerrors; - pe_free_unit_ctx(uctx); - } - } - - return pe_exit(dctx,ret); -} - -#ifndef PERK_IN_A_BOX int main(int argc, char ** argv, char ** envp) { return pe_main(argc,argv,envp); } - -#endif -- cgit v1.2.3