ahill/toybox
1
0
Fork 0
mirror of https://codeberg.org/landley/toybox.git synced 2026-01-26 14:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix env properly: env -i uses old $PATH, but use new PATH= when redefined.

Browse Source 
Also add QUIET macro to shut up gcc's "isn't actually used uninitalized"
warnings, instead of doing the "int x=x;" trick.
This commit is contained in:
Rob Landley 2021-11-06 20:10:42 -05:00
parent f8883bd296
commit 284a27675c
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/portability.h
View File

@ -29,6 +29,11 @@
// Test for gcc (using compiler builtin #define)
#ifdef __GNUC__
#ifndef __clang__
#define QUIET = 0 // shut up false positive "may be used uninitialized" warning
#else
#define QUIET
#endif
#define printf_format __attribute__((format(printf, 1, 2)))
#else
#define printf_format

3
tests/env.test
View File

@ -11,7 +11,8 @@ FILTER="| egrep '^(WALRUS|BANANA|LETTERS)=' | sort"
testcmd "read" "$FILTER" "BANANA=hello\nLETTERS=\nWALRUS=42\n" "" ""
testcmd "-u" "-u BANANA $FILTER" "LETTERS=\nWALRUS=42\n" "" ""
testcmd "-uu" "-u LETTERS -u WALRUS $FILTER" "BANANA=hello\n" "" ""
testcmd "-i" "-i \"$(which env)\"" "" "" ""
testcmd "-i uses old \$PATH" "-i echo hello" "hello\n" "" ""
testcmd "-i env" "-i env" "" "" ""
testcmd "-i =" "-i one=two three=four $C | sort" \
"one=two\nthree=four\n" "" ""
testcmd "-0" "-i five=six seven=eight $C -0 | sort -z" "five=six\0seven=eight\0" "" ""

30
toys/posix/env.c
View File

@ -4,6 +4,8 @@
*
* http://opengroup.org/onlinepubs/9699919799/utilities/env.html
*
* Note: env bypasses shell builtins, so don't xexec().
*
* Deviations from posix: "-" argument and -0
USE_ENV(NEWTOY(env, "^i0u*", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_ARGFAIL(125)))
@ -30,7 +32,8 @@ GLOBALS(
void env_main(void)
{
char **ev = toys.optargs;
char **ev = toys.optargs, **ee = 0, **set QUIET, *path = getenv("PATH");
struct string_list *sl = 0;
struct arg_list *u;
// If first nonoption argument is "-" treat it as -i
@ -39,16 +42,25 @@ void env_main(void)
ev++;
}
if (FLAG(i)) xclearenv();
if (FLAG(i)) ee = set = xzalloc(sizeof(void *)*(toys.optc+1));
else for (u = TT.u; u; u = u->next) xunsetenv(u->arg);
for (; *ev; ev++)
if (strchr(*ev, '=')) xsetenv(xstrdup(*ev), 0);
else {
// a common use of env is to bypass shell builtins
toys.stacktop = 0;
xexec(ev);
for (; *ev; ev++) {
if (strchr(*ev, '=')) {
if (FLAG(i)) *set++ = *ev;
else xsetenv(xstrdup(*ev), 0);
if (!strncmp(*ev, "PATH=", 5)) path=(*ev)+5;
} else {
// unfortunately, posix has no exec combining p and e, so do p ourselves
if (!strchr(*ev, '/') && path) {
errno = ENOENT;
for (sl = find_in_path(path, *ev); sl; sl = sl->next)
execve(sl->str, ev, ee ? : environ);
} else execve(*ev, ev, ee ? : environ);
perror_msg("exec %s", *ev);
_exit(126+(errno == ENOENT));
}
}
for (ev = environ; *ev; ev++) xprintf("%s%c", *ev, '\n'*!FLAG(0));
for (ev = ee ? : environ; *ev; ev++) xprintf("%s%c", *ev, '\n'*!FLAG(0));
}