From fed3b7a122cc6bb24218eadb4d12ad4ec2bd3432 Mon Sep 17 00:00:00 2001
From: Eric Nielsen <eric@amalgamar.com.br>
Date: Mon, 18 Dec 2017 16:50:32 -0500
Subject: [PATCH] Use `index(s, t)` instead of regular expression (#214)

for checking the common root. It is a simpler implementation.

I see a similar logic, still using `~!` comparison exists since initial
commit (9b240f3):

        } else for( i in a ) if( shortest !~ a[i] ) x = 1

Rename parameters in `output` function to avoid using multiple names for
the same domains. Use the same names as in other functions.
---
 z.sh | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/z.sh b/z.sh
index c2036c6..40178e8 100644
--- a/z.sh
+++ b/z.sh
@@ -144,19 +144,19 @@ _z() {
                 if( dx < 604800 ) return rank / 2
                 return rank / 4
             }
-            function output(files, out, common) {
+            function output(matches, best_match, common) {
                 # list or return the desired directory
                 if( list ) {
                     cmd = "sort -n >&2"
-                    for( x in files ) {
-                        if( files[x] ) printf "%-10s %s\n", files[x], x | cmd
+                    for( x in matches ) {
+                        if( matches[x] ) printf "%-10s %s\n", matches[x], x | cmd
                     }
                     if( common ) {
                         printf "%-10s %s\n", "common:", common > "/dev/stderr"
                     }
                 } else {
-                    if( common ) out = common
-                    print out
+                    if( common ) best_match = common
+                    print best_match
                 }
             }
             function common(matches) {
@@ -167,11 +167,7 @@ _z() {
                     }
                 }
                 if( short == "/" ) return
-                # use a copy to escape special characters, as we want to return
-                # the original. yeah, this escaping is awful.
-                clean_short = short
-                gsub(/\[\(\)\[\]\|\]/, "\\\\&", clean_short)
-                for( x in matches ) if( matches[x] && x !~ clean_short ) return
+                for( x in matches ) if( matches[x] && index(x, short) != 1 ) return
                 return short
             }
             BEGIN {