From a70e708114df805b01fa5b4b472a10827c5d7d33 Mon Sep 17 00:00:00 2001 From: Giles Atkinson <“gatk555@gmail.com”> Date: Sat, 23 Sep 2023 08:50:47 +0100 Subject: [PATCH] Make special interpreter variable "noglob" behave as documented: globbing is off by default. An incompatible change, but previous behaviour can be restored by "unset noglob" in .spiceinit. --- src/frontend/parser/glob.c | 3 +++ tests/regression/misc/dollar-1.cir | 2 +- tests/regression/misc/dollar-1.out | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/frontend/parser/glob.c b/src/frontend/parser/glob.c index 9353a7235..caefafe48 100644 --- a/src/frontend/parser/glob.c +++ b/src/frontend/parser/glob.c @@ -86,6 +86,9 @@ static void tilde_expand_word(wordlist *wl_node); * name of a "HOME" directory are supported. ?*[] are not */ wordlist *cp_doglob(wordlist *wlist) { + if (cp_noglob) + return wlist; + /* Expand {a,b,c} */ { wordlist *wl = wlist; diff --git a/tests/regression/misc/dollar-1.cir b/tests/regression/misc/dollar-1.cir index 8fe009293..31d518c96 100644 --- a/tests/regression/misc/dollar-1.cir +++ b/tests/regression/misc/dollar-1.cir @@ -5,7 +5,7 @@ v1 1 0 dc = 0 .control set foo = "" -echo "TEST:" ">{$foo}< should be ><" +echo "TEST:" ">{$foo}< should be >{}<" set foo = ( 1 2 3 ) set bar = 2 diff --git a/tests/regression/misc/dollar-1.out b/tests/regression/misc/dollar-1.out index 278b1394e..be06413ae 100644 --- a/tests/regression/misc/dollar-1.out +++ b/tests/regression/misc/dollar-1.out @@ -1,7 +1,7 @@ Circuit: test for regression of already fixed bugs -TEST: >< should be >< +TEST: >{}< should be >{}< TEST: >1< should be >1< TEST: >2< should be >2< TEST: 1 2 3 baz bar