From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 28 Apr 2010 12:27:59 +0000 (+0100)
Subject: Fix parsing of plymouth:debug=file:
X-Git-Tag: 0.8.3~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38f681280a7d500632844ce284609e2becbc4e20;p=thirdparty%2Fplymouth.git

Fix parsing of plymouth:debug=file:

Short-circuit evaluation meant that the path variable was never set if
plymouth:debug=file: was used.  Switch the ordering around to fix this.
---

diff --git a/src/main.c b/src/main.c
index 03a8a6a3..9bd66a03 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1541,8 +1541,8 @@ check_verbosity (state_t *state)
   path = NULL;
   if ((strstr (state->kernel_command_line, " plymouth:debug ") != NULL)
      || (strstr (state->kernel_command_line, "plymouth:debug ") != NULL)
-     || (strstr (state->kernel_command_line, " plymouth:debug") != NULL)
-     || (path = strstr (state->kernel_command_line, " plymouth:debug=file:")) != NULL)
+     || (path = strstr (state->kernel_command_line, " plymouth:debug=file:")) != NULL
+     || (strstr (state->kernel_command_line, " plymouth:debug") != NULL))
     {
 #ifdef LOG_TO_DEBUG_FILE
       int fd;