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

ash: trivial simplifications and optimizations

Browse Source 
function                                             old     new   delta
rmescapes                                              -     256    +256
memtodest                                             94     103      +9
evalvar                                             1363    1365      +2
_rmescapes                                           256       -    -256
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 2/0 up/down: 267/-256)           Total: 11 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-08-29 20:23:20 +02:00
parent e6c483ec30
commit b6c8434896
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
shell/ash.c
View File

@ -461,15 +461,15 @@ out2str(const char *p)
/* ============ Parser structures */ /* ============ Parser structures */
/* control characters in argument strings */ /* control characters in argument strings */
#define CTLESC '\201' /* escape next character */ #define CTLESC ((unsigned char)'\201') /* escape next character */
#define CTLVAR '\202' /* variable defn */ #define CTLVAR ((unsigned char)'\202') /* variable defn */
#define CTLENDVAR '\203' #define CTLENDVAR ((unsigned char)'\203')
#define CTLBACKQ '\204' #define CTLBACKQ ((unsigned char)'\204')
#define CTLQUOTE 01 /* ored with CTLBACKQ code if in quotes */ #define CTLQUOTE 01 /* ored with CTLBACKQ code if in quotes */
/* CTLBACKQ | CTLQUOTE == '\205' */ /* CTLBACKQ | CTLQUOTE == '\205' */
#define CTLARI '\206' /* arithmetic expression */ #define CTLARI ((unsigned char)'\206') /* arithmetic expression */
#define CTLENDARI '\207' #define CTLENDARI ((unsigned char)'\207')
#define CTLQUOTEMARK '\210' #define CTLQUOTEMARK ((unsigned char)'\210')
/* variable substitution byte (follows CTLVAR) */ /* variable substitution byte (follows CTLVAR) */
#define VSTYPE 0x0f /* type of variable substitution */ #define VSTYPE 0x0f /* type of variable substitution */
@ -5379,7 +5379,7 @@ esclen(const char *start, const char *p)
* Remove any CTLESC characters from a string. * Remove any CTLESC characters from a string.
*/ */
static char * static char *
_rmescapes(char *str, int flag) rmescapes(char *str, int flag)
{ {
static const char qchars[] ALIGN1 = { CTLESC, CTLQUOTEMARK, '\0' }; static const char qchars[] ALIGN1 = { CTLESC, CTLQUOTEMARK, '\0' };
@ -5442,8 +5442,6 @@ _rmescapes(char *str, int flag)
} }
return r; return r;
} }
#define rmescapes(p) _rmescapes((p), 0)
#define pmatch(a, b) !fnmatch((a), (b), 0) #define pmatch(a, b) !fnmatch((a), (b), 0)
/* /*
@ -5458,7 +5456,7 @@ preglob(const char *pattern, int quoted, int flag)
if (quoted) { if (quoted) {
flag |= RMESCAPE_QUOTED; flag |= RMESCAPE_QUOTED;
} }
return _rmescapes((char *)pattern, flag); return rmescapes((char *)pattern, flag);
} }
/* /*
@ -5469,14 +5467,17 @@ memtodest(const char *p, size_t len, int syntax, int quotes)
{ {
char *q = expdest; char *q = expdest;
q = makestrspace(len * 2, q); q = makestrspace(quotes ? len * 2 : len, q);
while (len--) { while (len--) {
int c = signed_char2int(*p++); int c = signed_char2int(*p++);
if (!c) if (!c)
continue; continue;
if (quotes && (SIT(c, syntax) == CCTL || SIT(c, syntax) == CBACK)) if (quotes) {
int n = SIT(c, syntax);
if (n == CCTL || n == CBACK)
USTPUTC(CTLESC, q); USTPUTC(CTLESC, q);
}
USTPUTC(c, q); USTPUTC(c, q);
} }
@ -5776,7 +5777,7 @@ expari(int quotes)
expdest = p; expdest = p;
if (quotes) if (quotes)
rmescapes(p + 2); rmescapes(p + 2, 0);
len = cvtnum(ash_arith(p + 2)); len = cvtnum(ash_arith(p + 2));
@ -6196,7 +6197,7 @@ subevalvar(char *p, char *str, int strloc, int subtype,
rmesc = startp; rmesc = startp;
rmescend = (char *)stackblock() + strloc; rmescend = (char *)stackblock() + strloc;
if (quotes) { if (quotes) {
rmesc = _rmescapes(startp, RMESCAPE_ALLOC | RMESCAPE_GROW); rmesc = rmescapes(startp, RMESCAPE_ALLOC | RMESCAPE_GROW);
if (rmesc != startp) { if (rmesc != startp) {
rmescend = expdest; rmescend = expdest;
startp = (char *)stackblock() + startloc; startp = (char *)stackblock() + startloc;
@ -6939,7 +6940,7 @@ expandmeta(struct strlist *str /*, int flag*/)
*/ */
nometa: nometa:
*exparg.lastp = str; *exparg.lastp = str;
rmescapes(str->text); rmescapes(str->text, 0);
exparg.lastp = &str->next; exparg.lastp = &str->next;
} else { } else {
*exparg.lastp = NULL; *exparg.lastp = NULL;
@ -6987,7 +6988,7 @@ expandarg(union node *arg, struct arglist *arglist, int flag)
expandmeta(exparg.list /*, flag*/); expandmeta(exparg.list /*, flag*/);
} else { } else {
if (flag & EXP_REDIR) /*XXX - for now, just remove escapes */ if (flag & EXP_REDIR) /*XXX - for now, just remove escapes */
rmescapes(p); rmescapes(p, 0);
sp = stzalloc(sizeof(*sp)); sp = stzalloc(sizeof(*sp));
sp->text = p; sp->text = p;
*exparg.lastp = sp; *exparg.lastp = sp;
@ -10412,7 +10413,7 @@ parsefname(void)
TRACE(("Here document %d\n", n->type)); TRACE(("Here document %d\n", n->type));
if (!noexpand(wordtext) || (i = strlen(wordtext)) == 0 || i > EOFMARKLEN) if (!noexpand(wordtext) || (i = strlen(wordtext)) == 0 || i > EOFMARKLEN)
raise_error_syntax("illegal eof marker for << redirection"); raise_error_syntax("illegal eof marker for << redirection");
rmescapes(wordtext); rmescapes(wordtext, 0);
here->eofmark = wordtext; here->eofmark = wordtext;
here->next = NULL; here->next = NULL;
if (heredoclist == NULL) if (heredoclist == NULL)