Merge pull request #261 from bazsi/glob-error-handling

MrAnno · web-flow · commit a7869bab9f9d · 2024-08-29T15:36:57.000+02:00
cfg-lexer: fix handling of glob return values on musl
diff --git a/lib/cfg-lexer.c b/lib/cfg-lexer.c
@@ -686,9 +686,7 @@ cfg_lexer_include_file_glob_at(CfgLexer *self, CfgIncludeLevel *level, const gch
 
   r = glob(pattern, GLOB_NOMAGIC, _cfg_lexer_glob_err, &globbuf);
 
-  if (r == 0 && globbuf.gl_pathc == 0)
-    r = GLOB_NOMATCH;
-  if (r != 0)
+  if (r != 0 || globbuf.gl_pathc == 0)
     {
       globfree(&globbuf);
       if (r == GLOB_NOMATCH)
@@ -700,9 +698,8 @@ cfg_lexer_include_file_glob_at(CfgLexer *self, CfgIncludeLevel *level, const gch
               return TRUE;
             }
 #endif
-          return FALSE;
         }
-      return TRUE;
+      return FALSE;
     }
 
   for (i = 0; i < globbuf.gl_pathc; i++)

Original file line number	Diff line number	Diff line change
`@@ -686,9 +686,7 @@ cfg_lexer_include_file_glob_at(CfgLexer self, CfgIncludeLevel level, const gch`
`686`	`686`
`687`	`687`	`r = glob(pattern, GLOB_NOMAGIC, _cfg_lexer_glob_err, &globbuf);`
`688`	`688`
`689`		`- if (r == 0 && globbuf.gl_pathc == 0)`
`690`		`- r = GLOB_NOMATCH;`
`691`		`- if (r != 0)`
	`689`	`+ if (r != 0 \|\| globbuf.gl_pathc == 0)`
`692`	`690`	`{`
`693`	`691`	`globfree(&globbuf);`
`694`	`692`	`if (r == GLOB_NOMATCH)`
`@@ -700,9 +698,8 @@ cfg_lexer_include_file_glob_at(CfgLexer self, CfgIncludeLevel level, const gch`
`700`	`698`	`return TRUE;`
`701`	`699`	`}`
`702`	`700`	`#endif`
`703`		`- return FALSE;`
`704`	`701`	`}`
`705`		`- return TRUE;`
	`702`	`+ return FALSE;`
`706`	`703`	`}`
`707`	`704`
`708`	`705`	`for (i = 0; i < globbuf.gl_pathc; i++)`