chiark / gitweb /
allow | in patterns; escape | and &
authorian <ian>
Fri, 6 Jun 2008 20:58:38 +0000 (20:58 +0000)
committerian <ian>
Fri, 6 Jun 2008 20:58:38 +0000 (20:58 +0000)
hostside/multiplex

index a42dfdd716b975ff337b4121b8e960f19a7803fe..06078254c35335d998921654091f92be669cbf42 100755 (executable)
@@ -55,10 +55,10 @@ proc compile-glob-patterns {pats procname} {
     append def "    switch -regexp -- \$m {\n"
     foreach pat $pats {
        set neg [regsub {^~} $pat {} pat]
-       if {[regexp {[^-+./&:=0-9a-zA-Z_*?]} $pat]} {
+       if {[regexp {[^-+./&|:=0-9a-zA-Z_*?]} $pat]} {
            cmderr BadCmd "pattern contains invalid character"
        }
-       regsub -all {[-+./:=]} $pat {\\&} pat
+       regsub -all {[-+./&|:=]} $pat {\\&} pat
        regsub -all {_} $pat {\s+} pat
        regsub -all {\*} $pat {\S+} pat
        regsub -all {\?} $pat {.} pat