aboutsummaryrefslogtreecommitdiffstats
path: root/package/hotplug2
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-07-18 07:23:40 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-07-18 07:23:40 +0000
commitfd5595ed5cfa9a218dbdefc528072d4a549e7059 (patch)
treecd7c05aa4ed93b3f9078b4ad672c6573c21497e0 /package/hotplug2
parentb375d32a48a04876e17925a56dff5c8c30df98ac (diff)
downloadupstream-fd5595ed5cfa9a218dbdefc528072d4a549e7059.tar.gz
upstream-fd5595ed5cfa9a218dbdefc528072d4a549e7059.tar.bz2
upstream-fd5595ed5cfa9a218dbdefc528072d4a549e7059.zip
fix two small bugs in the hotplug2 rule parser (#2085)
SVN-Revision: 8023
Diffstat (limited to 'package/hotplug2')
-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 {
+ /*