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

hush: use smaller EXP_FLAG_foo constants

Browse Source 
function                                             old     new   delta
expand_string_to_string                              126     124      -2
parse_stream                                        2376    2370      -6
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-8)               Total: -8 bytes

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Denys Vlasenko 2010-09-21 12:35:39 +02:00
parent 63adf83814
commit 0e13b4019c
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
shell/hush.c
View File

@ -391,18 +391,10 @@ enum {
RES_SNTX RES_SNTX
}; };
enum {
EXP_FLAG_GLOB = 0x200,
EXP_FLAG_ESC_GLOB_CHARS = 0x100,
EXP_FLAG_SINGLEWORD = 0x80, /* must be 0x80 */
};
typedef struct o_string { typedef struct o_string {
char *data; char *data;
int length; /* position where data is appended */ int length; /* position where data is appended */
int maxlen; int maxlen;
/* Protect newly added chars against globbing
* (by prepending \ to *, ?, [, \) */
int o_expflags; int o_expflags;
/* At least some part of the string was inside '' or "", /* At least some part of the string was inside '' or "",
* possibly empty one: word"", wo''rd etc. */ * possibly empty one: word"", wo''rd etc. */
@ -411,10 +403,18 @@ typedef struct o_string {
smallint o_assignment; /* 0:maybe, 1:yes, 2:no */ smallint o_assignment; /* 0:maybe, 1:yes, 2:no */
} o_string; } o_string;
enum { enum {
MAYBE_ASSIGNMENT = 0, EXP_FLAG_SINGLEWORD = 0x80, /* must be 0x80 */
EXP_FLAG_GLOB = 0x2,
/* Protect newly added chars against globbing
* by prepending \ to *, ?, [, \ */
EXP_FLAG_ESC_GLOB_CHARS = 0x1,
};
enum {
MAYBE_ASSIGNMENT = 0,
DEFINITELY_ASSIGNMENT = 1, DEFINITELY_ASSIGNMENT = 1,
NOT_ASSIGNMENT = 2, NOT_ASSIGNMENT = 2,
WORD_IS_KEYWORD = 3, /* not assigment, but next word may be: "if v=xyz cmd;" */ /* Not an assigment, but next word may be: "if v=xyz cmd;" */
WORD_IS_KEYWORD = 3,
}; };
/* Used for initialization: o_string foo = NULL_O_STRING; */ /* Used for initialization: o_string foo = NULL_O_STRING; */
#define NULL_O_STRING { NULL } #define NULL_O_STRING { NULL }