diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-04 12:15:42 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-04 12:15:42 +0000 |
| commit | 7c9861214b2d81603902d344cfdef3342d8d4b5b (patch) | |
| tree | bb2f630d2bda056b53fc87c0a6731aaddb169165 | |
| parent | 6da69cddc022773a062a039e354d1ad0ed3e32c8 (diff) | |
| download | busybox-w32-7c9861214b2d81603902d344cfdef3342d8d4b5b.tar.gz busybox-w32-7c9861214b2d81603902d344cfdef3342d8d4b5b.tar.bz2 busybox-w32-7c9861214b2d81603902d344cfdef3342d8d4b5b.zip | |
hush: remove CHAR_xxx constants
| -rw-r--r-- | shell/hush.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/shell/hush.c b/shell/hush.c index a57d5d811..6ae42c8b5 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
| @@ -427,13 +427,6 @@ typedef struct in_str { | |||
| 427 | #define i_peek(input) ((input)->peek(input)) | 427 | #define i_peek(input) ((input)->peek(input)) |
| 428 | 428 | ||
| 429 | enum { | 429 | enum { |
| 430 | CHAR_ORDINARY = 0, | ||
| 431 | CHAR_ORDINARY_IF_QUOTED = 1, /* example: *, # */ | ||
| 432 | CHAR_IFS = 2, /* treated as ordinary if quoted */ | ||
| 433 | CHAR_SPECIAL = 3, /* \, $, ", maybe ` */ | ||
| 434 | }; | ||
| 435 | |||
| 436 | enum { | ||
| 437 | BC_BREAK = 1, | 430 | BC_BREAK = 1, |
| 438 | BC_CONTINUE = 2, | 431 | BC_CONTINUE = 2, |
| 439 | }; | 432 | }; |
| @@ -4132,7 +4125,6 @@ static int parse_stream_dquoted(o_string *dest, struct in_str *input, int dquote | |||
| 4132 | } | 4125 | } |
| 4133 | debug_printf_parse(": ch=%c (%d) m=%d escape=%d\n", | 4126 | debug_printf_parse(": ch=%c (%d) m=%d escape=%d\n", |
| 4134 | ch, ch, m, dest->o_escape); | 4127 | ch, ch, m, dest->o_escape); |
| 4135 | /* Basically, checking every CHAR_SPECIAL char except '"' */ | ||
| 4136 | if (ch == '\\') { | 4128 | if (ch == '\\') { |
| 4137 | if (next == EOF) { | 4129 | if (next == EOF) { |
| 4138 | syntax("\\<eof>"); | 4130 | syntax("\\<eof>"); |
| @@ -4292,7 +4284,7 @@ static struct pipe *parse_stream(struct in_str *input, int end_trigger) | |||
| 4292 | done_pipe(&ctx, PIPE_SEQ); | 4284 | done_pipe(&ctx, PIPE_SEQ); |
| 4293 | dest.o_assignment = MAYBE_ASSIGNMENT; | 4285 | dest.o_assignment = MAYBE_ASSIGNMENT; |
| 4294 | ch = ';'; | 4286 | ch = ';'; |
| 4295 | /* note: if (m == CHAR_IFS) continue; | 4287 | /* note: if (is_ifs) continue; |
| 4296 | * will still trigger for us */ | 4288 | * will still trigger for us */ |
| 4297 | } | 4289 | } |
| 4298 | } | 4290 | } |