Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-10-11 10:23:41 +00:00
Code Issues Projects Releases Wiki Activity

test: shrink a bit

Browse Source 
function                                             old     new   delta
test_main                                              5     434    +429
bb_test                                              473       -    -473
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 1/0 up/down: 429/-473)          Total: -44 bytes
   text    data     bss     dec     hex filename
 735073    3028   14408  752509   b7b7d busybox_old
 735029    3028   14408  752465   b7b51 busybox_unstripped
This commit is contained in:
Denis Vlasenko 2007-06-21 13:35:52 +00:00
parent d67a606489
commit b304eadca8
3 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
coreutils/test.c
View File

@ -155,7 +155,7 @@ typedef int arith_t;
#endif #endif
/* Cannot eliminate these static data (do the G trick) /* Cannot eliminate these static data (do the G trick)
* because of bb_test usage from other applets */ * because of test_main usage from other applets */
static char **t_wp; static char **t_wp;
static struct t_op const *t_wp_op; static struct t_op const *t_wp_op;
static gid_t *group_array; static gid_t *group_array;
@ -179,7 +179,7 @@ static int test_eaccess(char *path, int mode);
static int is_a_group_member(gid_t gid); static int is_a_group_member(gid_t gid);
static void initialize_group_array(void); static void initialize_group_array(void);
int bb_test(int argc, char **argv) int test_main(int argc, char **argv)
{ {
int res; int res;
char *arg0; char *arg0;
@ -188,21 +188,19 @@ int bb_test(int argc, char **argv)
arg0 = strrchr(argv[0], '/'); arg0 = strrchr(argv[0], '/');
if (!arg0++) arg0 = argv[0]; if (!arg0++) arg0 = argv[0];
if (arg0[0] == '[') { if (arg0[0] == '[') {
--argc;
if (!arg0[1]) { /* "[" ? */ if (!arg0[1]) { /* "[" ? */
--argc;
if (NOT_LONE_CHAR(argv[argc], ']')) { if (NOT_LONE_CHAR(argv[argc], ']')) {
bb_error_msg("missing ]"); bb_error_msg("missing ]");
return 2; return 2;
} }
argv[argc] = NULL; } else { /* assuming "[[" */
} else if (LONE_CHAR(arg0+1, '[') == 0) { /* "[[" ? */
--argc;
if (strcmp(argv[argc], "]]") != 0) { if (strcmp(argv[argc], "]]") != 0) {
bb_error_msg("missing ]]"); bb_error_msg("missing ]]");
return 2; return 2;
} }
argv[argc] = NULL;
} }
argv[argc] = NULL;
} }
res = setjmp(leaving); res = setjmp(leaving);
@ -571,7 +569,7 @@ static void initialize_group_array(void)
if (ngroups > 0) { if (ngroups > 0) {
/* FIXME: ash tries so hard to not die on OOM, /* FIXME: ash tries so hard to not die on OOM,
* and we spoil it with just one xrealloc here */ * and we spoil it with just one xrealloc here */
/* We realloc, because bb_test can be entered repeatedly by shell. /* We realloc, because test_main can be entered repeatedly by shell.
* Testcase (ash): 'while true; do test -x some_file; done' * Testcase (ash): 'while true; do test -x some_file; done'
* and watch top. (some_file must have owner != you) */ * and watch top. (some_file must have owner != you) */
group_array = xrealloc(group_array, ngroups * sizeof(gid_t)); group_array = xrealloc(group_array, ngroups * sizeof(gid_t));
@ -601,12 +599,3 @@ static int is_a_group_member(gid_t gid)
return 0; return 0;
} }
/* applet entry point */
int test_main(int argc, char **argv);
int test_main(int argc, char **argv)
{
return bb_test(argc, argv);
}

2
include/libbb.h
View File

@ -653,7 +653,7 @@ extern void bb_vinfo_msg(const char *s, va_list p);
/* applets which are useful from another applets */ /* applets which are useful from another applets */
int bb_cat(char** argv); int bb_cat(char** argv);
int bb_echo(char** argv); int bb_echo(char** argv);
int bb_test(int argc, char** argv); int test_main(int argc, char** argv);
int kill_main(int argc, char **argv); int kill_main(int argc, char **argv);
#if ENABLE_ROUTE #if ENABLE_ROUTE
void bb_displayroutes(int noresolve, int netstatfmt); void bb_displayroutes(int noresolve, int netstatfmt);

2
shell/ash.c
View File

@ -10985,7 +10985,7 @@ echocmd(int argc, char **argv)
static int static int
testcmd(int argc, char **argv) testcmd(int argc, char **argv)
{ {
return bb_test(argc, argv); return test_main(argc, argv);
} }
#endif #endif