svn commit: r307924 - in projects/doctools/contrib/heirloom-doctools: . checknr col eqn eqn/checkeq.d eqn/eqn.d eqn/eqnchar.d eqn/neqn.d grap mpm pic picpack ptx refer soelim tbl troff troff/libhnj...
Baptiste Daroussin
bapt at FreeBSD.org
Tue Oct 25 16:22:48 UTC 2016
Author: bapt
Date: Tue Oct 25 16:22:43 2016
New Revision: 307924
URL: https://svnweb.freebsd.org/changeset/base/307924
Log:
Import heirloom doctools 20161025
Modified:
projects/doctools/contrib/heirloom-doctools/checknr/Makefile.mk
projects/doctools/contrib/heirloom-doctools/col/Makefile.mk
projects/doctools/contrib/heirloom-doctools/configure
projects/doctools/contrib/heirloom-doctools/eqn/checkeq.d/Makefile.mk
projects/doctools/contrib/heirloom-doctools/eqn/e.h
projects/doctools/contrib/heirloom-doctools/eqn/eqn.d/Makefile.mk
projects/doctools/contrib/heirloom-doctools/eqn/eqnchar.d/Makefile.mk
projects/doctools/contrib/heirloom-doctools/eqn/lex.c
projects/doctools/contrib/heirloom-doctools/eqn/neqn.d/Makefile.mk
projects/doctools/contrib/heirloom-doctools/eqn/text.c
projects/doctools/contrib/heirloom-doctools/grap/Makefile.mk
projects/doctools/contrib/heirloom-doctools/mk.config
projects/doctools/contrib/heirloom-doctools/mpm/Makefile.mk
projects/doctools/contrib/heirloom-doctools/pic/Makefile.mk
projects/doctools/contrib/heirloom-doctools/picpack/Makefile.mk
projects/doctools/contrib/heirloom-doctools/picpack/picpack.c
projects/doctools/contrib/heirloom-doctools/ptx/Makefile.mk
projects/doctools/contrib/heirloom-doctools/refer/Makefile.mk
projects/doctools/contrib/heirloom-doctools/soelim/Makefile.mk
projects/doctools/contrib/heirloom-doctools/tbl/Makefile.mk
projects/doctools/contrib/heirloom-doctools/troff/ext.h
projects/doctools/contrib/heirloom-doctools/troff/libhnj/Makefile.mk
projects/doctools/contrib/heirloom-doctools/troff/n1.c
projects/doctools/contrib/heirloom-doctools/troff/n2.c
projects/doctools/contrib/heirloom-doctools/troff/n5.c
projects/doctools/contrib/heirloom-doctools/troff/nroff.d/Makefile.mk
projects/doctools/contrib/heirloom-doctools/troff/nroff.d/pt.h
projects/doctools/contrib/heirloom-doctools/troff/troff.d/Makefile.mk
projects/doctools/contrib/heirloom-doctools/troff/troff.d/devaps/Makefile.mk
projects/doctools/contrib/heirloom-doctools/troff/troff.d/devaps/daps.c
projects/doctools/contrib/heirloom-doctools/troff/troff.d/dhtml/Makefile.mk
projects/doctools/contrib/heirloom-doctools/troff/troff.d/dpost.d/Makefile.mk
projects/doctools/contrib/heirloom-doctools/troff/troff.d/dpost.d/dpost.c
projects/doctools/contrib/heirloom-doctools/troff/troff.d/dpost.d/ps_include.c
projects/doctools/contrib/heirloom-doctools/troff/troff.d/draw.c
projects/doctools/contrib/heirloom-doctools/troff/troff.d/font/Makefile.mk
projects/doctools/contrib/heirloom-doctools/troff/troff.d/font/devhtml/Makefile.mk
projects/doctools/contrib/heirloom-doctools/troff/troff.d/t10.c
projects/doctools/contrib/heirloom-doctools/version.mk
projects/doctools/contrib/heirloom-doctools/vgrind/Makefile.mk
Directory Properties:
projects/doctools/contrib/heirloom-doctools/ (props changed)
Modified: projects/doctools/contrib/heirloom-doctools/checknr/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/checknr/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/checknr/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -3,12 +3,12 @@ OBJ = checknr.o
FLAGS = $(DEFINES) -I../include
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: checknr
checknr: $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o checknr
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -o checknr
install:
$(INSTALL) -c checknr $(ROOT)$(BINDIR)/checknr
Modified: projects/doctools/contrib/heirloom-doctools/col/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/col/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/col/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -7,7 +7,7 @@ FLAGS = $(DEFINES) -I../include
all: $(BIN)
$(BIN): $(OBJ)
- $(CC) ${CFLAGS} $(LDFLAGS) $(OBJ) -o $(BIN)
+ $(CC) ${_CFLAGS} $(_LDFLAGS) $(OBJ) -o $(BIN)
install:
$(INSTALL) -c $(BIN) $(ROOT)$(BINDIR)/$(BIN)
@@ -19,4 +19,4 @@ clean:
mrproper: clean
.c.o:
- ${CC} ${CFLAGS} ${CPPFLAGS} $(FLAGS) -c $<
+ ${CC} ${_CFLAGS} $(FLAGS) -c $<
Modified: projects/doctools/contrib/heirloom-doctools/configure
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/configure Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/configure Tue Oct 25 16:22:43 2016 (r307924)
@@ -86,7 +86,7 @@ gen_mk () {
[ -n "$LIB_AVLBST" ] && echo "LIB_AVLBST=$LIB_AVLBST" >> $OUTMK
[ -n "$LIB_LEX" ] && echo "LIB_LEX=$LIB_LEX" >> $OUTMK
[ -n "$__CDBG" ] && echo "__CDBG=$__CDBG" >> $OUTMK
- [ -n "$__SAN" ] && echo "__SAN=$__SAN" >> $OUTMK
+ [ -n "$__CLDBG" ] && echo "__CLDBG=$__CLDBG" >> $OUTMK
cat $INMK >> $OUTMK || exit 1
}
check_make () {
@@ -225,6 +225,7 @@ rm -f $LOG
gen_mk
check_make
+#check_Sanitizer
check_lex
check_strlcpy
check_strlcat
Modified: projects/doctools/contrib/heirloom-doctools/eqn/checkeq.d/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/eqn/checkeq.d/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/eqn/checkeq.d/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -4,12 +4,12 @@ OBJ = checkeq.o
FLAGS =
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: checkeq
checkeq: $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o checkeq
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -o checkeq
install:
$(INSTALL) -c checkeq $(ROOT)$(BINDIR)/checkeq
Modified: projects/doctools/contrib/heirloom-doctools/eqn/e.h
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/eqn/e.h Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/eqn/e.h Tue Oct 25 16:22:43 2016 (r307924)
@@ -93,10 +93,6 @@ typedef struct s_tbl {
} tbl;
extern char *spaceval; /* use in place of normal \x (for pic) */
-extern tbl *keytbl[]; /* key words */
-extern tbl *restbl[]; /* reserved words */
-extern tbl *deftbl[]; /* user-defined names */
-
/* diacrit.c */
void diacrit(int, int);
/* e.c */
Modified: projects/doctools/contrib/heirloom-doctools/eqn/eqn.d/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/eqn/eqn.d/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/eqn/eqn.d/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -6,12 +6,12 @@ OBJ = diacrit.o e.o eqnbox.o font.o from
FLAGS = -I. -I.. -I../../include $(DEFINES)
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: eqn
eqn: $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o eqn
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -o eqn
e.c: e.y
$(YACC) -d ../e.y
Modified: projects/doctools/contrib/heirloom-doctools/eqn/eqnchar.d/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/eqn/eqnchar.d/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/eqn/eqnchar.d/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -1,7 +1,7 @@
FILES = ascii eqnchar greek iso utf-8
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(EUC) -c $<
+ $(CC) $(_CFLAGS) $(EUC) -c $<
all: $(FILES)
@@ -9,10 +9,10 @@ utf-8: genutf8
-./genutf8 >utf-8
genutf8: genutf8.o
- -$(CC) $(CFLAGS) $(LDFLAGS) genutf8.o $(LIBS) -o genutf8
+ -$(CC) $(_CFLAGS) $(_LDFLAGS) genutf8.o $(LIBS) -o genutf8
genutf8.o: genutf8.c
- -$(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(EUC) -c genutf8.c
+ -$(CC) $(_CFLAGS) $(EUC) -c genutf8.c
install: all
test -d $(ROOT)$(PUBDIR) || mkdir -p $(ROOT)$(PUBDIR)
Modified: projects/doctools/contrib/heirloom-doctools/eqn/lex.c
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/eqn/lex.c Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/eqn/lex.c Tue Oct 25 16:22:43 2016 (r307924)
@@ -94,6 +94,7 @@ int
yylex(void) {
register int c;
tbl *tp;
+ extern tbl *keytbl[], *deftbl[];
beg:
while ((c=gtc())==' ' || c=='\n')
Modified: projects/doctools/contrib/heirloom-doctools/eqn/neqn.d/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/eqn/neqn.d/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/eqn/neqn.d/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -6,12 +6,12 @@ OBJ = diacrit.o e.o eqnbox.o font.o from
FLAGS = -I. -I.. -I../../include -DNEQN $(DEFINES)
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: neqn
neqn: $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o neqn
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -o neqn
e.c: e.y
$(YACC) -d ../e.y
Modified: projects/doctools/contrib/heirloom-doctools/eqn/text.c
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/eqn/text.c Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/eqn/text.c Tue Oct 25 16:22:43 2016 (r307924)
@@ -42,6 +42,7 @@ text(int t,char *p1) {
int c;
const char *p;
tbl *tp;
+ extern tbl *restbl;
yyval.token = oalloc();
ebase[yyval.token] = 0;
Modified: projects/doctools/contrib/heirloom-doctools/grap/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/grap/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/grap/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -6,12 +6,12 @@ FLAGS = -DLIBDIR='"$(LIBDIR)"' $(DEFINES
YFLAGS = -d
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(FLAGS) $(CPPFLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: grap.c grapl.c grap
grap: $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -lm -o grap
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -lm -o grap
y.tab.h: grap.c
Modified: projects/doctools/contrib/heirloom-doctools/mk.config
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/mk.config Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/mk.config Tue Oct 25 16:22:43 2016 (r307924)
@@ -83,7 +83,7 @@ STRIP=strip
#
# Compiler flags.
#
-#CFLAGS=
+_CFLAGS=$(CFLAGS) $(_CPPFLAGS) $(__CDBG) $(__CLDBG)
#
# C preprocessor flags.
@@ -91,17 +91,12 @@ STRIP=strip
# Use -D_GNU_SOURCE for Linux with GNU libc.
# Use -D_INCLUDE__STDC_A1_SOURCE for HP-UX.
#
-CPPFLAGS=-D_GNU_SOURCE
-
-#
-# Warning flags for the compiler.
-#
-#WARN=
+_CPPFLAGS=$(CPPFLAGS) -D_GNU_SOURCE
#
# Linker flags.
#
-#LDFLAGS=
+_LDFLAGS=$(LDFLAGS) $(__CLDBG)
#
# Additional libraries to link with.
Modified: projects/doctools/contrib/heirloom-doctools/mpm/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/mpm/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/mpm/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -3,15 +3,15 @@ OBJ = misc.o page.o queue.o range.o slug
FLAGS = $(EUC) $(DEFINES) -I../include
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(FLAGS) $(CPPFLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
.cc.o:
- $(CXX) $(CFLAGS) $(WARN) $(FLAGS) $(CPPFLAGS) -c $<
+ $(CXX) $(_CFLAGS) $(FLAGS) -c $<
all: pm
pm: $(OBJ)
- $(CXX) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -lm -o pm
+ $(CXX) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -lm -o pm
install: all
test -d $(ROOT)$(LIBDIR) || mkdir -p $(ROOT)$(LIBDIR)
Modified: projects/doctools/contrib/heirloom-doctools/pic/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/pic/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/pic/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -7,12 +7,12 @@ FLAGS = $(DEFINES) -I../include
YFLAGS = -d
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(FLAGS) $(CPPFLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: picy.c picl.c pic
pic: $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -lm -o pic
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -lm -o pic
y.tab.h: picy.c
Modified: projects/doctools/contrib/heirloom-doctools/picpack/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/picpack/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/picpack/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -3,12 +3,12 @@ OBJ = picpack.o
FLAGS = -I../troff/troff.d/dpost.d
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: picpack
picpack: $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o picpack
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -o picpack
install:
$(INSTALL) -c picpack $(ROOT)$(BINDIR)/picpack
Modified: projects/doctools/contrib/heirloom-doctools/picpack/picpack.c
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/picpack/picpack.c Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/picpack/picpack.c Tue Oct 25 16:22:43 2016 (r307924)
@@ -561,6 +561,7 @@ addpicfile(char *name)
} /* End of addpicfile */
+
/* from OpenSolaris "misc.c 1.6 05/06/08 SMI" */
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
Modified: projects/doctools/contrib/heirloom-doctools/ptx/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/ptx/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/ptx/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -3,12 +3,12 @@ OBJ = ptx.o
FLAGS = -DLIBDIR='"$(LIBDIR)"' $(EUC) -I../include
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: ptx
ptx: $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o ptx
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -o ptx
install:
$(INSTALL) -c ptx $(ROOT)$(BINDIR)/ptx
Modified: projects/doctools/contrib/heirloom-doctools/refer/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/refer/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/refer/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -15,31 +15,31 @@ FLAGS = -DMACDIR='"$(MACDIR)"' -DREFDIR=
-I../include
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(FLAGS) $(CPPFLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: refer addbib lookbib sortbib roffbib indxbib mkey inv hunt papers/runinv
cd papers && PATH=..:$$PATH sh runinv
refer: $(ROBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(ROBJ) $(LIBS) -o $@
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(ROBJ) $(LIBS) -o $@
addbib: $(AOBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(AOBJ) $(LIBS) -o $@
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(AOBJ) $(LIBS) -o $@
lookbib: $(LOBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(LOBJ) $(LIBS) -o $@
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(LOBJ) $(LIBS) -o $@
sortbib: $(SOBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(SOBJ) $(LIBS) -o $@
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(SOBJ) $(LIBS) -o $@
mkey: $(MOBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(MOBJ) $(LIBS) -o $@
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(MOBJ) $(LIBS) -o $@
inv: $(IOBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(IOBJ) $(LIBS) -o $@
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(IOBJ) $(LIBS) -o $@
hunt: $(HOBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(HOBJ) $(LIBS) -o $@
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(HOBJ) $(LIBS) -o $@
indxbib: indxbib.sh
rm -f $@
Modified: projects/doctools/contrib/heirloom-doctools/soelim/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/soelim/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/soelim/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -3,12 +3,12 @@ OBJ = soelim.o
FLAGS =
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: soelim
soelim: $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o soelim
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -o soelim
install:
$(INSTALL) -c soelim $(ROOT)$(BINDIR)/soelim
Modified: projects/doctools/contrib/heirloom-doctools/tbl/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/tbl/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/tbl/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -4,12 +4,12 @@ OBJ = t0.o t1.o t2.o t3.o t4.o t5.o t6.o
FLAGS = -DMACDIR='"$(MACDIR)"' -I../include
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(FLAGS) $(CPPFLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: tbl
tbl: $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o tbl
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -o tbl
install:
$(INSTALL) -c tbl $(ROOT)$(BINDIR)/tbl
Modified: projects/doctools/contrib/heirloom-doctools/troff/ext.h
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/ext.h Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/ext.h Tue Oct 25 16:22:43 2016 (r307924)
@@ -276,6 +276,8 @@ extern void cvtime(void);
extern int ctoi(register char *);
extern void mesg(int);
extern void errprint(const char *, ...);
+#define fdprintf xxfdprintf
+extern void fdprintf(int, const char *, ...);
extern char *roff_sprintf(char *, size_t, const char *, ...);
extern int control(register int, register int);
extern int getrq2(void);
@@ -442,6 +444,10 @@ extern void casehylen(void);
extern void casehypp(void);
extern void casepshape(void);
extern void caselpfx(void);
+#undef min
+#undef max
+extern int max(int, int);
+extern int min(int, int);
extern void casece(void);
extern void caserj(void);
extern void casebrnl(void);
Modified: projects/doctools/contrib/heirloom-doctools/troff/libhnj/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/libhnj/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/libhnj/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -1,7 +1,7 @@
-FLAGS = -Wall -Wunused-parameter -Wmissing-prototypes
+FLAGS =
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
OBJ = hnjalloc.o hyphen.o
@@ -11,7 +11,7 @@ libhnj.a: $(OBJ)
$(AR) crs $@ $(OBJ)
test: test.o libhnj.a
- $(CC) $(CFLAGS) $(LDFLAGS) test.o -L. -lhnj -o test
+ $(CC) $(_CFLAGS) $(_LDFLAGS) test.o -L. -lhnj -o test
install:
Modified: projects/doctools/contrib/heirloom-doctools/troff/n1.c
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/n1.c Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/n1.c Tue Oct 25 16:22:43 2016 (r307924)
@@ -110,6 +110,14 @@ wchar_t twc = 0;
static unsigned char escoff[126-31];
static void initg(void);
+static void printlong(long, int);
+static void printn(long, long);
+static char *sprintlong(char *s, long, int);
+static char *sprintn(char *s, long n, int b);
+#ifndef NROFF
+#define vfdprintf xxvfdprintf
+static void vfdprintf(int fd, const char *fmt, va_list ap);
+#endif
static tchar setyon(void);
static void _setenv(void);
static tchar setZ(void);
@@ -597,6 +605,182 @@ errprint(const char *s, ...) /* error me
va_end(ap);
}
+#ifndef NROFF
+/*
+ * Scaled down version of C Library printf.
+ * Only %s %u %d (==%u) %o %c %x %D are recognized.
+ */
+#undef putchar
+#define putchar(n) (*pfbp++ = (n)) /* NO CHECKING! */
+
+static char pfbuf[NTM];
+static char *pfbp = pfbuf;
+
+void
+fdprintf(int fd, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ vfdprintf(fd, fmt, ap);
+ va_end(ap);
+}
+
+static void
+vfdprintf(int fd, const char *fmt, va_list ap)
+{
+ register int c;
+ char *s;
+ register int i;
+
+ pfbp = pfbuf;
+loop:
+ while ((c = *fmt++) != '%') {
+ if (c == '\0') {
+ if (fd == 2)
+ write(STDERR_FILENO, pfbuf, pfbp - pfbuf);
+ else {
+ *pfbp = 0;
+ pfbp = pfbuf;
+ while (*pfbp) {
+ *obufp++ = *pfbp++;
+ if (obufp >= &obuf[OBUFSZ])
+ flusho();
+ }
+ }
+ return;
+ }
+ putchar(c);
+ }
+ c = *fmt++;
+ if (c == 'd' || c == 'u' || c == 'o' || c == 'x') {
+ i = va_arg(ap, int);
+ printlong(i, c);
+ } else if (c == 'c') {
+ if (c > 0177 || c < 040)
+ putchar('\\');
+ putchar(va_arg(ap, int) & 0177);
+ } else if (c == 's') {
+ s = va_arg(ap, char *);
+ while ((c = *s++))
+ putchar(c);
+ } else if (c == 'D') {
+ printn(va_arg(ap, long), 10);
+ } else if (c == 'O') {
+ printn(va_arg(ap, long), 8);
+ } else if (c == 'e' || c == 'E' ||
+ c == 'f' || c == 'F' ||
+ c == 'g' || c == 'G') {
+ char tmp[40];
+ char fmt[] = "%%";
+ fmt[1] = c;
+ snprintf(s = tmp, sizeof(tmp), fmt, va_arg(ap, double));
+ while ((c = *s++))
+ putchar(c);
+ } else if (c == 'p') {
+ i = (intptr_t)va_arg(ap, void *);
+ putchar('0');
+ putchar('x');
+ printlong(i, 'x');
+ } else if (c == 'l') {
+ c = *fmt++;
+ if (c == 'd' || c == 'u' || c == 'o' || c == 'x') {
+ i = va_arg(ap, long);
+ printlong(i, c);
+ } else if (c == 'c') {
+ i = va_arg(ap, int);
+ if (c & ~0177) {
+#ifdef EUC
+ char mb[MB_LEN_MAX];
+ int j, n;
+ n = wctomb(mb, i);
+ for (j = 0; j < n; j++)
+ putchar(mb[j]&0377);
+#endif /* EUC */
+ } else
+ putchar(i);
+ }
+ } else if (c == 'C') {
+ extern int nchtab;
+ tchar t = va_arg(ap, tchar);
+ if ((i = cbits(t)) < 0177) {
+ putchar(i);
+ } else if (i < 128 + nchtab) {
+ putchar('\\');
+ putchar('(');
+ putchar(chname[chtab[i-128]]);
+ putchar(chname[chtab[i-128]+1]);
+ }
+ else if ((i = tr2un(i, fbits(t))) != -1)
+ goto U;
+ } else if (c == 'U') {
+ i = va_arg(ap, int);
+ U:
+ putchar('U');
+ putchar('+');
+ if (i < 0x1000)
+ putchar('0');
+ if (i < 0x100)
+ putchar('0');
+ if (i < 0x10)
+ putchar('0');
+ printn((long)i, 16);
+#ifdef EUC
+ if (iswprint(i)) {
+ char mb[MB_LEN_MAX];
+ int j, n;
+ n = wctomb(mb, i);
+ putchar(' ');
+ putchar('(');
+ for (j = 0; j < n; j++)
+ putchar(mb[j]&0377);
+ putchar(')');
+ }
+#endif /* EUC */
+ }
+ goto loop;
+}
+#endif /* !NROFF */
+
+
+static void
+printlong(long i, int fmt)
+{
+ switch (fmt) {
+ case 'd':
+ if (i < 0) {
+ putchar('-');
+ i = -i;
+ }
+ /*FALLTHRU*/
+ case 'u':
+ printn(i, 10);
+ break;
+ case 'o':
+ printn(i, 8);
+ break;
+ case 'x':
+ printn(i, 16);
+ break;
+ }
+}
+
+/*
+ * Print an unsigned integer in base b.
+ */
+static void printn(register long n, register long b)
+{
+ register long a;
+
+ if (n < 0) { /* shouldn't happen */
+ putchar('-');
+ n = -n;
+ }
+ if ((a = n / b))
+ printn(a, b);
+ putchar("0123456789ABCDEF"[(int)(n%b)]);
+}
+
/* returns pointer to \0 that ends the string */
/* VARARGS2 */
Modified: projects/doctools/contrib/heirloom-doctools/troff/n2.c
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/n2.c Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/n2.c Tue Oct 25 16:22:43 2016 (r307924)
@@ -52,7 +52,6 @@
* output, cleanup
*/
-#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
#include <unistd.h>
@@ -237,10 +236,10 @@ outtp(tchar i)
#ifdef EUC
if (iscopy(i))
- dprintf(ptid, "%lc", j);
+ fdprintf(ptid, "%lc", j);
else
#endif /* EUC */
- dprintf(ptid, "%c", j);
+ fdprintf(ptid, "%c", j);
#endif
}
Modified: projects/doctools/contrib/heirloom-doctools/troff/n5.c
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/n5.c Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/n5.c Tue Oct 25 16:22:43 2016 (r307924)
@@ -418,6 +418,24 @@ caselpfx(void)
}
}
+int
+max(int aa, int bb)
+{
+ if (aa > bb)
+ return (aa);
+ else
+ return (bb);
+}
+
+int
+min(int aa, int bb)
+{
+ if (aa < bb)
+ return (aa);
+ else
+ return (bb);
+}
+
static void
cerj(int dorj)
{
Modified: projects/doctools/contrib/heirloom-doctools/troff/nroff.d/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/nroff.d/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/nroff.d/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -10,15 +10,15 @@ OBJ = n10.o n6.o hytab.o n1.o n2.o n3.o
FLAGS = -DNROFF -DUSG $(EUC) -I. -I.. -I../../include -DMACDIR='"$(MACDIR)"' \
-DFNTDIR='"$(FNTDIR)"' -DTABDIR='"$(TABDIR)"' -DHYPDIR='"$(HYPDIR)"' \
-DSHELL='"$(SHELL)"' -DRELEASE='"$(RELEASE)"' $(DEFINES) \
- -I$(BST) -Wmissing-prototypes
+ -I$(BST)
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: nroff
nroff: $(OBJ) $(LIBHNJ)/libhnj.a
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) -L$(LIBHNJ) -lhnj $(LIBS) -o nroff
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) -L$(LIBHNJ) -lhnj $(LIBS) -o nroff
install:
$(INSTALL) -c nroff $(ROOT)$(BINDIR)/nroff
Modified: projects/doctools/contrib/heirloom-doctools/troff/nroff.d/pt.h
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/nroff.d/pt.h Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/nroff.d/pt.h Tue Oct 25 16:22:43 2016 (r307924)
@@ -12,7 +12,6 @@ extern char *getint(char *, int *);
extern void specnames(void);
extern int findch(register const char *);
extern void twdone(void);
-extern void ptout(tchar);
extern void ptout1(void);
extern char *plot(char *);
extern void move(void);
Modified: projects/doctools/contrib/heirloom-doctools/troff/troff.d/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/troff.d/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/troff.d/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -10,18 +10,18 @@ FLAGS = -DUSG $(EUC) -I. -I.. -I../../in
-DSHELL='"$(SHELL)"' -DRELEASE='"$(RELEASE)"' $(DEFINES) -I$(BST)
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: troff ta otfdump
troff: $(OBJ) $(LIBHNJ)/libhnj.a
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) -L$(LIBHNJ) -lhnj $(LIBS) -o troff
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) -L$(LIBHNJ) -lhnj $(LIBS) -o troff
ta: draw.o ta.o
- $(CC) $(CFLAGS) $(LDFLAGS) draw.o ta.o $(LIBS) -lm -o $@
+ $(CC) $(_CFLAGS) $(_LDFLAGS) draw.o ta.o $(LIBS) -lm -o $@
otfdump: otfdump.o otfdump_vs.o
- $(CC) $(CFLAGS) $(LDFLAGS) otfdump.o otfdump_vs.o $(LIBS) -o $@
+ $(CC) $(_CFLAGS) $(_LDFLAGS) otfdump.o otfdump_vs.o $(LIBS) -o $@
install:
$(INSTALL) -c troff $(ROOT)$(BINDIR)/troff
Modified: projects/doctools/contrib/heirloom-doctools/troff/troff.d/devaps/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/troff.d/devaps/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/troff.d/devaps/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -6,15 +6,15 @@ FONTS = B I R S CT CW CX GB GI GR GS HI
FLAGS = -I. -I.. -DFNTDIR='"$(FNTDIR)"'
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: daps makedev fonts HM.out
daps: $(OBJ)
- $(CC) $(LDFLAGS) $(OBJ) $(LIBS) -lm -o daps
+ $(CC) $(_LDFLAGS) $(OBJ) $(LIBS) -lm -o daps
makedev: makedev.o
- $(CC) $(LDFLAGS) makedev.o $(LIBS) -o makedev
+ $(CC) $(_LDFLAGS) makedev.o $(LIBS) -o makedev
fonts: makedev
for i in $(FONTS); \
Modified: projects/doctools/contrib/heirloom-doctools/troff/troff.d/devaps/daps.c
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/troff.d/devaps/daps.c Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/troff.d/devaps/daps.c Tue Oct 25 16:22:43 2016 (r307924)
@@ -46,10 +46,6 @@
* contributors.
*/
-#ifndef __unused
-#define __unused __attribute__((unused))
-#endif
-
char *xxxvers = "troff.d/devaps/daps.c 1.2";
@@ -901,7 +897,7 @@ done (void)
void
float_err (
- int sig __unused /* signal number - not used */
+ int sig /* signal number - not used */
)
@@ -929,7 +925,7 @@ float_err (
void
wrap_up (
- int sig __unused /* signal number - not used */
+ int sig /* signal number - not used */
)
@@ -1117,7 +1113,7 @@ drawfunct(
char buf[], /* drawing command */
- FILE *fp __unused
+ FILE *fp
)
Modified: projects/doctools/contrib/heirloom-doctools/troff/troff.d/dhtml/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/troff.d/dhtml/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/troff.d/dhtml/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -17,10 +17,10 @@ clean:
mrproper: clean
$(BIN): $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) -o $@
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) -o $@
.c.o:
- $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+ $(CC) $(_CFLAGS) -c $<
char.o: char.h main.h $(BST)/bst.h lib.h tr_out.h
dhtml.o: dhtml.h tr_out.h char.h main.h
Modified: projects/doctools/contrib/heirloom-doctools/troff/troff.d/dpost.d/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/troff.d/dpost.d/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/troff.d/dpost.d/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -8,12 +8,12 @@ FLAGS = -I. -I.. -DFNTDIR='"$(FNTDIR)"'
$(DEFINES) -I../../../include -I.. -I$(BST)
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: dpost
dpost: $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o dpost
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -o dpost
install:
$(INSTALL) -c dpost $(ROOT)$(BINDIR)/dpost
Modified: projects/doctools/contrib/heirloom-doctools/troff/troff.d/dpost.d/dpost.c
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/troff.d/dpost.d/dpost.c Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/troff.d/dpost.d/dpost.c Tue Oct 25 16:22:43 2016 (r307924)
@@ -2419,7 +2419,7 @@ t_supply(char *fnt) /* supply a font */
while (*fnt == ' ' || *fnt == '\t')
fnt++;
- for (np = font; *np && *np != ' ' && *np != '\t' && *np != '\n'; np++);
+ for (np = fnt; *np && *np != ' ' && *np != '\t' && *np != '\n'; np++);
if (*np == '\0' || *np == '\n')
return;
*np = '\0';
@@ -3303,7 +3303,7 @@ t_sf(int forceflush)
fprintf(tf, "%d %g changefont\n", fontname[font].fontslant, (fontname[font].fontheight != 0) ? (double)fontname[font].fontheight : (double)fractsize);
}
- if (tracked < 0 || tracked > 0 && forceflush)
+ if (tracked < 0 || (tracked > 0 && forceflush))
t_strack();
} /* End of t_sf */
Modified: projects/doctools/contrib/heirloom-doctools/troff/troff.d/dpost.d/ps_include.c
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/troff.d/dpost.d/ps_include.c Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/troff.d/dpost.d/ps_include.c Tue Oct 25 16:22:43 2016 (r307924)
@@ -167,6 +167,8 @@ ps_include(
break;
case DOCUMENTNEEDEDRESOURCES:
goto needres;
+ case NORMAL: /* TODO: case is not in original code */
+ break;
}
continue;
} else
Modified: projects/doctools/contrib/heirloom-doctools/troff/troff.d/draw.c
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/troff.d/draw.c Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/troff.d/draw.c Tue Oct 25 16:22:43 2016 (r307924)
@@ -49,6 +49,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
+#include "global.h"
#define PI 3.141592654
#define hmot(n) hpos += n
#define hgoto(n) hpos = n
@@ -71,10 +72,6 @@ static int maxdots = 32000; /* maximum n
#define min(x,y) ((x) < (y) ? (x) : (y))
#define arcmove(x,y) { hgoto(x); vmot(-vpos-(y)); }
-#ifndef __unused
-#define __unused __attribute__((unused))
-#endif
-
extern void setsize(int);
extern void vgoto(int);
extern int t_size(int);
Modified: projects/doctools/contrib/heirloom-doctools/troff/troff.d/font/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/troff.d/font/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/troff.d/font/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -6,7 +6,7 @@ FONTS = AB AI AR AX BI CB CI CO CW CX GR
FLAGS = -I. -I.. -DFNTDIR='"$(FNTDIR)"'
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all:
Modified: projects/doctools/contrib/heirloom-doctools/troff/troff.d/font/devhtml/Makefile.mk
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/troff.d/font/devhtml/Makefile.mk Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/troff.d/font/devhtml/Makefile.mk Tue Oct 25 16:22:43 2016 (r307924)
@@ -20,4 +20,4 @@ clean:
mrproper: clean
$(BIN): $(OBJS)
- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(OBJS) -o $@
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJS) -o $@
Modified: projects/doctools/contrib/heirloom-doctools/troff/troff.d/t10.c
==============================================================================
--- projects/doctools/contrib/heirloom-doctools/troff/troff.d/t10.c Tue Oct 25 16:21:38 2016 (r307923)
+++ projects/doctools/contrib/heirloom-doctools/troff/troff.d/t10.c Tue Oct 25 16:22:43 2016 (r307924)
@@ -50,7 +50,6 @@
* contributors.
*/
-#include <stdio.h>
#include <stdlib.h>
#include "tdef.h"
#include <ctype.h>
@@ -290,22 +289,22 @@ ptinit(void)
kern = xflag;
if (ascii)
return;
- dprintf(ptid, "x T %s\n", devname);
- dprintf(ptid, "x res %d %d %d\n", Inch, Hor, Vert);
- dprintf(ptid, "x init\n"); /* do initialization for particular device */
+ fdprintf(ptid, "x T %s\n", devname);
+ fdprintf(ptid, "x res %d %d %d\n", Inch, Hor, Vert);
+ fdprintf(ptid, "x init\n"); /* do initialization for particular device */
/*
for (i = 1; i <= nfonts; i++)
- dprintf(ptid, "x font %d %s\n", i, fontbase[i]->namefont);
- dprintf(ptid, "x xxx fonts=%d sizes=%d unit=%d\n", nfonts, nsizes, Unitwidth);
- dprintf(ptid, "x xxx nchtab=%d lchname=%d nfitab=%d\n",
+ fdprintf(ptid, "x font %d %s\n", i, fontbase[i]->namefont);
+ fdprintf(ptid, "x xxx fonts=%d sizes=%d unit=%d\n", nfonts, nsizes, Unitwidth);
+ fdprintf(ptid, "x xxx nchtab=%d lchname=%d nfitab=%d\n",
dev.nchtab, dev.lchname, dev.nchtab+128-32);
- dprintf(ptid, "x xxx sizes:\nx xxx ");
+ fdprintf(ptid, "x xxx sizes:\nx xxx ");
for (i = 0; i < nsizes; i++)
- dprintf(ptid, " %d", pstab[i]);
- dprintf(ptid, "\nx xxx chars:\nx xxx ");
+ fdprintf(ptid, " %d", pstab[i]);
+ fdprintf(ptid, "\nx xxx chars:\nx xxx ");
for (i = 0; i < dev.nchtab; i++)
- dprintf(ptid, " %s", &chname[chtab[i]]);
- dprintf(ptid, "\nx xxx\n");
+ fdprintf(ptid, " %s", &chname[chtab[i]]);
+ fdprintf(ptid, "\nx xxx\n");
*/
#ifdef EUC
ptlocale(setlocale(LC_CTYPE, NULL));
@@ -415,9 +414,9 @@ ptout(register tchar i)
if (linkout)
ptlink(linkout);
/*
- dprintf(ptid, "x xxx end of line: hpos=%d, vpos=%d\n", hpos, vpos);
+ fdprintf(ptid, "x xxx end of line: hpos=%d, vpos=%d\n", hpos, vpos);
*/
- dprintf(ptid, "n%d %d\n", b, a); /* be nice to chuck */
+ fdprintf(ptid, "n%d %d\n", b, a); /* be nice to chuck */
}
tchar *
@@ -456,7 +455,7 @@ ptout0(tchar *pi, tchar *pend)
ptlead();
if (esc)
ptesc();
- dprintf(ptid, "x X ");
+ fdprintf(ptid, "x X ");
/*
* not guaranteed of finding a XOFF if a word overflow
* error occured, so also bound this loop by olinep
@@ -480,9 +479,9 @@ ptout0(tchar *pi, tchar *pend)
ptps();
j = f = u2pts(sbits(i));
if (j != f && xflag && dev.anysize)
- dprintf(ptid, "x H -23 %g\n", f);
+ fdprintf(ptid, "x H -23 %g\n", f);
else
- dprintf(ptid, "x H %d\n", j);
+ fdprintf(ptid, "x H %d\n", j);
return(pi+outsize);
}
if (k == SLANT) {
@@ -491,7 +490,7 @@ ptout0(tchar *pi, tchar *pend)
if (xfont != mfont)
ptfont();
}
- dprintf(ptid, "x S %d\n", (int)sbits(i)-180);
+ fdprintf(ptid, "x S %d\n", (int)sbits(i)-180);
return(pi+outsize);
}
if (k == WORDSP) {
@@ -627,23 +626,23 @@ ptout0(tchar *pi, tchar *pend)
switch ((c=cbits(pi[1]))) {
case DRAWCIRCLE: /* circle */
case DRAWCIRCLEFI:
- dprintf(ptid, "D%c %d\n", c, dx); /* dx is diameter */
+ fdprintf(ptid, "D%c %d\n", c, dx); /* dx is diameter */
w = 0;
hpos += dx;
break;
case DRAWELLIPSE:
case DRAWELLIPSEFI:
- dprintf(ptid, "D%c %d %d\n", c, dx, dy);
+ fdprintf(ptid, "D%c %d %d\n", c, dx, dy);
w = 0;
hpos += dx;
break;
case DRAWLINE: /* line */
k = cbits(pi[2]);
- dprintf(ptid, "D%c %d %d ", DRAWLINE, dx, dy);
+ fdprintf(ptid, "D%c %d %d ", DRAWLINE, dx, dy);
if (k < 128)
- dprintf(ptid, "%c\n", k);
+ fdprintf(ptid, "%c\n", k);
else
- dprintf(ptid, "%s\n", &chname[chtab[k - 128]]);
+ fdprintf(ptid, "%s\n", &chname[chtab[k - 128]]);
w = 0;
hpos += dx;
vpos += dy;
@@ -655,7 +654,7 @@ ptout0(tchar *pi, tchar *pend)
dy2 = absmot(pi[6]);
if (isnmot(pi[6]))
dy2 = -dy2;
- dprintf(ptid, "D%c %d %d %d %d\n", DRAWARC,
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list