From 2e5cd278d75be0cc046ac66259cc8d20af04b0c8 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Mon, 25 Feb 2019 03:34:25 +0100
Subject: upas/ned: fix %.*s format in parsesearch(), improve mkfile

---
 sys/src/cmd/upas/ned/mkfile    | 2 +-
 sys/src/cmd/upas/ned/nedmail.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/src/cmd/upas/ned/mkfile b/sys/src/cmd/upas/ned/mkfile
index e5b8df406..9df4a2adf 100644
--- a/sys/src/cmd/upas/ned/mkfile
+++ b/sys/src/cmd/upas/ned/mkfile
@@ -1,5 +1,4 @@
 </$objtype/mkfile
-<../mkupas
 
 TARG=nedmail
 
@@ -17,3 +16,4 @@ UPDATE=\
 </sys/src/cmd/mkone
 CFLAGS=$CFLAGS -I../common
 
+<../mkupas
diff --git a/sys/src/cmd/upas/ned/nedmail.c b/sys/src/cmd/upas/ned/nedmail.c
index d73d80dd5..81ebcd271 100644
--- a/sys/src/cmd/upas/ned/nedmail.c
+++ b/sys/src/cmd/upas/ned/nedmail.c
@@ -1074,7 +1074,7 @@ parsesearch(char **pp, char *buf, int bufl)
 	np = qstrchr(p, c);
 	if(c == '#' && np)
 	if(e = qstrchr(np + 1, c)){
-		snprint(buf, bufl, "%.*s", (int)(np - p), p);
+		snprint(buf, bufl, "%.*s", utfnlen(p, np - p), p);
 		p = np + 1;
 		np = e;
 	}
-- 
cgit v1.2.3