-/* $Id: roff.c,v 1.27 2008/12/01 15:32:36 kristaps Exp $ */
+/* $Id: roff.c,v 1.34 2008/12/02 18:26:57 kristaps Exp $ */
/*
* Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
*
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
+#include <sys/param.h>
+#include <sys/types.h>
+
#include <assert.h>
#include <ctype.h>
#include <err.h>
#include "libmdocml.h"
#include "private.h"
+/* FIXME: First letters of quoted-text interpreted in rofffindtok. */
+/* FIXME: `No' not implemented. */
/* TODO: warn if Pp occurs before/after Sh etc. (see mdoc.samples). */
-
/* TODO: warn about "X section only" macros. */
-
/* TODO: warn about empty lists. */
-
/* TODO: (warn) some sections need specific elements. */
-
/* TODO: (warn) NAME section has particular order. */
-
/* TODO: unify empty-content tags a la <br />. */
-
/* TODO: macros with a set number of arguments? */
#define ROFF_MAXARG 32
struct rofftok {
int (*cb)(ROFFCALL_ARGS); /* Callback. */
const int *args; /* Args (or NULL). */
- const int *parents;
- const int *children;
- int ctx;
+ const int *parents; /* Limit to parents. */
+ const int *children; /* Limit to kids. */
+ int ctx; /* Blk-close node. */
enum rofftype type; /* Type of macro. */
int flags;
#define ROFF_PARSED (1 << 0) /* "Parsed". */
#define ROFF_CALLABLE (1 << 1) /* "Callable". */
#define ROFF_SHALLOW (1 << 2) /* Nesting block. */
-#define ROFF_LSCOPE (1 << 3)
+#define ROFF_LSCOPE (1 << 3) /* Line scope. */
};
struct roffarg {
struct rofftree {
struct roffnode *last; /* Last parsed node. */
- char *cur;
-
- time_t date; /* `Dd' results. */
+ char *cur; /* Line start. */
+ struct tm tm; /* `Dd' results. */
char os[64]; /* `Os' results. */
char title[64]; /* `Dt' results. */
char section[64]; /* `Dt' results. */
char volume[64]; /* `Dt' results. */
-
int state;
#define ROFF_PRELUDE (1 << 1) /* In roff prelude. */
#define ROFF_PRELUDE_Os (1 << 2) /* `Os' is parsed. */
#define ROFF_PRELUDE_Dt (1 << 3) /* `Dt' is parsed. */
#define ROFF_PRELUDE_Dd (1 << 4) /* `Dd' is parsed. */
#define ROFF_BODY (1 << 5) /* In roff body. */
-
- struct roffcb cb;
- void *arg;
+ struct roffcb cb; /* Callbacks. */
+ void *arg; /* Callbacks' arg. */
};
static int roff_Dd(ROFFCALL_ARGS);
static int roff_Dt(ROFFCALL_ARGS);
static int roff_Os(ROFFCALL_ARGS);
-
+static int roff_Ns(ROFFCALL_ARGS);
+static int roff_Sm(ROFFCALL_ARGS);
static int roff_layout(ROFFCALL_ARGS);
static int roff_text(ROFFCALL_ARGS);
static int roff_noop(ROFFCALL_ARGS);
static int roff_depr(ROFFCALL_ARGS);
-
static struct roffnode *roffnode_new(int, struct rofftree *);
static void roffnode_free(struct rofftree *);
-
static void roff_warn(const struct rofftree *,
const char *, char *, ...);
static void roff_err(const struct rofftree *,
const char *, char *, ...);
-
+static int roffpurgepunct(struct rofftree *, char **);
static int roffscan(int, const int *);
static int rofffindtok(const char *);
static int rofffindarg(const char *);
int, char ***, char **);
static int roffparseopts(struct rofftree *, int,
char ***, int *, char **);
+static int roffcall(struct rofftree *, int, char **);
static int roffparse(struct rofftree *, char *);
static int textparse(const struct rofftree *, char *);
+#ifdef __linux__ /* FIXME: remove */
+static size_t strlcat(char *, const char *, size_t);
+static size_t strlcpy(char *, const char *, size_t);
+extern int vsnprintf(char *, size_t,
+ const char *, va_list);
+extern char *strptime(const char *, const char *,
+ struct tm *);
+#endif
-static const int roffarg_An[] = { ROFF_Split, ROFF_Nosplit,
- ROFF_ARGMAX };
-static const int roffarg_Bd[] = { ROFF_Ragged, ROFF_Unfilled,
- ROFF_Literal, ROFF_File, ROFF_Offset, ROFF_Filled,
- ROFF_Compact, ROFF_ARGMAX };
+
+static const int roffarg_An[] = { ROFF_Split, ROFF_Nosplit, ROFF_ARGMAX };
+static const int roffarg_Bd[] = { ROFF_Ragged, ROFF_Unfilled, ROFF_Literal,
+ ROFF_File, ROFF_Offset, ROFF_Filled, ROFF_Compact, ROFF_ARGMAX };
static const int roffarg_Bk[] = { ROFF_Words, ROFF_ARGMAX };
static const int roffarg_Ex[] = { ROFF_Std, ROFF_ARGMAX };
static const int roffarg_Rv[] = { ROFF_Std, ROFF_ARGMAX };
-static const int roffarg_Bl[] = { ROFF_Bullet, ROFF_Dash,
- ROFF_Hyphen, ROFF_Item, ROFF_Enum, ROFF_Tag, ROFF_Diag,
- ROFF_Hang, ROFF_Ohang, ROFF_Inset, ROFF_Column, ROFF_Offset,
- ROFF_Width, ROFF_Compact, ROFF_ARGMAX };
-static const int roffarg_St[] = {
- ROFF_p1003_1_88, ROFF_p1003_1_90, ROFF_p1003_1_96,
- ROFF_p1003_1_2001, ROFF_p1003_1_2004, ROFF_p1003_1,
- ROFF_p1003_1b, ROFF_p1003_1b_93, ROFF_p1003_1c_95,
- ROFF_p1003_1g_2000, ROFF_p1003_2_92, ROFF_p1387_2_95,
- ROFF_p1003_2, ROFF_p1387_2, ROFF_isoC_90, ROFF_isoC_amd1,
- ROFF_isoC_tcor1, ROFF_isoC_tcor2, ROFF_isoC_99, ROFF_ansiC,
- ROFF_ansiC_89, ROFF_ansiC_99, ROFF_ieee754, ROFF_iso8802_3,
- ROFF_xpg3, ROFF_xpg4, ROFF_xpg4_2, ROFF_xpg4_3, ROFF_xbd5,
- ROFF_xcu5, ROFF_xsh5, ROFF_xns5, ROFF_xns5_2d2_0,
- ROFF_xcurses4_2, ROFF_susv2, ROFF_susv3, ROFF_svid4,
+static const int roffarg_Bl[] = { ROFF_Bullet, ROFF_Dash, ROFF_Hyphen,
+ ROFF_Item, ROFF_Enum, ROFF_Tag, ROFF_Diag, ROFF_Hang, ROFF_Ohang,
+ ROFF_Inset, ROFF_Column, ROFF_Offset, ROFF_Width, ROFF_Compact,
ROFF_ARGMAX };
+static const int roffarg_St[] = { ROFF_p1003_1_88, ROFF_p1003_1_90,
+ ROFF_p1003_1_96, ROFF_p1003_1_2001, ROFF_p1003_1_2004, ROFF_p1003_1,
+ ROFF_p1003_1b, ROFF_p1003_1b_93, ROFF_p1003_1c_95, ROFF_p1003_1g_2000,
+ ROFF_p1003_2_92, ROFF_p1387_2_95, ROFF_p1003_2, ROFF_p1387_2,
+ ROFF_isoC_90, ROFF_isoC_amd1, ROFF_isoC_tcor1, ROFF_isoC_tcor2,
+ ROFF_isoC_99, ROFF_ansiC, ROFF_ansiC_89, ROFF_ansiC_99, ROFF_ieee754,
+ ROFF_iso8802_3, ROFF_xpg3, ROFF_xpg4, ROFF_xpg4_2, ROFF_xpg4_3,
+ ROFF_xbd5, ROFF_xcu5, ROFF_xsh5, ROFF_xns5, ROFF_xns5_2d2_0,
+ ROFF_xcurses4_2, ROFF_susv2, ROFF_susv3, ROFF_svid4, ROFF_ARGMAX };
static const int roffchild_Bl[] = { ROFF_It, ROFF_El, ROFF_MAX };
static const int roffchild_Fo[] = { ROFF_Fa, ROFF_Fc, ROFF_MAX };
-static const int roffchild_Oo[] = { ROFF_Op, ROFF_Oc, ROFF_MAX };
-static const int roffchild_Rs[] = { ROFF_Re, ROFF__A, ROFF__B,
- ROFF__D, ROFF__I, ROFF__J, ROFF__N, ROFF__O, ROFF__P,
- ROFF__R, ROFF__T, ROFF__V, ROFF_MAX };
+static const int roffchild_Rs[] = { ROFF_Re, ROFF__A, ROFF__B, ROFF__D,
+ ROFF__I, ROFF__J, ROFF__N, ROFF__O, ROFF__P, ROFF__R, ROFF__T, ROFF__V,
+ ROFF_MAX };
static const int roffparent_El[] = { ROFF_Bl, ROFF_It, ROFF_MAX };
static const int roffparent_Fc[] = { ROFF_Fo, ROFF_Fa, ROFF_MAX };
-static const int roffparent_Oc[] = { ROFF_Oo, ROFF_Oc, ROFF_MAX };
+static const int roffparent_Oc[] = { ROFF_Oo, ROFF_MAX };
static const int roffparent_It[] = { ROFF_Bl, ROFF_It, ROFF_MAX };
static const int roffparent_Re[] = { ROFF_Rs, ROFF_MAX };
-/* Table of all known tokens. */
static const struct rofftok tokens[ROFF_MAX] = {
{ roff_noop, NULL, NULL, NULL, 0, ROFF_COMMENT, 0 }, /* \" */
{ roff_Dd, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Dd */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_LSCOPE }, /* Aq */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* At */ /* XXX at most 2 args */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bc */
- { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Bf */ /* FIXME */
+ { roff_layout, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Bf */ /* FIXME */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bo */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_LSCOPE }, /* Bq */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Bsx */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Do */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_LSCOPE }, /* Dq */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ec */
- { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ef */ /* FIXME */
+ { roff_noop, NULL, NULL, NULL, ROFF_Bf, ROFF_LAYOUT, 0 }, /* Ef */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Em */ /* XXX needs arg */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Eo */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Fx */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ms */
{ NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* No */
- { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ns */
+ { roff_Ns, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ns */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Nx */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ox */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Pc */
{ NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Pf */
- { roff_text, NULL, NULL, NULL, 0, ROFF_LAYOUT, ROFF_PARSED | ROFF_CALLABLE }, /* Po */
+ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Po */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_LSCOPE }, /* Pq */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Qc */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ql */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sc */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* So */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE | ROFF_LSCOPE }, /* Sq */
- { NULL, NULL, NULL, NULL, 0, ROFF_SPECIAL, 0 }, /* Sm */
+ { roff_Sm, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Sm */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sx */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sy */
{ roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Tn */
{ NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xo */
{ roff_layout, NULL, NULL, roffchild_Fo, 0, ROFF_LAYOUT, 0 }, /* Fo */
{ roff_noop, NULL, roffparent_Fc, NULL, ROFF_Fo, ROFF_LAYOUT, 0 }, /* Fc */
- { roff_layout, NULL, NULL, roffchild_Oo, 0, ROFF_LAYOUT, 0 }, /* Oo */
+ { roff_layout, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Oo */
{ roff_noop, NULL, roffparent_Oc, NULL, ROFF_Oo, ROFF_LAYOUT, 0 }, /* Oc */
{ roff_layout, roffarg_Bk, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Bk */
{ roff_noop, NULL, NULL, NULL, ROFF_Bk, ROFF_LAYOUT, 0 }, /* Ek */
{ NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ud */
};
-/* Table of all known token arguments. */
static const int tokenargs[ROFF_ARGMAX] = {
0, 0, 0, 0,
0, ROFF_VALUE, ROFF_VALUE, 0,
error = 1;
if (ROFF_PRELUDE & tree->state) {
- roff_warn(tree, NULL, "prelude never finished");
+ roff_err(tree, NULL, "prelude never finished");
goto end;
}
- for (n = tree->last; n->parent; n = n->parent) {
+ for (n = tree->last; n; n = n->parent) {
if (0 != tokens[n->tok].ctx)
continue;
- roff_warn(tree, NULL, "closing explicit scope `%s'",
+ roff_err(tree, NULL, "closing explicit scope `%s'",
toknames[n->tok]);
goto end;
}
goto end;
}
+ if ( ! (*tree->cb.rofftail)(tree->arg))
+ goto end;
+
error = 0;
end:
assert(buf);
if (0 == *buf) {
- roff_warn(tree, buf, "blank line");
+ roff_err(tree, buf, "blank line");
return(0);
} else if ('.' != *buf)
return(textparse(tree, buf));
textparse(const struct rofftree *tree, char *buf)
{
+ if ( ! (ROFF_BODY & tree->state)) {
+ roff_err(tree, buf, "data not in body");
+ return(0);
+ }
return((*tree->cb.roffdata)(tree->arg, 1, buf));
}
if (ROFF_PRELUDE & tree->state) {
assert(NULL == tree->last);
return((*tokens[tok].cb)(tok, tree, argvp, ROFF_ENTER));
- } else
- assert(tree->last);
+ }
assert(ROFF_BODY & tree->state);
* children are satisfied.
*/
- if ( ! roffscan(tree->last->tok, tokens[tok].parents)) {
+ if (tree->last && ! roffscan
+ (tree->last->tok, tokens[tok].parents)) {
roff_err(tree, *argvp, "`%s' has invalid parent `%s'",
toknames[tok],
toknames[tree->last->tok]);
return(0);
}
- if ( ! roffscan(tok, tokens[tree->last->tok].children)) {
+ if (tree->last && ! roffscan
+ (tok, tokens[tree->last->tok].children)) {
roff_err(tree, *argvp, "`%s' is invalid child of `%s'",
toknames[tok],
toknames[tree->last->tok]);
n = NULL;
break;
}
+ if (tokens[n->tok].ctx == n->tok)
+ continue;
+ roff_err(tree, *argv, "`%s' breaks `%s' scope",
+ toknames[tok], toknames[n->tok]);
+ return(0);
}
/*
* In this, the `El' tag closes out the scope of `Bl'.
*/
- assert(tree->last);
assert(tok != tokens[tok].ctx && 0 != tokens[tok].ctx);
+ /* LINTED */
+ for (n = tree->last; n; n = n->parent)
+ if (n->tok != tokens[tok].ctx) {
+ if (n->tok == tokens[n->tok].ctx)
+ continue;
+ roff_err(tree, *argv, "`%s' breaks `%s' scope",
+ toknames[tok], toknames[n->tok]);
+ return(0);
+ } else
+ break;
+
+
+ if (NULL == n) {
+ roff_err(tree, *argv, "`%s' has no starting tag `%s'",
+ toknames[tok],
+ toknames[tokens[tok].ctx]);
+ return(0);
+ }
+
/* LINTED */
do {
t = tree->last->tok;
return(0);
} while (t != tokens[tok].ctx);
- assert(tree->last);
return(1);
}
}
+static int
+roffcall(struct rofftree *tree, int tok, char **argv)
+{
+
+ if (NULL == tokens[tok].cb) {
+ roff_err(tree, *argv, "unsupported macro `%s'",
+ toknames[tok]);
+ return(0);
+ }
+ if ( ! (*tokens[tok].cb)(tok, tree, argv, ROFF_ENTER))
+ return(0);
+ return(1);
+}
+
+
static int
roffnextopt(const struct rofftree *tree, int tok,
char ***in, char **val)
if (ROFF_ARGMAX == (v = rofffindarg(arg + 1))) {
roff_warn(tree, arg, "argument-like parameter `%s' to "
- "`%s'", &arg[1], toknames[tok]);
+ "`%s'", arg, toknames[tok]);
return(-1);
}
}
+static int
+roffpurgepunct(struct rofftree *tree, char **argv)
+{
+ int i;
+
+ i = 0;
+ while (argv[i])
+ i++;
+ assert(i > 0);
+ if ( ! roffispunct(argv[--i]))
+ return(1);
+ while (i >= 0 && roffispunct(argv[i]))
+ i--;
+ i++;
+
+ /* LINTED */
+ while (argv[i])
+ if ( ! (*tree->cb.roffdata)(tree->arg, 0, argv[i++]))
+ return(0);
+ return(1);
+}
+
+
static int
roffparseopts(struct rofftree *tree, int tok,
char ***args, int *argc, char **argv)
static int
roff_Dd(ROFFCALL_ARGS)
{
+ time_t t;
+ char *p, buf[32];
if (ROFF_BODY & tree->state) {
assert( ! (ROFF_PRELUDE & tree->state));
return(0);
}
- /* TODO: parse date. */
-
assert(NULL == tree->last);
- tree->state |= ROFF_PRELUDE_Dd;
+ argv++;
+
+ if (0 == strcmp(*argv, "$Mdocdate: December 2 2008 $")) {
+ t = time(NULL);
+ if (NULL == localtime_r(&t, &tree->tm))
+ err(1, "localtime_r");
+ tree->state |= ROFF_PRELUDE_Dd;
+ return(1);
+ }
+
+ /* Build this from Mdocdate or raw date. */
+
+ buf[0] = 0;
+ p = *argv;
+
+ if (0 != strcmp(*argv, "$Mdocdate:")) {
+ while (*argv) {
+ if (strlcat(buf, *argv++, sizeof(buf))
+ < sizeof(buf))
+ continue;
+ roff_err(tree, p, "bad `Dd' date");
+ return(0);
+ }
+ if (strptime(buf, "%b%d,%Y", &tree->tm)) {
+ tree->state |= ROFF_PRELUDE_Dd;
+ return(1);
+ }
+ roff_err(tree, *argv, "bad `Dd' date");
+ return(0);
+ }
+
+ argv++;
+ while (*argv && **argv != '$') {
+ if (strlcat(buf, *argv++, sizeof(buf))
+ >= sizeof(buf)) {
+ roff_err(tree, p, "bad `Dd' Mdocdate");
+ return(0);
+ }
+ if (strlcat(buf, " ", sizeof(buf))
+ >= sizeof(buf)) {
+ roff_err(tree, p, "bad `Dd' Mdocdate");
+ return(0);
+ }
+ }
+ if (NULL == *argv) {
+ roff_err(tree, p, "bad `Dd' Mdocdate");
+ return(0);
+ }
+
+ if (NULL == strptime(buf, "%b %d %Y", &tree->tm)) {
+ roff_err(tree, *argv, "bad `Dd' Mdocdate");
+ return(0);
+ }
+
+ tree->state |= ROFF_PRELUDE_Dd;
return(1);
}
return(0);
}
- /* TODO: parse date. */
+ argv++;
+ if (NULL == *argv) {
+ roff_err(tree, *argv, "`Dt' needs document title");
+ return(0);
+ } else if (strlcpy(tree->title, *argv, sizeof(tree->title))
+ >= sizeof(tree->title)) {
+ roff_err(tree, *argv, "`Dt' document title too long");
+ return(0);
+ }
+
+ argv++;
+ if (NULL == *argv) {
+ roff_err(tree, *argv, "`Dt' needs section");
+ return(0);
+ } else if (strlcpy(tree->section, *argv, sizeof(tree->section))
+ >= sizeof(tree->section)) {
+ roff_err(tree, *argv, "`Dt' section too long");
+ return(0);
+ }
+
+ argv++;
+ if (NULL == *argv) {
+ tree->volume[0] = 0;
+ } else if (strlcpy(tree->volume, *argv, sizeof(tree->volume))
+ >= sizeof(tree->volume)) {
+ roff_err(tree, *argv, "`Dt' volume too long");
+ return(0);
+ }
assert(NULL == tree->last);
tree->state |= ROFF_PRELUDE_Dt;
}
+/* ARGSUSED */
+static int
+roff_Sm(ROFFCALL_ARGS)
+{
+ int argcp[1];
+ char *argvp[1], *morep[1], *p;
+
+ p = *argv++;
+
+ argcp[0] = ROFF_ARGMAX;
+ argvp[0] = NULL;
+ if (NULL == (morep[0] = *argv++)) {
+ roff_err(tree, p, "`Sm' expects an argument");
+ return(0);
+ } else if (0 != strcmp(morep[0], "on") &&
+ 0 != strcmp(morep[0], "off")) {
+ roff_err(tree, p, "`Sm' has invalid argument");
+ return(0);
+ }
+
+ if (*argv)
+ roff_warn(tree, *argv, "`Sm' shouldn't have arguments");
+
+ if ( ! (*tree->cb.roffspecial)(tree->arg,
+ tok, argcp, argvp, morep))
+ return(0);
+
+ while (*argv) {
+ if ((*tree->cb.roffdata)(tree->arg, 1, *argv++))
+ continue;
+ return(0);
+ }
+
+ return(1);
+}
+
+
+/* ARGSUSED */
+static int
+roff_Ns(ROFFCALL_ARGS)
+{
+ int j, c, first;
+ int argcp[1];
+ char *argvp[1], *morep[1];
+
+ first = (*argv++ == tree->cur);
+
+ argcp[0] = ROFF_ARGMAX;
+ argvp[0] = morep[0] = NULL;
+
+ if ( ! (*tree->cb.roffspecial)(tree->arg,
+ tok, argcp, argvp, morep))
+ return(0);
+
+ while (*argv) {
+ if (ROFF_MAX != (c = rofffindcallable(*argv))) {
+ if ( ! roffcall(tree, c, argv))
+ return(0);
+ break;
+ }
+
+ if ( ! roffispunct(*argv)) {
+ if ((*tree->cb.roffdata)(tree->arg, 1, *argv++))
+ continue;
+ return(0);
+ }
+ for (j = 0; argv[j]; j++)
+ if ( ! roffispunct(argv[j]))
+ break;
+
+ if (argv[j]) {
+ if ((*tree->cb.roffdata)(tree->arg, 0, *argv++))
+ continue;
+ return(0);
+ }
+
+ break;
+ }
+
+ if ( ! first)
+ return(1);
+
+ return(roffpurgepunct(tree, argv));
+}
+
+
/* ARGSUSED */
static int
roff_Os(ROFFCALL_ARGS)
{
+ char *p;
- if (ROFF_EXIT == type) {
- roffnode_free(tree);
- return((*tree->cb.rofftail)(tree->arg));
- } else if (ROFF_BODY & tree->state) {
+ if (ROFF_BODY & tree->state) {
assert( ! (ROFF_PRELUDE & tree->state));
assert(ROFF_PRELUDE_Os & tree->state);
return(roff_text(tok, tree, argv, type));
return(0);
}
- /* TODO: extract OS. */
+ tree->os[0] = 0;
+
+ p = *++argv;
+
+ while (*argv) {
+ if (strlcat(tree->os, *argv++, sizeof(tree->os))
+ < sizeof(tree->os))
+ continue;
+ roff_err(tree, p, "`Os' value too long");
+ return(0);
+ }
+
+ if (0 == tree->os[0])
+ if (strlcpy(tree->os, "LOCAL", sizeof(tree->os))
+ >= sizeof(tree->os)) {
+ roff_err(tree, p, "`Os' value too long");
+ return(0);
+ }
tree->state |= ROFF_PRELUDE_Os;
tree->state &= ~ROFF_PRELUDE;
assert(NULL == tree->last);
- if (NULL == roffnode_new(tok, tree))
- return(0);
-
return((*tree->cb.roffhead)(tree->arg));
}
i = 1;
continue;
}
-
- if (NULL == tokens[c].cb) {
- roff_err(tree, *argv, "unsupported macro `%s'",
- toknames[c]);
+ if ( ! roffcall(tree, c, argv))
return(0);
- }
-
- if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER))
- return(0);
-
break;
}
* a token isn't punctuation.
*/
- i = 0;
- while (argv[i])
- i++;
-
- assert(i > 0);
- if ( ! roffispunct(argv[--i]))
- return((*tree->cb.roffout)(tree->arg, tok));
-
- while (i >= 0 && roffispunct(argv[i]))
- i--;
-
- assert(0 != i);
- i++;
-
- /* LINTED */
- while (argv[i])
- if ( ! (*tree->cb.roffdata)(tree->arg, 0, argv[i++]))
- return(0);
+ if ( ! roffpurgepunct(tree, argv))
+ return(0);
return((*tree->cb.roffout)(tree->arg, tok));
}
i = 0;
while (*argv) {
- if (ROFF_MAX == (c = rofffindcallable(*argv))) {
- if ( ! roffispunct(*argv)) {
- if ( ! (*tree->cb.roffdata)
- (tree->arg, i, *argv++))
- return(0);
- i = 1;
- continue;
- }
-
- /* See if only punctuation remains. */
-
- i = 1;
- for (j = 0; argv[j]; j++)
- if ( ! roffispunct(argv[j]))
- break;
-
- if (argv[j]) {
- if ( ! (*tree->cb.roffdata)
- (tree->arg, 0, *argv++))
+ if (ROFF_MAX != (c = rofffindcallable(*argv))) {
+ if ( ! (ROFF_LSCOPE & tokens[tok].flags))
+ if ( ! (*tree->cb.roffout)(tree->arg, tok))
return(0);
- continue;
- }
-
- /* Only punctuation remains. */
-
- if ( ! (*tree->cb.roffout)(tree->arg, tok))
+
+ if ( ! roffcall(tree, c, argv))
return(0);
+
+ if (ROFF_LSCOPE & tokens[tok].flags)
+ if ( ! (*tree->cb.roffout)(tree->arg, tok))
+ return(0);
+
break;
}
- /*
- * A sub-command has been found. Execute it and
- * discontinue parsing for arguments. If we're
- * line-scoped, then close out after it returns; if we
- * aren't, then close out before.
- */
-
- if (NULL == tokens[c].cb) {
- roff_err(tree, *argv, "unsupported macro `%s'",
- toknames[c]);
- return(0);
- }
-
- if ( ! (ROFF_LSCOPE & tokens[tok].flags))
- if ( ! (*tree->cb.roffout)(tree->arg, tok))
+ if ( ! roffispunct(*argv)) {
+ if ( ! (*tree->cb.roffdata)(tree->arg, i, *argv++))
return(0);
-
- if ( ! (*tokens[c].cb)(c, tree, argv, ROFF_ENTER))
- return(0);
+ i = 1;
+ continue;
+ }
- if (ROFF_LSCOPE & tokens[tok].flags)
- if ( ! (*tree->cb.roffout)(tree->arg, tok))
+ i = 1;
+ for (j = 0; argv[j]; j++)
+ if ( ! roffispunct(argv[j]))
+ break;
+
+ if (argv[j]) {
+ if ( ! (*tree->cb.roffdata)(tree->arg, 0, *argv++))
return(0);
+ continue;
+ }
+ if ( ! (*tree->cb.roffout)(tree->arg, tok))
+ return(0);
break;
}
if ( ! first)
return(1);
- /*
- * We're the line-dominant macro. Check if there's remaining
- * punctuation. If there is, then flush it out before exiting.
- */
-
- i = 0;
- while (argv[i])
- i++;
-
- assert(i > 0);
- if ( ! roffispunct(argv[--i]))
- return(1);
-
- while (i >= 0 && roffispunct(argv[i]))
- i--;
-
- assert(0 != i);
- i++;
-
- /* LINTED */
- while (argv[i])
- if ( ! (*tree->cb.roffdata)(tree->arg, 0, argv[i++]))
- return(0);
-
- return(1);
+ return(roffpurgepunct(tree, argv));
}
(*tree->cb.roffmsg)(tree->arg,
ROFF_ERROR, tree->cur, pos, buf);
}
+
+
+#ifdef __linux /* FIXME: remove. */
+/* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * 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.
+ */
+static size_t
+strlcat(char *dst, const char *src, size_t siz)
+{
+ char *d = dst;
+ const char *s = src;
+ size_t n = siz;
+ size_t dlen;
+
+ /* Find the end of dst and adjust bytes left but don't go past
+ * end */
+ while (n-- != 0 && *d != '\0')
+ d++;
+ dlen = d - dst;
+ n = siz - dlen;
+
+ if (n == 0)
+ return(dlen + strlen(s));
+ while (*s != '\0') {
+ if (n != 1) {
+ *d++ = *s;
+ n--;
+ }
+ s++;
+ }
+ *d = '\0';
+
+ return(dlen + (s - src)); /* count does not include NUL */
+}
+
+
+static size_t
+strlcpy(char *dst, const char *src, size_t siz)
+{
+ char *d = dst;
+ const char *s = src;
+ size_t n = siz;
+
+ /* Copy as many bytes as will fit */
+ if (n != 0) {
+ while (--n != 0) {
+ if ((*d++ = *s++) == '\0')
+ break;
+ }
+ }
+
+ /* Not enough room in dst, add NUL and traverse rest of src */
+ if (n == 0) {
+ if (siz != 0)
+ *d = '\0'; /* NUL-terminate dst */
+ while (*s++)
+ ;
+ }
+
+ return(s - src - 1); /* count does not include NUL */
+}
+#endif /*__linux__*/
git.ckatri.com / mandoc.git / blobdiff