diff options
| author | Michael Büsch <mb@bu3sch.de> | 2011-02-08 17:23:37 +0000 |
|---|---|---|
| committer | Michael Büsch <mb@bu3sch.de> | 2011-02-08 17:23:37 +0000 |
| commit | 8c9cc0b566f181d93f5caa8cb24cd5f618d9eb4c (patch) | |
| tree | 1cdf6cab160e6ea7013d0af87d793a730e38c1e6 | |
| parent | 405d9f27b29b9456a743bcdb01cc81ef24d9e281 (diff) | |
| download | upstream-8c9cc0b566f181d93f5caa8cb24cd5f618d9eb4c.tar.gz upstream-8c9cc0b566f181d93f5caa8cb24cd5f618d9eb4c.tar.bz2 upstream-8c9cc0b566f181d93f5caa8cb24cd5f618d9eb4c.zip | |
hotplug2: Only ignore failed includes for missing files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25421 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/hotplug2/patches/170-non_fatal_include.patch | 18 |
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); |