diff options
| author | rsc <devnull@localhost> | 2004-04-08 19:36:35 +0000 |
|---|---|---|
| committer | rsc <devnull@localhost> | 2004-04-08 19:36:35 +0000 |
| commit | 650deb79804a49d2dff37c9313fe96b846ad8063 (patch) | |
| tree | 5498b7fe35a540a2e0fa55806434a5d3055eda2b /src/cmd/htmlfmt | |
| parent | a67406e465169623421beba9072b213a8e75c423 (diff) | |
| download | plan9port-650deb79804a49d2dff37c9313fe96b846ad8063.tar.gz plan9port-650deb79804a49d2dff37c9313fe96b846ad8063.tar.bz2 plan9port-650deb79804a49d2dff37c9313fe96b846ad8063.zip | |
Make libhtml, htmlfmt build.
Thanks to wkj for doing all the hard work.
Diffstat (limited to 'src/cmd/htmlfmt')
| -rw-r--r-- | src/cmd/htmlfmt/dat.h | 2 | ||||
| -rw-r--r-- | src/cmd/htmlfmt/html.c | 4 | ||||
| -rw-r--r-- | src/cmd/htmlfmt/mkfile | 22 |
3 files changed, 7 insertions, 21 deletions
diff --git a/src/cmd/htmlfmt/dat.h b/src/cmd/htmlfmt/dat.h index f3b05605..53db700c 100644 --- a/src/cmd/htmlfmt/dat.h +++ b/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 */ diff --git a/src/cmd/htmlfmt/html.c b/src/cmd/htmlfmt/html.c index 4f2e436f..7589e3e1 100644 --- a/src/cmd/htmlfmt/html.c +++ b/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; } diff --git a/src/cmd/htmlfmt/mkfile b/src/cmd/htmlfmt/mkfile index 5b263532..7bf8fbb6 100644 --- a/src/cmd/htmlfmt/mkfile +++ b/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 |