Commit 26d052bf authored Jul 06, 2009 by Peter Oberparleiter Committed by Rusty Russell Sep 25, 2009

param: allow whitespace as kernel parameter separator



Some boot mechanisms require that kernel parameters are stored in a
separate file which is loaded to memory without further processing
(e.g. the "Load from FTP" method on s390). When such a file contains
newline characters, the kernel parameter preceding the newline might
not be correctly parsed (due to the newline being stuck to the end of
the actual parameter value) which can lead to boot failures.

This patch improves kernel command line usability in such a situation
by allowing generic whitespace characters as separators between kernel
parameters.

Signed-off-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

parent 554bdfe5

kernel/params.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <linux/device.h>
		#include <linux/err.h>
		#include <linux/slab.h>
		#include <linux/ctype.h>

		#if 0
		#define DEBUGP printk
		@@ -87,7 +88,7 @@ static char next_arg(char args, char param, char val)
		}

		for (i = 0; args[i]; i++) {
		if (args[i] == ' ' && !in_quote)
		if (isspace(args[i]) && !in_quote)
		break;
		if (equals == 0) {
		if (args[i] == '=')
		@@ -121,7 +122,7 @@ static char next_arg(char args, char param, char val)
		next = args + i;

		/* Chew up trailing spaces. */
		while (*next == ' ')
		while (isspace(*next))
		next++;
		return next;
		}
		@@ -138,7 +139,7 @@ int parse_args(const char *name,
		DEBUGP("Parsing ARGS: %s\n", args);

		/* Chew leading spaces */
		while (*args == ' ')
		while (isspace(*args))
		args++;

		while (*args) {

Admin message