From 536805bce3fb88d94fbb90e2d9e23fcef1287095 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Mon, 25 Feb 2019 03:31:50 +0100
Subject: upas/scanmail: fix %.*s format in xprint(), improve mkfile

---
 sys/src/cmd/upas/scanmail/common.c | 5 ++++-
 sys/src/cmd/upas/scanmail/mkfile   | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys/src/cmd/upas/scanmail/common.c b/sys/src/cmd/upas/scanmail/common.c
index b6ea720d1..80713246c 100644
--- a/sys/src/cmd/upas/scanmail/common.c
+++ b/sys/src/cmd/upas/scanmail/common.c
@@ -624,7 +624,10 @@ xprint(int fd, char *type, Resub *m)
 	while(*q && *q != ' ')
 		q++;
 
-	fprint(fd, "%s %.*s~%.*s~%.*s\n", type, (int)(m->sp-p), p, (int)(m->ep-m->sp), m->sp, (int)(q-m->ep), m->ep);
+	fprint(fd, "%s %.*s~%.*s~%.*s\n", type, 
+		utfnlen(p, m->sp-p), p,
+		utfnlen(m->sp, m->ep-m->sp), m->sp,
+		utfnlen(m->ep, q-m->ep), m->ep);
 }
 
 enum {
diff --git a/sys/src/cmd/upas/scanmail/mkfile b/sys/src/cmd/upas/scanmail/mkfile
index 37141c535..edecf499e 100644
--- a/sys/src/cmd/upas/scanmail/mkfile
+++ b/sys/src/cmd/upas/scanmail/mkfile
@@ -1,5 +1,4 @@
 </$objtype/mkfile
-<../mkupas
 
 TARG=scanmail\
 	testscan
@@ -20,5 +19,7 @@ UPDATE=\
 </sys/src/cmd/mkmany
 CFLAGS=$CFLAGS -I../common
 
+<../mkupas
+
 scanmail.$O:	scanmail.c
 	$CC $CFLAGS scanmail.c
-- 
cgit v1.2.3