Initial roff shim skeleton in place.

diff --git a/Makefile b/Makefile
index 24255816e7973e84fa5b6567160b35a15150253d..2b700b8a21a5acb82da6b2caa92e2b20466c3536 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,8 +29,15 @@ CFLAGS         += -DUGLY
 LINTFLAGS += $(VFLAGS)
 
 MANDOCFLAGS = -Wall -fstrict
+
 MANDOCHTML = -Thtml -Ostyle=style.css,man=%N.%S.html,includes=%I.html
 
+ROFFLNS    = roff.ln
+
+ROFFSRCS   = roff.c
+
+ROFFOBJS   = roff.o
+
 MANDOCLNS  = mandoc.ln
 
 MANDOCSRCS = mandoc.c
@@ -68,21 +75,24 @@ MAINSRCS   = main.c mdoc_term.c chars.c term.c tree.c compat.c \
             man_term.c html.c mdoc_html.c man_html.c out.c
 
 LLNS      = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln \
-            llib-llibmandoc.ln
+            llib-llibmandoc.ln llib-llibroff.ln
 
-LNS       = $(MAINLNS) $(MDOCLNS) $(MANLNS) $(MANDOCLNS)
+LNS       = $(MAINLNS) $(MDOCLNS) $(MANLNS) \
+            $(MANDOCLNS) $(ROFFLNS)
 
-LIBS      = libmdoc.a libman.a libmandoc.a
+LIBS      = libmdoc.a libman.a libmandoc.a libroff.a
 
-OBJS      = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS) $(MANDOCOBJS)
+OBJS      = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS) \
+            $(MANDOCOBJS) $(ROFFOBJS)
 
-SRCS      = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS) $(MANDOCSRCS)
+SRCS      = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS) \
+            $(MANDOCSRCS) $(ROFFSRCS)
 
 DATAS     = arch.in att.in lib.in msec.in st.in \
             vol.in chars.in
 
 HEADS     = mdoc.h libmdoc.h man.h libman.h term.h \
-            libmandoc.h html.h chars.h out.h main.h
+            libmandoc.h html.h chars.h out.h main.h roff.h
 
 GSGMLS    = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml manuals.7.sgml \
             mandoc_char.7.sgml man.7.sgml man.3.sgml
@@ -203,7 +213,7 @@ mdoc.ln mdoc.o: mdoc.c libmdoc.h
 
 man.ln man.o: man.c libman.h
 
-main.ln main.o: main.c mdoc.h
+main.ln main.o: main.c mdoc.h man.h roff.h
 
 compat.ln compat.o: compat.c 
 
@@ -257,8 +267,11 @@ llib-llibman.ln: $(MANLNS)
 llib-llibmandoc.ln: $(MANDOCLNS)
        $(LINT) -Clibmandoc $(MANDOCLNS)
 
-llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln llib-llibman.ln llib-llibmandoc.ln
-       $(LINT) -Cmandoc $(MAINLNS) llib-llibmdoc.ln llib-llibman.ln llib-llibmandoc.ln
+llib-llibroff.ln: $(ROFFLNS)
+       $(LINT) -Clibroff $(ROFFLNS)
+
+llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln llib-llibman.ln llib-llibmandoc.ln llib-llibroff.ln
+       $(LINT) -Cmandoc $(MAINLNS) llib-llibmdoc.ln llib-llibman.ln llib-llibmandoc.ln llib-llibroff.ln
 
 libmdoc.a: $(MDOCOBJS)
        $(AR) rs $@ $(MDOCOBJS)
@@ -269,8 +282,11 @@ libman.a: $(MANOBJS)
 libmandoc.a: $(MANDOCOBJS)
        $(AR) rs $@ $(MANDOCOBJS)
 
-mandoc: $(MAINOBJS) libmdoc.a libman.a libmandoc.a
-       $(CC) $(CFLAGS) -o $@ $(MAINOBJS) libmdoc.a libman.a libmandoc.a
+libroff.a: $(ROFFOBJS)
+       $(AR) rs $@ $(ROFFOBJS)
+
+mandoc: $(MAINOBJS) libroff.a libmdoc.a libman.a libmandoc.a
+       $(CC) $(CFLAGS) -o $@ $(MAINOBJS) libroff.a libmdoc.a libman.a libmandoc.a
 
 .sgml.html:
        validate --warn $<

diff --git a/roff.c b/roff.c
new file mode 100644 (file)
index 0000000..977139d
--- /dev/null
+++ b/roff.c
@@ -0,0 +1,24 @@
+/*     $Id: roff.c,v 1.66 2010/05/15 07:52:11 kristaps Exp $ */
+/*
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+
+#include "roff.h"
+

diff --git a/roff.h b/roff.h
new file mode 100644 (file)
index 0000000..ec9df70
--- /dev/null
+++ b/roff.h
@@ -0,0 +1,38 @@
+/*     $Id: roff.h,v 1.12 2010/05/15 07:52:11 kristaps Exp $ */
+/*
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#ifndef ROFF_H
+#define ROFF_H
+
+enum   rofferr {
+       ROFF_CONT,
+       ROFF_IGN,
+       ROFF_ERROR
+};
+
+__BEGIN_DECLS
+
+struct roff;
+
+void             roff_free(struct roff *);
+struct roff     *roff_alloc(void *);
+void             roff_reset(struct roff *);
+enum   rofferr   roff_parseln(struct roff *, int, char **, size_t *);
+int              roff_endparse(struct roff *);
+
+__END_DECLS
+
+#endif /*!ROFF_H*/