From 26197fc232d7c4a305f38e7b8a27654abb4e0e9b Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Fri, 16 Mar 2018 12:29:37 +0000 Subject: Remove import, prepare for 2.5.0.0 --- src/libexecline/deps-lib/execline | 2 +- src/libexecline/exlsn_import.c | 83 --------------------------------------- src/libexecline/exlsn_importas.c | 72 +++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 84 deletions(-) delete mode 100644 src/libexecline/exlsn_import.c create mode 100644 src/libexecline/exlsn_importas.c (limited to 'src/libexecline') diff --git a/src/libexecline/deps-lib/execline b/src/libexecline/deps-lib/execline index 13a7352..96d4e18 100644 --- a/src/libexecline/deps-lib/execline +++ b/src/libexecline/deps-lib/execline @@ -15,7 +15,7 @@ el_transform.o el_vardupl.o exlsn_define.o exlsn_elglob.o -exlsn_import.o +exlsn_importas.o exlsn_multidefine.o exlsn_exlp.o exlsn_main.o diff --git a/src/libexecline/exlsn_import.c b/src/libexecline/exlsn_import.c deleted file mode 100644 index 254ab78..0000000 --- a/src/libexecline/exlsn_import.c +++ /dev/null @@ -1,83 +0,0 @@ -/* ISC license. */ - -#include -#include -#include -#include -#include -#include -#include -#include "exlsn.h" - -static int exlsn_import_as (int argc, char const **argv, char const *const *envp, exlsn_t *info, unsigned int as) -{ - eltransforminfo_t si = ELTRANSFORMINFO_ZERO ; - subgetopt_t localopt = SUBGETOPT_ZERO ; - elsubst_t blah ; - char const *defaultval = 0 ; - char const *x ; - int insist = 0 ; - int unexport = 0 ; - blah.var = info->vars.len ; - blah.value = info->values.len ; - - for (;;) - { - int opt = subgetopt_r(argc, argv, "iuD:nsCcd:", &localopt) ; - if (opt < 0) break ; - switch (opt) - { - case 'i' : insist = 1 ; break ; - case 'u' : unexport = 1 ; break ; - case 'D' : defaultval = localopt.arg ; break ; - case 'n' : si.chomp = 1 ; break ; - case 's' : si.split = 1 ; break ; - case 'C' : si.crunch = 1 ; break ; - case 'c' : si.crunch = 0 ; break ; - case 'd' : si.delim = localopt.arg ; break ; - default : return -3 ; - } - } - argc -= localopt.ind ; argv += localopt.ind ; - - if ((unsigned int)argc < 1+as) return -3 ; - if (!*argv[0] || el_vardupl(argv[0], info->vars.s, info->vars.len)) return -2 ; - if (!stralloc_catb(&info->vars, argv[0], strlen(argv[0]) + 1)) return -1 ; - x = env_get2(envp, argv[as]) ; - if (!x) - { - if (insist) strerr_dienotset(100, argv[as]) ; - x = defaultval ; - } - else if (unexport) - { - if (!stralloc_catb(&info->modifs, argv[as], strlen(argv[as]) + 1)) goto err ; - } - if (!x) blah.n = 0 ; - else - { - int r ; - if (!stralloc_cats(&info->values, x)) goto err ; - r = el_transform(&info->values, blah.value, &si) ; - if (r < 0) goto err ; - blah.n = r ; - } - if (!genalloc_append(elsubst_t, &info->data, &blah)) goto err ; - return localopt.ind + 1 + as ; - - err: - info->vars.len = blah.var ; - info->values.len = blah.value ; - return -1 ; -} - -int exlsn_import (int argc, char const **argv, char const *const *envp, exlsn_t *info) -{ - strerr_warnw1x("the import command and directive are obsolescent, please use importas instead!") ; - return exlsn_import_as(argc, argv, envp, info, 0) ; -} - -int exlsn_importas (int argc, char const **argv, char const *const *envp, exlsn_t *info) -{ - return exlsn_import_as(argc, argv, envp, info, 1) ; -} diff --git a/src/libexecline/exlsn_importas.c b/src/libexecline/exlsn_importas.c new file mode 100644 index 0000000..d8d9ff6 --- /dev/null +++ b/src/libexecline/exlsn_importas.c @@ -0,0 +1,72 @@ +/* ISC license. */ + +#include +#include +#include +#include +#include +#include +#include +#include "exlsn.h" + +int exlsn_importas (int argc, char const **argv, char const *const *envp, exlsn_t *info) +{ + eltransforminfo_t si = ELTRANSFORMINFO_ZERO ; + subgetopt_t localopt = SUBGETOPT_ZERO ; + elsubst_t blah ; + char const *defaultval = 0 ; + char const *x ; + int insist = 0 ; + int unexport = 0 ; + blah.var = info->vars.len ; + blah.value = info->values.len ; + + for (;;) + { + int opt = subgetopt_r(argc, argv, "iuD:nsCcd:", &localopt) ; + if (opt < 0) break ; + switch (opt) + { + case 'i' : insist = 1 ; break ; + case 'u' : unexport = 1 ; break ; + case 'D' : defaultval = localopt.arg ; break ; + case 'n' : si.chomp = 1 ; break ; + case 's' : si.split = 1 ; break ; + case 'C' : si.crunch = 1 ; break ; + case 'c' : si.crunch = 0 ; break ; + case 'd' : si.delim = localopt.arg ; break ; + default : return -3 ; + } + } + argc -= localopt.ind ; argv += localopt.ind ; + + if ((unsigned int)argc < 2) return -3 ; + if (!*argv[0] || el_vardupl(argv[0], info->vars.s, info->vars.len)) return -2 ; + if (!stralloc_catb(&info->vars, argv[0], strlen(argv[0]) + 1)) return -1 ; + x = env_get2(envp, argv[1]) ; + if (!x) + { + if (insist) strerr_dienotset(100, argv[1]) ; + x = defaultval ; + } + else if (unexport) + { + if (!stralloc_catb(&info->modifs, argv[1], strlen(argv[1]) + 1)) goto err ; + } + if (!x) blah.n = 0 ; + else + { + int r ; + if (!stralloc_cats(&info->values, x)) goto err ; + r = el_transform(&info->values, blah.value, &si) ; + if (r < 0) goto err ; + blah.n = r ; + } + if (!genalloc_append(elsubst_t, &info->data, &blah)) goto err ; + return localopt.ind + 2 ; + + err: + info->vars.len = blah.var ; + info->values.len = blah.value ; + return -1 ; +} -- cgit v1.3.1