From c4360e28e0eb77cfd26d77066149ead257ce2ec0 Mon Sep 17 00:00:00 2001 From: midipix Date: Sat, 25 Jun 2016 16:45:36 -0400 Subject: utility: improved box integration, removed need for build-time macro. --- project/common.mk | 1 + src/apimagic.c | 83 ----------------------------------------------- src/driver/amgc_amain.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 83 deletions(-) create mode 100644 src/driver/amgc_amain.c diff --git a/project/common.mk b/project/common.mk index b34fe19..7b45aa3 100644 --- a/project/common.mk +++ b/project/common.mk @@ -1,4 +1,5 @@ COMMON_SRCS = \ + src/driver/amgc_amain.c \ src/driver/amgc_driver_ctx.c \ src/driver/amgc_paradigm_meta.c \ src/driver/amgc_unit_action.c \ diff --git a/src/apimagic.c b/src/apimagic.c index 291fe0c..16b5a1e 100644 --- a/src/apimagic.c +++ b/src/apimagic.c @@ -4,92 +4,9 @@ /* Released under GPLv2 and GPLv3; see COPYING.APIMAGIC. */ /**********************************************************/ -#include -#include #include -#include "apimagic_driver_impl.h" - -#ifndef AMGC_DRIVER_FLAGS -#define AMGC_DRIVER_FLAGS AMGC_DRIVER_VERBOSITY_ERRORS \ - | AMGC_DRIVER_VERBOSITY_USAGE -#endif - -static const char vermsg[] = "%s%s%s (git://midipix.org/apimagic): " - "version %s%d.%d.%d%s.\n" - "[commit reference: %s%s%s]\n"; - -static const char * const amgc_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 amgc_ver_plain[6] = { - "","", - "","", - "","" -}; - -static ssize_t amgc_version(struct amgc_driver_ctx * dctx) -{ - const struct amgc_source_version * verinfo; - const char * const * verclr; - - verinfo = amgc_source_version(); - verclr = isatty(STDOUT_FILENO) ? amgc_ver_color : amgc_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 void amgc_perform_unit_actions(struct amgc_unit_ctx * uctx) -{ - const struct amgc_action * action; - - for (action=uctx->cctx->actions; action->type; action++) - amgc_perform_unit_action(uctx,action,0,stdout); -} - -static int amgc_exit(struct amgc_driver_ctx * dctx, int nerrors) -{ - amgc_free_driver_ctx(dctx); - return nerrors ? 2 : 0; -} - -int amgc_main(int argc, char ** argv, char ** envp) -{ - int ret; - struct amgc_driver_ctx * dctx; - struct amgc_unit_ctx * uctx; - const char ** unit; - - if ((ret = amgc_get_driver_ctx(argv,envp,AMGC_DRIVER_FLAGS,&dctx))) - return (ret == AMGC_USAGE) ? !--argc : 2; - - if (dctx->cctx->drvflags & AMGC_DRIVER_VERSION) - if ((amgc_version(dctx)) < 0) - return amgc_exit(dctx,2); - - for (unit=dctx->units; *unit; unit++) { - if (!(amgc_get_unit_ctx(dctx,*unit,&uctx))) { - amgc_perform_unit_actions(uctx); - ret += uctx->nerrors; - amgc_free_unit_ctx(uctx); - } else - ret++; - } - - return amgc_exit(dctx,ret); -} - -#ifndef APIMAGIC_IN_A_BOX int main(int argc, char ** argv, char ** envp) { return amgc_main(argc,argv,envp); } - -#endif diff --git a/src/driver/amgc_amain.c b/src/driver/amgc_amain.c new file mode 100644 index 0000000..ceaa1ff --- /dev/null +++ b/src/driver/amgc_amain.c @@ -0,0 +1,86 @@ +/**********************************************************/ +/* apimagic: cparser-based API normalization utility */ +/* Copyright (C) 2015--2016 Z. Gilboa */ +/* Released under GPLv2 and GPLv3; see COPYING.APIMAGIC. */ +/**********************************************************/ + +#include +#include +#include +#include "apimagic_driver_impl.h" + +#ifndef AMGC_DRIVER_FLAGS +#define AMGC_DRIVER_FLAGS AMGC_DRIVER_VERBOSITY_ERRORS \ + | AMGC_DRIVER_VERBOSITY_USAGE +#endif + +static const char vermsg[] = "%s%s%s (git://midipix.org/apimagic): " + "version %s%d.%d.%d%s.\n" + "[commit reference: %s%s%s]\n"; + +static const char * const amgc_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 amgc_ver_plain[6] = { + "","", + "","", + "","" +}; + +static ssize_t amgc_version(struct amgc_driver_ctx * dctx) +{ + const struct amgc_source_version * verinfo; + const char * const * verclr; + + verinfo = amgc_source_version(); + verclr = isatty(STDOUT_FILENO) ? amgc_ver_color : amgc_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 void amgc_perform_unit_actions(struct amgc_unit_ctx * uctx) +{ + const struct amgc_action * action; + + for (action=uctx->cctx->actions; action->type; action++) + amgc_perform_unit_action(uctx,action,0,stdout); +} + +static int amgc_exit(struct amgc_driver_ctx * dctx, int nerrors) +{ + amgc_free_driver_ctx(dctx); + return nerrors ? 2 : 0; +} + +int amgc_main(int argc, char ** argv, char ** envp) +{ + int ret; + struct amgc_driver_ctx * dctx; + struct amgc_unit_ctx * uctx; + const char ** unit; + + if ((ret = amgc_get_driver_ctx(argv,envp,AMGC_DRIVER_FLAGS,&dctx))) + return (ret == AMGC_USAGE) ? !--argc : 2; + + if (dctx->cctx->drvflags & AMGC_DRIVER_VERSION) + if ((amgc_version(dctx)) < 0) + return amgc_exit(dctx,2); + + for (unit=dctx->units; *unit; unit++) { + if (!(amgc_get_unit_ctx(dctx,*unit,&uctx))) { + amgc_perform_unit_actions(uctx); + ret += uctx->nerrors; + amgc_free_unit_ctx(uctx); + } else + ret++; + } + + return amgc_exit(dctx,ret); +} -- cgit v1.2.3