From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 28 Apr 2010 12:28:34 +0000 (+0100)
Subject: Handle plymouth:splash or plymouth:debug as last argument
X-Git-Tag: 0.8.3~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7021306e43aab0f64f829ea09d0645f2b32c97f3;p=thirdparty%2Fplymouth.git

Handle plymouth:splash or plymouth:debug as last argument

If plymouth:splash or plymouth:debug is the last argument in
/proc/cmdline, then it will be terminated with '\n' rather than ' '.
Handle this.
---

diff --git a/src/main.c b/src/main.c
index 9bd66a03..13fed2b6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -221,10 +221,8 @@ find_override_splash (state_t *state)
       char *end;
       splash_string = strdup (splash_string + strlen ("plymouth:splash="));
 
-      end = strstr (splash_string, " ");
-
-      if (end != NULL)
-        *end = '\0';
+      end = splash_string + strcspn (splash_string, " \n");
+      *end = '\0';
 
       ply_trace ("Splash is configured to be '%s'", splash_string);
 
@@ -1558,12 +1556,8 @@ check_verbosity (state_t *state)
 
           path += strlen (" plymouth:debug=file:");
           debug_buffer_path = strdup (path);
-          end = strstr (debug_buffer_path, " ");
-
-          if (end != NULL)
-            *end = '\0';
-
-          debug_buffer_path = path;
+          end = debug_buffer_path + strcspn (debug_buffer_path, " \n");
+          *end = '\0';
         }
 
         if (debug_buffer == NULL)