summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-18 07:23:40 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-18 07:23:40 +0000
commit7fca59b786c9ecc3890a2a749258309a43a2f4ac (patch)
treee995b83b1408958548c11b7aa61845a90dd12e50
parentceeb6f31e759c2d891f7e025a556dd89adb40b91 (diff)
fix two small bugs in the hotplug2 rule parser (#2085)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8023 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/hotplug2/patches/110-parser_fixes.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/package/hotplug2/patches/110-parser_fixes.patch b/package/hotplug2/patches/110-parser_fixes.patch
new file mode 100644
index 0000000000..0605ddd315
--- /dev/null
+++ b/package/hotplug2/patches/110-parser_fixes.patch
@@ -0,0 +1,22 @@
+Index: hotplug2-0.9/rules.c
+===================================================================
+--- hotplug2-0.9.orig/rules.c 2007-07-18 09:15:38.968308540 +0200
++++ hotplug2-0.9/rules.c 2007-07-18 09:18:52.135316499 +0200
+@@ -756,6 +756,7 @@
+ ERROR("rules parse","Unable to parse rules file.");
+ return -1;
+ }
++ *return_rules = rules;
+
+ unmap_file(&filemap);
+
+@@ -997,7 +998,8 @@
+
+ if (!terminate) {
+ /* A little bit hacky cleanup */
+- return_rules->rules_c--;
++ if (!nested)
++ return_rules->rules_c--;
+ return return_rules;
+ } else {
+ /*