ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ash: make "test -x" use cached groupinfo

Browse source 
function                                             old     new   delta
test_main2                                             -     407    +407
testcmd                                               10      23     +13
test_main                                            418      56    -362
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 1/1 up/down: 420/-362)           Total: 58 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2024-10-07 07:14:27 +02:00
parent 4c1d645c86
commit d26e958725
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
coreutils/test.c
View file

@ -426,7 +426,7 @@ struct test_statics {
/* set only by check_operator(), either to bogus struct
* or points to matching operator_t struct. Never NULL. */
const struct operator_t *last_operator;
struct cached_groupinfo groupinfo;
struct cached_groupinfo *groupinfo;
#if BASH_TEST2
bool bash_test2;
#endif
@ -447,7 +447,6 @@ extern struct test_statics *BB_GLOBAL_CONST test_ptr_to_statics;
XZALLOC_CONST_PTR(&test_ptr_to_statics, sizeof(S)); \
} while (0)
#define DEINIT_S() do { \
free(groupinfo.supplementary_array); \
free(test_ptr_to_statics); \
} while (0)
@ -642,7 +641,7 @@ static int is_a_group_member(gid_t gid)
if (gid == getgid() || gid == getegid())
return 1;
return is_in_supplementary_groups(&groupinfo, gid);
return is_in_supplementary_groups(groupinfo, gid);
}
/*
@ -878,7 +877,7 @@ static number_t primary(enum token n)
}
int test_main(int argc, char **argv)
int FAST_FUNC test_main2(struct cached_groupinfo *pgroupinfo, int argc, char **argv)
{
int res;
const char *arg0;
@ -911,6 +910,7 @@ int test_main(int argc, char **argv)
/* We must do DEINIT_S() prior to returning */
INIT_S();
groupinfo = pgroupinfo;
#if BASH_TEST2
bash_test2 = bt2;
@ -1013,3 +1013,16 @@ int test_main(int argc, char **argv)
DEINIT_S();
return res;
}
int test_main(int argc, char **argv)
{
struct cached_groupinfo info;
int r;
info.ngroups = 0;
info.supplementary_array = NULL;
r = test_main2(&info, argc, argv);
free(info.supplementary_array);
return r;
}

1
include/libbb.h
View file

@ -1550,6 +1550,7 @@ int test_main(int argc, char **argv)
MAIN_EXTERNALLY_VISIBLE
#endif
;
int FAST_FUNC test_main2(struct cached_groupinfo *pgroupinfo, int argc, char **argv);
int kill_main(int argc, char **argv)
#if ENABLE_KILL || ENABLE_KILLALL || ENABLE_KILLALL5
MAIN_EXTERNALLY_VISIBLE

3
shell/ash.c
View file

@ -10175,8 +10175,7 @@ static int FAST_FUNC echocmd(int argc, char **argv) { return echo_main(argc, a
static int FAST_FUNC printfcmd(int argc, char **argv) { return printf_main(argc, argv); }
#endif
#if ENABLE_ASH_TEST || BASH_TEST2
static int FAST_FUNC testcmd(int argc, char **argv) { return test_main(argc, argv); }
// TODO: pass &ngroups and &group_array addresses to test_main to use cached supplementary groups
static int FAST_FUNC testcmd(int argc, char **argv) { return test_main2(&groupinfo, argc, argv); }
#endif
#if ENABLE_ASH_SLEEP
static int FAST_FUNC sleepcmd(int argc, char **argv) { return sleep_main(argc, argv); }