From 81d992e35f12d53e6799d20c744ffb4e6a49787d Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Mon, 13 Jan 2020 20:00:51 -0500
Subject: acme: factor out tag parsing code

---
 src/cmd/acme/look.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/cmd/acme/look.c')

diff --git a/src/cmd/acme/look.c b/src/cmd/acme/look.c
index 44e23cca..7b70e242 100644
--- a/src/cmd/acme/look.c
+++ b/src/cmd/acme/look.c
@@ -477,9 +477,9 @@ includename(Text *t, Rune *r, int n)
 Runestr
 dirname(Text *t, Rune *r, int n)
 {
-	Rune *b, c;
-	uint m, nt;
-	int slash;
+	Rune *b;
+	uint nt;
+	int slash, i;
 	Runestr tmp;
 
 	b = nil;
@@ -490,15 +490,13 @@ dirname(Text *t, Rune *r, int n)
 		goto Rescue;
 	if(n>=1 && r[0]=='/')
 		goto Rescue;
-	b = runemalloc(nt+n+1);
-	bufread(&t->w->tag.file->b, 0, b, nt);
+	b = parsetag(t->w, &i);
 	slash = -1;
-	for(m=0; m<nt; m++){
-		c = b[m];
-		if(c == '/')
-			slash = m;
-		if(c==' ' || c=='\t')
+	for(i--; i >= 0; i--){
+		if(b[i] == '/'){
+			slash = i;
 			break;
+		}
 	}
 	if(slash < 0)
 		goto Rescue;
-- 
cgit v1.2.3