shithub: riscv

Info  •  Files  •  Log  •  Branches

upas/scanmail: fix %.*s format in xprint(), improve mkfile

--- a/sys/src/cmd/upas/scanmail/common.c

+++ b/sys/src/cmd/upas/scanmail/common.c

@@ -624,7 +624,10 @@

 	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 {

--- a/sys/src/cmd/upas/scanmail/mkfile

+++ b/sys/src/cmd/upas/scanmail/mkfile

@@ -1,5 +1,4 @@

 </$objtype/mkfile

-<../mkupas

 TARG=scanmail\

 	testscan

@@ -19,6 +18,8 @@

 </sys/src/cmd/mkmany

 CFLAGS=$CFLAGS -I../common

+

+<../mkupas

 scanmail.$O:	scanmail.c

 	$CC $CFLAGS scanmail.c