Browse Source

scripts/config: make wildcard include with no results non-fatal

Signed-off-by: Felix Fietkau <[email protected]>

SVN-Revision: 39862
Felix Fietkau 11 years ago
parent
commit
81013f6bbe
2 changed files with 14 additions and 0 deletions
  1. 7 0
      scripts/config/zconf.l
  2. 7 0
      scripts/config/zconf.lex.c_shipped

+ 7 - 0
scripts/config/zconf.l

@@ -345,6 +345,13 @@ void zconf_nextfile(const char *name)
 	int i;
 
 	err = glob(name, GLOB_ERR | GLOB_MARK, NULL, &gl);
+
+	/* ignore wildcard patterns that return no result */
+	if (err == GLOB_NOMATCH && strchr(name, '*')) {
+		err = 0;
+		gl.gl_pathc = 0;
+	}
+
 	if (err) {
 		const char *reason = "unknown error";
 

+ 7 - 0
scripts/config/zconf.lex.c_shipped

@@ -2401,6 +2401,13 @@ void zconf_nextfile(const char *name)
 	int i;
 
 	err = glob(name, GLOB_ERR | GLOB_MARK, NULL, &gl);
+
+	/* ignore wildcard patterns that return no result */
+	if (err == GLOB_NOMATCH && strchr(name, '*')) {
+		err = 0;
+		gl.gl_pathc = 0;
+	}
+
 	if (err) {
 		const char *reason = "unknown error";