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

Commit f36462f0 authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds
Browse files

[PATCH] Ignore trailing whitespace on kernel parameters correctly



Dave Jones says:

... if the modprobe.conf has trailing whitespace, modules fail to load
with the following helpful message..

	snd_intel8x0: Unknown parameter `'

Previous version truncated last argument.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Cc: Dave Jones <davej@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e3306dd5
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ static char *next_arg(char *args, char **param, char **val)
	int in_quote = 0, quoted = 0;
	char *next;

	/* Chew any extra spaces */
	while (*args == ' ') args++;
	if (*args == '"') {
		args++;
		in_quote = 1;
@@ -121,6 +119,10 @@ static char *next_arg(char *args, char **param, char **val)
		next = args + i + 1;
	} else
		next = args + i;

	/* Chew up trailing spaces. */
	while (*next == ' ')
		next++;
	return next;
}

@@ -135,6 +137,10 @@ int parse_args(const char *name,

	DEBUGP("Parsing ARGS: %s\n", args);

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

	while (*args) {
		int ret;