Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1be6968d authored by Bruce Beare's avatar Bruce Beare Committed by Jean-Baptiste Queru
Browse files

init: Fix parser line numbering 

Change-Id: I1ac481a2cef749b26c73bc9e6a212e6ace7a0ae2
parent be1def8d

init/init_parser.c

+2 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static void parse_config(const char *fn, char *s) 


    nargs = 0;

    state.filename = fn;

    state.line = 1;

    state.line = 0;

    state.ptr = s;

    state.nexttoken = 0;

    state.parse_line = parse_line_no_op;
@@ -198,6 +198,7 @@ static void parse_config(const char *fn, char *s) 
            state.parse_line(&state, 0, 0);

            return;

        case T_NEWLINE:

            state.line++;

            if (nargs) {

                int kw = lookup_keyword(args[0]);

                if (kw_is(kw, SECTION)) {

init/parser.c

+7 −4
Original line number Diff line number Diff line
@@ -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;

            if (*x == '\n') {

                state->ptr = x+1;

                return T_NEWLINE;

            } else {

                state->ptr = x;

                return T_EOF;

            }

        default:

            goto text;

        }