From: Michael Büsch <mb@bu3sch.de>
Date: Tue, 8 Feb 2011 17:23:37 +0000 (+0000)
Subject: hotplug2: Only ignore failed includes for missing files
X-Git-Tag: reboot~17631
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e69e0dd0b209ffa8a72c52d5a36ed05fcc7831c2;p=openwrt%2Fstaging%2Fxback.git

hotplug2: Only ignore failed includes for missing files

SVN-Revision: 25421
---

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);