summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/import.html2
-rw-r--r--doc/importas.html6
-rw-r--r--src/execline/import.c2
-rw-r--r--src/execline/importas.c2
-rw-r--r--src/include-local/exlsn.h10
-rw-r--r--src/libexecline/el_substandrun.c2
-rw-r--r--src/libexecline/el_substandrun_str.c9
-rw-r--r--src/libexecline/exlsn_free.c1
-rw-r--r--src/libexecline/exlsn_import.c8
-rw-r--r--src/libexecline/exlsn_main.c2
10 files changed, 30 insertions, 14 deletions
diff --git a/doc/import.html b/doc/import.html
index 1c6896c..7e80b35 100644
--- a/doc/import.html
+++ b/doc/import.html
@@ -25,7 +25,7 @@ then executes another program.
<h2> Interface </h2>
<pre>
- import [ -i | -D <em>default</em> ] [ -s ] [ -C | -c ] [ -n ] [ -d <em>delim</em> ] <em>envvar</em> <em>prog...</em>
+ import [ -i | -D <em>default</em> ] [ -u ] [ -s ] [ -C | -c ] [ -n ] [ -d <em>delim</em> ] <em>envvar</em> <em>prog...</em>
</pre>
<ul>
diff --git a/doc/importas.html b/doc/importas.html
index a9c6f15..81dca83 100644
--- a/doc/importas.html
+++ b/doc/importas.html
@@ -25,7 +25,7 @@ environment variable, then executes another program.
<h2> Interface </h2>
<pre>
- importas [ -i | -D default ] [ -s ] [ -C | -c ] [ -n ] [ -d <em>delim</em> ] <em>variable</em> <em>envvar</em> <em>prog...</em>
+ importas [ -i | -D default ] [ -u ] [ -s ] [ -C | -c ] [ -n ] [ -d <em>delim</em> ] <em>variable</em> <em>envvar</em> <em>prog...</em>
</pre>
<ul>
@@ -49,6 +49,10 @@ use <tt>-D&nbsp;""</tt>. </li>
<li> <tt>-i</tt>&nbsp;: Insist. If <em>envvar</em> is undefined,
<tt>importas</tt> will not do anything; instead, it will exit 100 with an
error message. This has precedence over any <tt>-D</tt> option. </li>
+ <li> <tt>-u</tt>&nbsp;: Unexport. <em>envvar</em> will be removed from
+the environment after the substitution. <tt>importas -u <em>variable</em>
+<em>envvar</em></tt> is equivalent to <tt>importas <em>variable</em>
+<em>envvar</em> unexport <em>envvar</em></tt>. </li>
<li> Other options are used to <a href="el_transform.html">control
the substitution mechanism</a>. </li>
</ul>
diff --git a/src/execline/import.c b/src/execline/import.c
index 5a95886..7d58f01 100644
--- a/src/execline/import.c
+++ b/src/execline/import.c
@@ -3,7 +3,7 @@
#include <skalibs/strerr2.h>
#include "exlsn.h"
-#define USAGE "import [ -i | -D default ] [ -n ] [ -s ] [ -C | -c ] [ -d delim ] var prog..."
+#define USAGE "import [ -i | -D default ] [ -u ] [ -n ] [ -s ] [ -C | -c ] [ -d delim ] var prog..."
int main (int argc, char const **argv, char const *const *envp)
{
diff --git a/src/execline/importas.c b/src/execline/importas.c
index 026efce..4011c83 100644
--- a/src/execline/importas.c
+++ b/src/execline/importas.c
@@ -3,7 +3,7 @@
#include <skalibs/strerr2.h>
#include "exlsn.h"
-#define USAGE "importas [ -i | -D default ] [ -n ] [ -s ] [ -C | -c ] [ -d delim ] key var prog..."
+#define USAGE "importas [ -i | -D default ] [ -u ] [ -n ] [ -s ] [ -C | -c ] [ -d delim ] key var prog..."
int main (int argc, char const **argv, char const *const *envp)
{
diff --git a/src/include-local/exlsn.h b/src/include-local/exlsn.h
index 3665bca..2bdcf58 100644
--- a/src/include-local/exlsn.h
+++ b/src/include-local/exlsn.h
@@ -5,16 +5,18 @@
#include <skalibs/gccattributes.h>
#include <skalibs/stralloc.h>
+#include <skalibs/genalloc.h>
typedef struct exlsn_s exlsn_t, *exlsn_t_ref ;
struct exlsn_s
{
stralloc vars ;
stralloc values ;
- stralloc data ; /* array of elsubst */
+ genalloc data ; /* array of elsubst */
+ stralloc modifs ;
} ;
-#define EXLSN_ZERO { .vars = STRALLOC_ZERO, .values = STRALLOC_ZERO, .data = STRALLOC_ZERO }
+#define EXLSN_ZERO { .vars = STRALLOC_ZERO, .values = STRALLOC_ZERO, .data = GENALLOC_ZERO, .modifs = STRALLOC_ZERO }
extern void exlsn_free (exlsn_t *) ;
@@ -29,8 +31,8 @@ extern exlsnfunc_t exlsn_exlp ;
extern exlsnfunc_t exlsn_multidefine ;
extern int exlp (unsigned int, char const *const *, exlsn_t *) ;
-extern void el_substandrun (int, char const *const *, char const *const *, exlsn_t *) gccattr_noreturn ;
-extern void el_substandrun_str (stralloc *, unsigned int, char const *const *, exlsn_t *) gccattr_noreturn ;
+extern void el_substandrun (int, char const *const *, char const *const *, exlsn_t const *) gccattr_noreturn ;
+extern void el_substandrun_str (stralloc *, unsigned int, char const *const *, exlsn_t const *) gccattr_noreturn ;
extern void exlsn_main (int, char const **, char const *const *, exlsnfunc_t *, char const *) gccattr_noreturn ;
#endif
diff --git a/src/libexecline/el_substandrun.c b/src/libexecline/el_substandrun.c
index 7dddbca..11502ea 100644
--- a/src/libexecline/el_substandrun.c
+++ b/src/libexecline/el_substandrun.c
@@ -5,7 +5,7 @@
#include <skalibs/skamisc.h>
#include "exlsn.h"
-void el_substandrun (int argc, char const *const *argv, char const *const *envp, exlsn_t *info)
+void el_substandrun (int argc, char const *const *argv, char const *const *envp, exlsn_t const *info)
{
satmp.len = 0 ;
if (!env_string(&satmp, argv, (unsigned int)argc)) strerr_diefu1sys(111, "env_string") ;
diff --git a/src/libexecline/el_substandrun_str.c b/src/libexecline/el_substandrun_str.c
index 351ec9d..8168287 100644
--- a/src/libexecline/el_substandrun_str.c
+++ b/src/libexecline/el_substandrun_str.c
@@ -1,5 +1,6 @@
/* ISC license. */
+#include <unistd.h>
#include <skalibs/djbunix.h>
#include <skalibs/env.h>
#include <skalibs/strerr2.h>
@@ -8,18 +9,18 @@
#include <execline/execline.h>
#include "exlsn.h"
-void el_substandrun_str (stralloc *src, unsigned int srcbase, char const *const *envp, exlsn_t *info)
+void el_substandrun_str (stralloc *src, unsigned int srcbase, char const *const *envp, exlsn_t const *info)
{
stralloc dst = STRALLOC_ZERO ;
- register int r = el_substitute(&dst, src->s + srcbase, src->len, info->vars.s, info->values.s, genalloc_s(elsubst_t, &info->data), genalloc_len(elsubst_t, &info->data)) ;
+ register int r = el_substitute(&dst, src->s + srcbase, src->len, info->vars.s, info->values.s, genalloc_s(elsubst_t const, &info->data), genalloc_len(elsubst_t const, &info->data)) ;
if (r < 0) strerr_diefu1sys(111, "el_substitute") ;
- exlsn_free(info) ;
+ if (!r) _exit(0) ;
stralloc_free(src) ;
{
char const *v[r + 1] ;
if (!env_make(v, r, dst.s, dst.len)) strerr_diefu1sys(111, "env_make") ;
v[r] = 0 ;
- pathexec0_run(v, envp) ;
+ pathexec_r(v, envp, env_len(envp), info->modifs.s, info->modifs.len) ;
}
strerr_dieexec(111, dst.s) ;
}
diff --git a/src/libexecline/exlsn_free.c b/src/libexecline/exlsn_free.c
index 4d9dde3..832a292 100644
--- a/src/libexecline/exlsn_free.c
+++ b/src/libexecline/exlsn_free.c
@@ -8,5 +8,6 @@ void exlsn_free (exlsn_t *info)
stralloc_free(&info->vars) ;
stralloc_free(&info->values) ;
stralloc_free(&info->data) ;
+ stralloc_free(&info->modifs) ;
}
diff --git a/src/libexecline/exlsn_import.c b/src/libexecline/exlsn_import.c
index 1574027..6e37fd0 100644
--- a/src/libexecline/exlsn_import.c
+++ b/src/libexecline/exlsn_import.c
@@ -17,16 +17,18 @@ static int exlsn_import_as (int argc, char const **argv, char const *const *envp
char const *defaultval = 0 ;
char const *x ;
int insist = 0 ;
+ int unexport = 0 ;
blah.var = info->vars.len ;
blah.value = info->values.len ;
for (;;)
{
- register int opt = subgetopt_r(argc, argv, "iD:nsCcd:", &localopt) ;
+ register 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 ;
@@ -47,6 +49,10 @@ static int exlsn_import_as (int argc, char const **argv, char const *const *envp
if (insist) strerr_dienotset(100, argv[as]) ;
x = defaultval ;
}
+ else if (unexport)
+ {
+ if (!stralloc_catb(&info->modifs, argv[as], str_len(argv[as]) + 1)) goto err ;
+ }
if (!x) blah.n = 0 ;
else
{
diff --git a/src/libexecline/exlsn_main.c b/src/libexecline/exlsn_main.c
index e50fc2d..0fe7bd1 100644
--- a/src/libexecline/exlsn_main.c
+++ b/src/libexecline/exlsn_main.c
@@ -1,6 +1,8 @@
/* ISC license. */
+#include <skalibs/bytestr.h>
#include <skalibs/strerr2.h>
+#include <skalibs/genalloc.h>
#include <execline/execline.h>
#include "exlsn.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 17:53:44 +0000