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

ash: cosmetic fixes, no code changes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-08-07 02:44:33 +02:00
parent 1614900522
commit 09dd6ec732
1 changed files with 19 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
shell/ash.c
View File

@ -5687,7 +5687,7 @@ removerecordregions(int endoff)
return; return;
if (ifsfirst.endoff > endoff) { if (ifsfirst.endoff > endoff) {
while (ifsfirst.next != NULL) { while (ifsfirst.next) {
struct ifsregion *ifsp; struct ifsregion *ifsp;
INT_OFF; INT_OFF;
ifsp = ifsfirst.next->next; ifsp = ifsfirst.next->next;
@ -5695,9 +5695,9 @@ removerecordregions(int endoff)
ifsfirst.next = ifsp; ifsfirst.next = ifsp;
INT_ON; INT_ON;
} }
if (ifsfirst.begoff > endoff) if (ifsfirst.begoff > endoff) {
ifslastp = NULL; ifslastp = NULL;
else { } else {
ifslastp = &ifsfirst; ifslastp = &ifsfirst;
ifsfirst.endoff = endoff; ifsfirst.endoff = endoff;
} }
@ -5707,7 +5707,7 @@ removerecordregions(int endoff)
ifslastp = &ifsfirst; ifslastp = &ifsfirst;
while (ifslastp->next && ifslastp->next->begoff < endoff) while (ifslastp->next && ifslastp->next->begoff < endoff)
ifslastp = ifslastp->next; ifslastp = ifslastp->next;
while (ifslastp->next != NULL) { while (ifslastp->next) {
struct ifsregion *ifsp; struct ifsregion *ifsp;
INT_OFF; INT_OFF;
ifsp = ifslastp->next->next; ifsp = ifslastp->next->next;
@ -5884,9 +5884,9 @@ expbackq(union node *cmd, int quoted, int quotes)
if (quoted == 0) if (quoted == 0)
recordregion(startloc, dest - (char *)stackblock(), 0); recordregion(startloc, dest - (char *)stackblock(), 0);
TRACE(("evalbackq: size=%d: \"%.*s\"\n", TRACE(("evalbackq: size:%d:'%.*s'\n",
(dest - (char *)stackblock()) - startloc, (int)((dest - (char *)stackblock()) - startloc),
(dest - (char *)stackblock()) - startloc, (int)((dest - (char *)stackblock()) - startloc),
stackblock() + startloc)); stackblock() + startloc));
} }
@ -6105,42 +6105,16 @@ argstr(char *p, int flags, struct strlist *var_str_list)
} }
static char * static char *
scanleft(char *startp, char *rmesc, char *rmescend UNUSED_PARAM, char *str, int quotes, scanleft(char *startp, char *rmesc, char *rmescend UNUSED_PARAM,
int zero) char *pattern, int quotes, int zero)
{ {
// This commented out code was added by James Simmons <jsimmons@infradead.org> char *loc, *loc2;
// as part of a larger change when he added support for ${var/a/b}.
// However, it broke # and % operators:
//
//var=ababcdcd
// ok bad
//echo ${var#ab} abcdcd abcdcd
//echo ${var##ab} abcdcd abcdcd
//echo ${var#a*b} abcdcd ababcdcd (!)
//echo ${var##a*b} cdcd cdcd
//echo ${var#?} babcdcd ababcdcd (!)
//echo ${var##?} babcdcd babcdcd
//echo ${var#*} ababcdcd babcdcd (!)
//echo ${var##*}
//echo ${var%cd} ababcd ababcd
//echo ${var%%cd} ababcd abab (!)
//echo ${var%c*d} ababcd ababcd
//echo ${var%%c*d} abab ababcdcd (!)
//echo ${var%?} ababcdc ababcdc
//echo ${var%%?} ababcdc ababcdcd (!)
//echo ${var%*} ababcdcd ababcdcd
//echo ${var%%*}
//
// Commenting it back out helped. Remove it completely if it really
// is not needed.
char *loc, *loc2; //, *full;
char c; char c;
loc = startp; loc = startp;
loc2 = rmesc; loc2 = rmesc;
do { do {
int match; // = strlen(str); int match;
const char *s = loc2; const char *s = loc2;
c = *loc2; c = *loc2;
@ -6148,35 +6122,22 @@ scanleft(char *startp, char *rmesc, char *rmescend UNUSED_PARAM, char *str, int
*loc2 = '\0'; *loc2 = '\0';
s = rmesc; s = rmesc;
} }
match = pmatch(str, s); // this line was deleted match = pmatch(pattern, s);
// // chop off end if its '*'
// full = strrchr(str, '*');
// if (full && full != str)
// match--;
//
// // If str starts with '*' replace with s.
// if ((*str == '*') && strlen(s) >= match) {
// full = xstrdup(s);
// strncpy(full+strlen(s)-match+1, str+1, match-1);
// } else
// full = xstrndup(str, match);
// match = strncmp(s, full, strlen(full));
// free(full);
//
*loc2 = c; *loc2 = c;
if (match) // if (!match) if (match)
return loc; return loc;
if (quotes && (unsigned char)*loc == CTLESC) if (quotes && (unsigned char)*loc == CTLESC)
loc++; loc++;
loc++; loc++;
loc2++; loc2++;
} while (c); } while (c);
return 0; return NULL;
} }
static char * static char *
scanright(char *startp, char *rmesc, char *rmescend, char *pattern, int quotes, int match_at_start) scanright(char *startp, char *rmesc, char *rmescend,
char *pattern, int quotes, int match_at_start)
{ {
#if !ENABLE_ASH_OPTIMIZE_FOR_SIZE #if !ENABLE_ASH_OPTIMIZE_FOR_SIZE
int try2optimize = match_at_start; int try2optimize = match_at_start;
@ -6242,7 +6203,7 @@ scanright(char *startp, char *rmesc, char *rmescend, char *pattern, int quotes,
} }
} }
} }
return 0; return NULL;
} }
static void varunset(const char *, const char *, const char *, int) NORETURN; static void varunset(const char *, const char *, const char *, int) NORETURN;
@ -6262,7 +6223,7 @@ varunset(const char *end, const char *var, const char *umsg, int varflags)
msg = umsg; msg = umsg;
} }
} }
ash_msg_and_raise_error("%.*s: %s%s", end - var - 1, var, msg, tail); ash_msg_and_raise_error("%.*s: %s%s", (int)(end - var - 1), var, msg, tail);
} }
#if ENABLE_ASH_BASH_COMPAT #if ENABLE_ASH_BASH_COMPAT