diff options
| -rw-r--r-- | glob.c | 4 | ||||
| -rw-r--r-- | tests/018/glob.tl | 51 |
2 files changed, 29 insertions, 26 deletions
@@ -91,8 +91,10 @@ val glob_wrap(val pattern, val flags, val errfun) c_flags &= ~(GLOB_APPEND | GLOB_XSTAR | GLOB_XNOBRACE); +#ifdef GLOB_BRACE if (globfn == super_glob) c_flags &= ~GLOB_BRACE; +#endif if (stringp(pattern)) { char *pat_u8 = utf8_dup_to(c_str(pattern, self)); @@ -136,7 +138,7 @@ val glob_wrap(val pattern, val flags, val errfun) static const char *super_glob_find_inner(const char *pattern) { - enum state { init, bsl, cls } st = init, pst; + enum state { init, bsl, cls } st = init, pst = init; int ch; for (; (ch = *pattern) != 0; pattern++) { diff --git a/tests/018/glob.tl b/tests/018/glob.tl index cfbc7a8f..f28ec480 100644 --- a/tests/018/glob.tl +++ b/tests/018/glob.tl @@ -114,28 +114,29 @@ (len (glob* "**/proc/**/**")) 547) -(test - (glob* "002/proc\\/**") - ("002/proc/1" "002/proc/103" "002/proc/1068" "002/proc/1235" "002/proc/1236" - "002/proc/15812" "002/proc/16" "002/proc/1620" "002/proc/1624" - "002/proc/16248" "002/proc/16249" "002/proc/1645" "002/proc/16598" - "002/proc/1665" "002/proc/1698" "002/proc/17" "002/proc/175" - "002/proc/1766" "002/proc/1790" "002/proc/1791" "002/proc/1821" - "002/proc/1839" "002/proc/1851" "002/proc/186" "002/proc/18614" - "002/proc/1887" "002/proc/1902" "002/proc/1921" "002/proc/1925" - "002/proc/1926" "002/proc/1927" "002/proc/1928" "002/proc/1929" - "002/proc/1930" "002/proc/1931" "002/proc/1932" "002/proc/1936" - "002/proc/1963" "002/proc/1989" "002/proc/2" "002/proc/2008" - "002/proc/2027" "002/proc/2041" "002/proc/2052" "002/proc/2062" - "002/proc/2124" "002/proc/2184" "002/proc/2354" "002/proc/24134" - "002/proc/2551" "002/proc/2579" "002/proc/2625" "002/proc/2626" - "002/proc/2631" "002/proc/2634" "002/proc/2636" "002/proc/2638" - "002/proc/2644" "002/proc/2661" "002/proc/2685" "002/proc/2689" - "002/proc/2691" "002/proc/2693" "002/proc/2695" "002/proc/2698" - "002/proc/2701" "002/proc/2707" "002/proc/27121" "002/proc/2717" - "002/proc/2718" "002/proc/2720" "002/proc/2722" "002/proc/27243" - "002/proc/2726" "002/proc/2728" "002/proc/27682" "002/proc/27684" - "002/proc/27685" "002/proc/28" "002/proc/29" "002/proc/29840" - "002/proc/3" "002/proc/30737" "002/proc/31905" "002/proc/31907" - "002/proc/31908" "002/proc/32672" "002/proc/32674" "002/proc/32675" - "002/proc/4" "002/proc/5" "002/proc/870")) +(if (neq (os-symbol) :solaris) + (test + (glob* "002/proc\\/**") + ("002/proc/1" "002/proc/103" "002/proc/1068" "002/proc/1235" "002/proc/1236" + "002/proc/15812" "002/proc/16" "002/proc/1620" "002/proc/1624" + "002/proc/16248" "002/proc/16249" "002/proc/1645" "002/proc/16598" + "002/proc/1665" "002/proc/1698" "002/proc/17" "002/proc/175" + "002/proc/1766" "002/proc/1790" "002/proc/1791" "002/proc/1821" + "002/proc/1839" "002/proc/1851" "002/proc/186" "002/proc/18614" + "002/proc/1887" "002/proc/1902" "002/proc/1921" "002/proc/1925" + "002/proc/1926" "002/proc/1927" "002/proc/1928" "002/proc/1929" + "002/proc/1930" "002/proc/1931" "002/proc/1932" "002/proc/1936" + "002/proc/1963" "002/proc/1989" "002/proc/2" "002/proc/2008" + "002/proc/2027" "002/proc/2041" "002/proc/2052" "002/proc/2062" + "002/proc/2124" "002/proc/2184" "002/proc/2354" "002/proc/24134" + "002/proc/2551" "002/proc/2579" "002/proc/2625" "002/proc/2626" + "002/proc/2631" "002/proc/2634" "002/proc/2636" "002/proc/2638" + "002/proc/2644" "002/proc/2661" "002/proc/2685" "002/proc/2689" + "002/proc/2691" "002/proc/2693" "002/proc/2695" "002/proc/2698" + "002/proc/2701" "002/proc/2707" "002/proc/27121" "002/proc/2717" + "002/proc/2718" "002/proc/2720" "002/proc/2722" "002/proc/27243" + "002/proc/2726" "002/proc/2728" "002/proc/27682" "002/proc/27684" + "002/proc/27685" "002/proc/28" "002/proc/29" "002/proc/29840" + "002/proc/3" "002/proc/30737" "002/proc/31905" "002/proc/31907" + "002/proc/31908" "002/proc/32672" "002/proc/32674" "002/proc/32675" + "002/proc/4" "002/proc/5" "002/proc/870"))) |