version 1.46, 2009/11/02 08:40:31 |
version 1.50, 2010/03/22 05:59:32 |
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
|
#ifdef HAVE_CONFIG_H |
|
#include "config.h" |
|
#endif |
|
|
#include <sys/types.h> |
#include <sys/types.h> |
|
|
#include <assert.h> |
#include <assert.h> |
Line 72 static int pstring(struct man *, int, int, |
|
Line 76 static int pstring(struct man *, int, int, |
|
const char *, size_t); |
const char *, size_t); |
static int macrowarn(struct man *, int, const char *); |
static int macrowarn(struct man *, int, const char *); |
|
|
#ifdef __linux__ |
|
extern size_t strlcpy(char *, const char *, size_t); |
|
#endif |
|
|
|
|
|
const struct man_node * |
const struct man_node * |
man_node(const struct man *m) |
man_node(const struct man *m) |
{ |
{ |
|
|
man_ptext(struct man *m, int line, char *buf) |
man_ptext(struct man *m, int line, char *buf) |
{ |
{ |
int i, j; |
int i, j; |
|
char sv; |
|
|
/* Literal free-form text whitespace is preserved. */ |
/* Literal free-form text whitespace is preserved. */ |
|
|
Line 378 man_ptext(struct man *m, int line, char *buf) |
|
Line 379 man_ptext(struct man *m, int line, char *buf) |
|
|
|
for (i = 0; ' ' == buf[i]; i++) |
for (i = 0; ' ' == buf[i]; i++) |
/* Skip leading whitespace. */ ; |
/* Skip leading whitespace. */ ; |
if (0 == buf[i]) { |
|
|
if ('\0' == buf[i]) { |
|
/* Trailing whitespace? */ |
|
if (i && ' ' == buf[i - 1]) |
|
if ( ! man_pwarn(m, line, i - 1, WTSPACE)) |
|
return(0); |
if ( ! pstring(m, line, 0, &buf[i], 0)) |
if ( ! pstring(m, line, 0, &buf[i], 0)) |
return(0); |
return(0); |
goto descope; |
goto descope; |
Line 392 man_ptext(struct man *m, int line, char *buf) |
|
Line 398 man_ptext(struct man *m, int line, char *buf) |
|
if (i && ' ' == buf[i] && '\\' == buf[i - 1]) |
if (i && ' ' == buf[i] && '\\' == buf[i - 1]) |
continue; |
continue; |
|
|
buf[i++] = 0; |
sv = buf[i]; |
|
buf[i++] = '\0'; |
|
|
if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j))) |
if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j))) |
return(0); |
return(0); |
|
|
|
/* Trailing whitespace? Check at overwritten byte. */ |
|
|
|
if (' ' == sv && '\0' == buf[i]) |
|
if ( ! man_pwarn(m, line, i - 1, WTSPACE)) |
|
return(0); |
|
|
for ( ; ' ' == buf[i]; i++) |
for ( ; ' ' == buf[i]; i++) |
/* Skip trailing whitespace. */ ; |
/* Skip trailing whitespace. */ ; |
|
|
j = i; |
j = i; |
if (0 == buf[i]) |
|
|
/* Trailing whitespace? */ |
|
|
|
if (' ' == buf[i - 1] && '\0' == buf[i]) |
|
if ( ! man_pwarn(m, line, i - 1, WTSPACE)) |
|
return(0); |
|
|
|
if ('\0' == buf[i]) |
break; |
break; |
} |
} |
|
|
Line 463 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 484 man_pmacro(struct man *m, int ln, char *buf) |
|
i++; |
i++; |
while (buf[i] && ' ' == buf[i]) |
while (buf[i] && ' ' == buf[i]) |
i++; |
i++; |
if (0 == buf[i]) |
if ('\0' == buf[i]) |
goto out; |
goto out; |
} |
} |
|
|
Line 472 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 493 man_pmacro(struct man *m, int ln, char *buf) |
|
/* Copy the first word into a nil-terminated buffer. */ |
/* Copy the first word into a nil-terminated buffer. */ |
|
|
for (j = 0; j < 4; j++, i++) { |
for (j = 0; j < 4; j++, i++) { |
if (0 == (mac[j] = buf[i])) |
if ('\0' == (mac[j] = buf[i])) |
break; |
break; |
else if (' ' == buf[i]) |
else if (' ' == buf[i]) |
break; |
break; |
Line 507 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 528 man_pmacro(struct man *m, int ln, char *buf) |
|
while (buf[i] && ' ' == buf[i]) |
while (buf[i] && ' ' == buf[i]) |
i++; |
i++; |
|
|
/* Remove prior ELINE macro, if applicable. */ |
/* Trailing whitespace? */ |
|
|
if (m->flags & MAN_ELINE) { |
if ('\0' == buf[i] && ' ' == buf[i - 1]) |
|
if ( ! man_pwarn(m, ln, i - 1, WTSPACE)) |
|
goto err; |
|
|
|
/* |
|
* Remove prior ELINE macro, as a macro is clobbering it by |
|
* being invoked without prior text. Note that NSCOPED macros |
|
* do not close out ELINE macros, as they print no text. |
|
*/ |
|
|
|
if (m->flags & MAN_ELINE && |
|
! (MAN_NSCOPED & man_macros[c].flags)) { |
n = m->last; |
n = m->last; |
assert(NULL == n->child); |
assert(NULL == n->child); |
assert(0 == n->nchild); |
assert(0 == n->nchild); |
if ( ! man_nwarn(m, n, WLNSCOPE)) |
if ( ! man_nwarn(m, n, WLNSCOPE)) |
return(0); |
return(0); |
|
|
|
/* FIXME: when called as in: |
|
* |
|
* .B |
|
* .br |
|
* .B |
|
* .br |
|
* hello |
|
*/ |
|
|
if (n->prev) { |
if (n->prev) { |
assert(n != n->parent->child); |
assert(n != n->parent->child); |
assert(n == n->prev->next); |
assert(n == n->prev->next); |
Line 541 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 582 man_pmacro(struct man *m, int ln, char *buf) |
|
goto err; |
goto err; |
|
|
out: |
out: |
if ( ! (MAN_BLINE & fl)) |
/* |
|
* We weren't in a block-line scope when entering the |
|
* above-parsed macro, so return. |
|
*/ |
|
|
|
if ( ! (MAN_BLINE & fl)) { |
|
m->flags &= ~MAN_ILINE; |
return(1); |
return(1); |
|
} |
|
|
|
/* |
|
* If we're in a block scope, then allow this macro to slip by |
|
* without closing scope around it. |
|
*/ |
|
|
|
if (MAN_ILINE & m->flags) { |
|
m->flags &= ~MAN_ILINE; |
|
return(1); |
|
} |
|
|
/* |
/* |
* If we've opened a new next-line element scope, then return |
* If we've opened a new next-line element scope, then return |