aboutsummaryrefslogtreecommitdiffstats
path: root/package/hotplug2/patches
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2011-02-08 17:23:37 +0000
committerMichael Büsch <mb@bu3sch.de>2011-02-08 17:23:37 +0000
commite69e0dd0b209ffa8a72c52d5a36ed05fcc7831c2 (patch)
treebab8805d1869ef85f518f6c20b2af1c2d888dd12 /package/hotplug2/patches
parente75274de8979ebb714ae7dcef73af4054fd2dfc0 (diff)
downloadupstream-e69e0dd0b209ffa8a72c52d5a36ed05fcc7831c2.tar.gz
upstream-e69e0dd0b209ffa8a72c52d5a36ed05fcc7831c2.tar.bz2
upstream-e69e0dd0b209ffa8a72c52d5a36ed05fcc7831c2.zip
hotplug2: Only ignore failed includes for missing files
SVN-Revision: 25421
Diffstat (limited to 'package/hotplug2/patches')
-rw-r--r--package/hotplug2/patches/170-non_fatal_include.patch18
1 files changed, 14 insertions, 4 deletions
diff --git a/package/hotplug2/patches/170-non_fatal_include.patch b/package/hotplug2/patches/170-non_fatal_include.patch
index 672746c6d2..0b8e852832 100644
--- a/package/hotplug2/patches/170-non_fatal_include.patch
+++ b/package/hotplug2/patches/170-non_fatal_include.patch
@@ -1,11 +1,21 @@
---- a/parser/parser.c
-+++ b/parser/parser.c
-@@ -578,7 +578,7 @@ int parser_file(const char *filename, st
+Index: hotplug2-201/parser/parser.c
+===================================================================
+--- hotplug2-201.orig/parser/parser.c 2009-12-09 19:44:13.000000000 +0100
++++ hotplug2-201/parser/parser.c 2011-02-08 18:06:44.681213713 +0100
+@@ -1,5 +1,7 @@
+ #include "parser.h"
+
++#include <errno.h>
++
+ /*
+ * Grammar:
+ * input => directive // TOKEN_ROOTKW
+@@ -578,7 +580,7 @@
ctx.lexer.fp = fopen(filename, "r");
if (ctx.lexer.fp == NULL) {
parser_clear(&ctx);
- return -1;
-+ return 0;
++ return (errno == ENOENT) ? 0 : -1;
}
ctx.lexer.filename = strdup(filename);