emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove nearly-duplicate PATHs in several places

Browse Source 
function                                             old     new   delta
bb_PATH_root_path                                      -      35     +35
varunset                                              60      58      -2
arith                                               2042    2033      -9
bb_default_root_login_path                            30       -     -30
.rodata                                           128794  128762     -32
which_main                                           152     117     -35
defpathvar                                            40       -     -40
------------------------------------------------------------------------------
(add/remove: 1/2 grow/shrink: 0/4 up/down: 35/-148)          Total: -113 bytes
This commit is contained in:
Denis Vlasenko
2007-06-12 22:35:19 +00:00
parent f312e32662
commit f5f75c5e82
7 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shell/ash.c
View File

@@ -1581,7 +1581,6 @@ static unsigned long rseed;
# define VDYNAMIC 0
#endif
static const char defpathvar[] = "PATH=/usr/local/bin:/usr/bin:/sbin:/bin";
#ifdef IFS_BROKEN
static const char defifsvar[] = "IFS= \t\n";
#define defifs (defifsvar + 4)
@@ -1674,7 +1673,7 @@ static struct var varinit[] = {
{ NULL, VSTRFIXED|VTEXTFIXED|VUNSET, "MAIL\0", changemail },
{ NULL, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH\0", changemail },
#endif
{ NULL, VSTRFIXED|VTEXTFIXED, defpathvar, changepath },
{ NULL, VSTRFIXED|VTEXTFIXED, bb_PATH_root_path, changepath },
{ NULL, VSTRFIXED|VTEXTFIXED, "PS1=$ ", NULL },
{ NULL, VSTRFIXED|VTEXTFIXED, "PS2=> ", NULL },
{ NULL, VSTRFIXED|VTEXTFIXED, "PS4=+ ", NULL },
@@ -1710,7 +1709,6 @@ static struct var varinit[] = {
#else
#define vrandom (&vps4)[1]
#endif
#define defpath (defpathvar + 5)
/*
* The following macros access the values of the above variables.
@@ -7874,7 +7872,7 @@ parse_command_args(char **argv, const char **path)
do {
switch (c) {
case 'p':
*path = defpath;
*path = bb_default_path;
break;
default:
/* run 'typecmd' for other options */