version 1.17, 2009/06/18 20:46:19 |
version 1.21, 2009/07/06 09:21:24 |
|
|
enum merr { |
enum merr { |
ETOOLONG, |
ETOOLONG, |
EMALLOC, |
EMALLOC, |
|
EUTSNAME, |
ENUMFMT |
ENUMFMT |
}; |
}; |
|
|
Line 89 const struct actions mdoc_actions[MDOC_MAX] = { |
|
Line 90 const struct actions mdoc_actions[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Ad */ |
{ NULL, NULL }, /* Ad */ |
{ NULL, NULL }, /* An */ |
{ NULL, NULL }, /* An */ |
{ NULL, post_ar }, /* Ar */ |
{ NULL, post_ar }, /* Ar */ |
{ NULL, NULL }, /* Cd */ |
{ NULL, NULL }, /* Cd */ /* FIXME: tabs are accepted! */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Er */ |
{ NULL, NULL }, /* Er */ |
Line 272 perr(struct mdoc *m, int line, int pos, enum merr type |
|
Line 273 perr(struct mdoc *m, int line, int pos, enum merr type |
|
case (ETOOLONG): |
case (ETOOLONG): |
p = "argument text too long"; |
p = "argument text too long"; |
break; |
break; |
|
case (EUTSNAME): |
|
p = "utsname"; |
|
break; |
case (EMALLOC): |
case (EMALLOC): |
p = "memory exhausted"; |
p = "memory exhausted"; |
break; |
break; |
|
|
pwarn(struct mdoc *m, int line, int pos, enum mwarn type) |
pwarn(struct mdoc *m, int line, int pos, enum mwarn type) |
{ |
{ |
char *p; |
char *p; |
int c; |
|
|
|
p = NULL; |
p = NULL; |
c = WARN_SYNTAX; |
|
switch (type) { |
switch (type) { |
case (WBADSEC): |
case (WBADSEC): |
p = "inappropriate document section in manual section"; |
p = "inappropriate document section in manual section"; |
c = WARN_COMPAT; |
|
break; |
break; |
case (WNOWIDTH): |
case (WNOWIDTH): |
p = "cannot determine default width"; |
p = "cannot determine default width"; |
Line 301 pwarn(struct mdoc *m, int line, int pos, enum mwarn ty |
|
Line 303 pwarn(struct mdoc *m, int line, int pos, enum mwarn ty |
|
p = "malformed date syntax"; |
p = "malformed date syntax"; |
break; |
break; |
} |
} |
|
|
assert(p); |
assert(p); |
return(mdoc_pwarn(m, line, pos, c, p)); |
return(mdoc_pwarn(m, line, pos, p)); |
} |
} |
|
|
|
|
Line 505 post_os(POST_ARGS) |
|
Line 508 post_os(POST_ARGS) |
|
|
|
if (0 == buf[0]) { |
if (0 == buf[0]) { |
if (-1 == uname(&utsname)) |
if (-1 == uname(&utsname)) |
return(mdoc_err(m, "utsname")); |
return(verr(m, EUTSNAME)); |
if (strlcat(buf, utsname.sysname, 64) >= 64) |
if (strlcat(buf, utsname.sysname, 64) >= 64) |
return(verr(m, ETOOLONG)); |
return(verr(m, ETOOLONG)); |
if (strlcat(buf, " ", 64) >= 64) |
if (strlcat(buf, " ", 64) >= 64) |
Line 614 post_bl_width(struct mdoc *m) |
|
Line 617 post_bl_width(struct mdoc *m) |
|
*/ |
*/ |
|
|
if (0 == strcmp(p, "Ds")) |
if (0 == strcmp(p, "Ds")) |
width = 8; |
width = 6; |
else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p))) |
else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p))) |
return(1); |
return(1); |
else if (0 == (width = mdoc_macro2len(tok))) |
else if (0 == (width = mdoc_macro2len(tok))) |