From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Sun, 29 Jan 2012 17:22:09 +0000 (-0200)
Subject: Partially fix parsing of alias with dots
X-Git-Tag: v5~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9901cfe242596b88dd13e6f867269bd63162653d;p=thirdparty%2Fkmod.git

Partially fix parsing of alias with dots

Alias names may contain dots. However since kmod_module_from_alias()
still calls kmod_module_new_from_name(), the bug is not entirely fixed,
and will be completely corrected in a later patch.
---

diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c
index 1bcc1dfb..f499578d 100644
--- a/libkmod/libkmod-util.c
+++ b/libkmod/libkmod-util.c
@@ -134,8 +134,7 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len)
 		case ']':
 			return -EINVAL;
 		case '[':
-			while (alias[s] != ']' &&
-					alias[s] != '.' && alias[s] != '\0') {
+			while (alias[s] != ']' && alias[s] != '\0') {
 				buf[s] = alias[s];
 				s++;
 			}
@@ -146,7 +145,6 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len)
 			buf[s] = alias[s];
 			break;
 		case '\0':
-		case '.':
 			goto finish;
 		default:
 			buf[s] = c;
diff --git a/testsuite/rootfs.tar.xz b/testsuite/rootfs.tar.xz
index b12a4bf0..dbba1885 100644
Binary files a/testsuite/rootfs.tar.xz and b/testsuite/rootfs.tar.xz differ