From ca07ac0c34a150d97df63e66943324e937a3a647 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 5 Sep 2008 15:09:07 -0400 Subject: [PATCH] Fix console iterating patch from two commits ago It was an infinite loop --- src/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 21bfae26..71508c4a 100644 --- a/src/main.c +++ b/src/main.c @@ -485,10 +485,12 @@ static void check_for_serial_console (state_t *state) { char *console_key; + char *remaining_command_line; ply_trace ("checking if splash screen should be disabled"); - while ((console_key = strstr (state->kernel_command_line, " console=")) != NULL) + remaining_command_line = state->kernel_command_line; + while ((console_key = strstr (remaining_command_line, " console=")) != NULL) { char *end; ply_trace ("serial console found!"); @@ -496,6 +498,8 @@ check_for_serial_console (state_t *state) free (state->console); state->console = strdup (console_key + strlen (" console=")); + remaining_command_line = console_key + strlen (state->console) + strlen (" console="); + end = strpbrk (state->console, " \n\t\v,"); if (end != NULL) -- 2.47.3