From mboxrd@z Thu Jan  1 00:00:00 1970
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org
X-Spam-Level: 
X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE
	autolearn=ham autolearn_force=no version=3.4.4
Received: (qmail 12588 invoked from network); 28 Dec 2020 10:20:08 -0000
Received: from ewsd.inri.net (107.191.116.128)
  by inbox.vuxu.org with ESMTPUTF8; 28 Dec 2020 10:20:08 -0000
Received: from asquith.prosimetrum.com ([125.236.209.157]) by ewsd; Mon Dec 28 05:19:22 -0500 2020
Message-ID: <9BDE0EBFB93A0533ED65C742208E95AF@prosimetrum.com>
Date: Mon, 28 Dec 2020 23:20:21 +1300
From: umbraticus@prosimetrum.com
To: 9front@9front.org
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
List-ID: <9front.9front.org>
List-Help: <http://lists.9front.org>
X-Glyph: ➈
X-Bullshit: overflow-preventing virtualized map/reduce component dependency backend 
Subject: [9front] plumber bug when matching with click attribute
Reply-To: 9front@9front.org
Precedence: bulk

In spite of the comment in the source, plumber was not calculating
the offset of a click attribute into the string correctly.

umbraticus

diff -r 54bd41c74f5f sys/src/cmd/plumb/match.c
--- a/sys/src/cmd/plumb/match.c	Sun Dec 27 23:39:28 2020 +0100
+++ b/sys/src/cmd/plumb/match.c	Mon Dec 28 23:12:21 2020 +1300
@@ -48,13 +48,12 @@
 clickmatch(Reprog *re, char *text, Resub rs[10], int click)
 {
 	char *clickp;
-	int i, w;
+	int i;
 	Rune r;
 
 	/* click is in characters, not bytes */
-	for(i=0; i<click && text[i]!='\0'; i+=w)
-		w = chartorune(&r, text+i);
-	clickp = text+i;
+	for(i=0, clickp=text; i<click && *clickp!='\0'; i++)
+		clickp += chartorune(&r, clickp);
 	for(i=0; i<=click; i++){
 		memset(rs, 0, 10*sizeof(Resub));
 		if(regexec(re, text+i, rs, 10))