From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Tue, 29 Nov 2011 20:48:02 +0000 (-0200)
Subject: Parse blacklists in config files
X-Git-Tag: v1~177
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=81cf2060e067240ad8c4b9493e1fc1df3d12c956;p=platform%2Fupstream%2Fkmod.git

Parse blacklists in config files
---

diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
index 9cc024c..46ea24f 100644
--- a/libkmod/libkmod-config.c
+++ b/libkmod/libkmod-config.c
@@ -70,6 +70,28 @@ static struct kmod_list *free_alias(struct kmod_ctx *ctx, struct kmod_list *l)
 	return kmod_list_remove(l);
 }
 
+static struct kmod_list *add_blacklist(struct kmod_ctx *ctx,
+					struct kmod_list *blacklists,
+					const char *modname)
+{
+	struct kmod_blacklist *blacklist;
+	char *p;
+
+	DBG(ctx, "modname=%s\n", modname);
+
+	p = strdup(modname);
+
+	return kmod_list_append(blacklists, p);
+}
+
+static struct kmod_list *free_blacklist(struct kmod_ctx *ctx,
+							struct kmod_list *l)
+{
+	free(l->data);
+	return kmod_list_remove(l);
+}
+
+
 int kmod_parse_config_file(struct kmod_ctx *ctx, const char *filename,
 						struct kmod_config *config)
 {
@@ -102,13 +124,21 @@ int kmod_parse_config_file(struct kmod_ctx *ctx, const char *filename,
 
 			config->aliases = add_alias(ctx, config->aliases,
 							alias, modname);
+		} else if (!strcmp(cmd, "blacklist")) {
+			char *modname = strtok(NULL, "\t ");
+
+			if (modname == NULL)
+				goto syntax_error;
+
+			config->blacklists = add_blacklist(ctx,
+						config->blacklists, modname);
 		} else if (!strcmp(cmd, "include") || !strcmp(cmd, "options")
 				|| !strcmp(cmd, "install")
-				|| !strcmp(cmd, "blacklist")
 				|| !strcmp(cmd, "remove")
 				|| !strcmp(cmd, "softdep")
 				|| !strcmp(cmd, "config")) {
-			DBG(ctx, "Command %s not implemented yet\n", cmd);
+			INFO(ctx, "%s: command %s not implemented yet\n",
+								filename, cmd);
 		} else {
 syntax_error:
 			ERR(ctx, "%s line %u: ignoring bad line starting with '%s'\n",
@@ -128,6 +158,9 @@ void kmod_free_config(struct kmod_ctx *ctx, struct kmod_config *config)
 {
 	while (config->aliases)
 		config->aliases =  free_alias(ctx, config->aliases);
+
+	while (config->blacklists)
+		config->blacklists = free_blacklist(ctx, config->blacklists);
 }
 
 static bool conf_files_filter(struct kmod_ctx *ctx, const char *path,
diff --git a/libkmod/libkmod-private.h b/libkmod/libkmod-private.h
index a32d73a..ae9a95a 100644
--- a/libkmod/libkmod-private.h
+++ b/libkmod/libkmod-private.h
@@ -56,6 +56,7 @@ const char *kmod_get_dirname(struct kmod_ctx *ctx) __attribute__((nonnull(1)));
 
 struct kmod_config {
 	struct kmod_list *aliases;
+	struct kmod_list *blacklists;
 };
 int kmod_parse_config_file(struct kmod_ctx *ctx, const char *filename, struct kmod_config *config);
 int kmod_parse_config(struct kmod_ctx *ctx, struct kmod_config *config);