Make libhtml, htmlfmt build.

Thanks to wkj for doing all the hard work.

src/cmd/htmlfmt/dat.h

@@ -47,4 +47,4 @@ extern	void		rendertext(URLwin*, Bytes*);
 extern	void		rerender(URLwin*);
 extern	void		freeurlwin(URLwin*);
 
-#pragma	varargck	argpos	error	1
+/* #pragma	varargck	argpos	error	1 */

src/cmd/htmlfmt/html.c

@@ -145,10 +145,10 @@ baseurl(char *url)
 		return nil;
 	base = estrdup(url);
 	slash = strrchr(base, '/');
-	if(slash!=nil && slash>=&base[rs[0].e.p-rs[0].s.p])
+	if(slash!=nil && slash>=&base[rs[0].e.ep-rs[0].s.sp])
 		*slash = '\0';
 	else
-		base[rs[0].e.p-rs[0].s.p] = '\0';
+		base[rs[0].e.ep-rs[0].s.sp] = '\0';
 	return base;
 }
 

src/cmd/htmlfmt/mkfile

@@ -1,4 +1,4 @@
-<$SYS9/$systype/$objtype/mkfile
+<$PLAN9/src/mkhdr
 
 TARG=htmlfmt
 OFILES=\
@@ -8,23 +8,9 @@ OFILES=\
 
 HFILES=\
 	dat.h\
-	$SYS9/sys/include/html.h\
+	$PLAN9/include/html.h\
 
-LIB=$SYS9/$systype/$objtype/lib/libbio.a\
-	$SYS9/$systype/$objtype/lib/libregexp.a\
-	$SYS9/$systype/$objtype/lib/libhtml.a\
-	$SYS9/$systype/$objtype/lib/lib9c.a
+SHORTLIB=bio regexp9 html 9
 
-BIN=$SYS9/$systype/$objtype/bin
+<$PLAN9/src/mkone
 
-UPDATE=\
-	mkfile\
-	$HFILES\
-	${OFILES:%.$O=%.c}
-
-<$SYS9/sys/src/cmd/mkone
-
-CFLAGS=$CFLAGS
-
-#$O.out: $OFILES
-#	$LD -o $target  $LDFLAGS $OFILES

src/libhtml/impl.h

@@ -158,6 +158,6 @@ extern void	_freetokens(Token* tarray, int n);
 extern Token*	_gettoks(uchar* data, int datalen, int chset, int mtype, int* plen);
 extern int		_tokaval(Token* t, int attid, Rune** pans, int xfer);
 
-#pragma varargck	type "T"	Token*
+/* #pragma varargck	type "T"	Token* */
 
 #include "runetab.h"

src/libhtml/mkfile

@@ -1,6 +1,6 @@
-<$SYS9/$systype/$objtype/mkfile
+<$PLAN9/src/mkhdr
 
-LIB=$LIB9/libhtml.a
+LIB=libhtml.a
 
 OFILES=\
 	build.$O\
@@ -10,13 +10,7 @@ OFILES=\
 	runetab.$O\
 
 HFILES=\
-	$SYS9/sys/include/html.h\
+	$PLAN9/include/html.h\
 	impl.h\
 
-UPDATE=\
-	mkfile\
-	$HFILES\
-	${OFILES:%.$O=%.c}\
-	${LIB:$SYS9/$systype/$objtype/%=$SYS9/$systype/386/%}\
-
-<$SYS9/sys/src/cmd/mksyslib
+<$PLAN9/src/mksyslib

src/libhtml/utils.c

@@ -1,4 +1,5 @@
 #include <u.h>
+#include <limits.h>
 #include <libc.h>
 #include <draw.h>
 #include <html.h>