diff options
| author | Bruce Beare <bruce.j.beare@intel.com> | 2010-12-26 09:55:10 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2011-01-07 11:19:04 -0800 |
| commit | 1be6968d9d51f43fdb00535708a6fed0be6bfbca (patch) | |
| tree | 823625732a159531ffd54c600cdcdf7d8c2207e5 /init/parser.c | |
| parent | be1def8d43d75e280cdd75d432ddcadeaff580b1 (diff) | |
| download | system_core-1be6968d9d51f43fdb00535708a6fed0be6bfbca.tar.gz system_core-1be6968d9d51f43fdb00535708a6fed0be6bfbca.tar.bz2 system_core-1be6968d9d51f43fdb00535708a6fed0be6bfbca.zip | |
init: Fix parser line numbering
Change-Id: I1ac481a2cef749b26c73bc9e6a212e6ace7a0ae2
Diffstat (limited to 'init/parser.c')
| -rw-r--r-- | init/parser.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/init/parser.c b/init/parser.c index 2f36ac76a..3c2ec00b4 100644 --- a/init/parser.c +++ b/init/parser.c @@ -83,7 +83,6 @@ int next_token(struct parse_state *state) state->ptr = x; return T_EOF; case '\n': - state->line++; x++; state->ptr = x; return T_NEWLINE; @@ -94,9 +93,13 @@ int next_token(struct parse_state *state) continue; case '#': while (*x && (*x != '\n')) x++; - state->line++; - state->ptr = x; - return T_NEWLINE; + if (*x == '\n') { + state->ptr = x+1; + return T_NEWLINE; + } else { + state->ptr = x; + return T_EOF; + } default: goto text; } |