mandoc/mandoc.c - diff

Return to mandoc.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mandoc.c between version 1.50 and 1.60

version 1.50, 2011/05/14 16:06:09

version 1.60, 2011/10/24 20:30:57

Line 1

/* $Id$ */

* Permission to use, copy, modify, and distribute this software for any

Line 125 mandoc_escape(const char **end, const char **start, in

break;

case ('['):

gly = ESCAPE_SPECIAL;

* Unicode escapes are defined in groff as \[uXXXX] to

* \[u10FFFF], where the contained value must be a valid

* Unicode codepoint. Here, however, only check whether

* it's not a zero-width escape.

if ('u' == cp[i] && ']' != cp[i + 1])

gly = ESCAPE_UNICODE;

term = ']';

break;

case ('C'):

Line 153 mandoc_escape(const char **end, const char **start, in

Line 161 mandoc_escape(const char **end, const char **start, in

case ('V'):

/* FALLTHROUGH */

case ('Y'):

if (ESCAPE_ERROR == gly)

gly = ESCAPE_IGNORE;

/* FALLTHROUGH */

case ('*'):

if (ESCAPE_ERROR == gly)

gly = ESCAPE_PREDEF;

/* FALLTHROUGH */

case ('f'):

if (ESCAPE_ERROR == gly)

gly = ESCAPE_FONT;

Line 218 mandoc_escape(const char **end, const char **start, in

Line 221 mandoc_escape(const char **end, const char **start, in

case ('L'):

/* FALLTHROUGH */

case ('l'):

gly = ESCAPE_NUMBERED;

/* FALLTHROUGH */

case ('N'):

if (ESCAPE_ERROR == gly)

gly = ESCAPE_NUMBERED;

/* FALLTHROUGH */

case ('S'):

/* FALLTHROUGH */

case ('v'):

Line 237 mandoc_escape(const char **end, const char **start, in

term = numeric = '\'';

break;

* Special handling for the numbered character escape.

* XXX Do any other escapes need similar handling?

case ('N'):

if ('\0' == cp[i])

return(ESCAPE_ERROR);

*end = &cp[++i];

if (isdigit((unsigned char)cp[i-1]))

return(ESCAPE_IGNORE);

while (isdigit((unsigned char)**end))

(*end)++;

if (start)

*start = &cp[i];

if (sz)

*sz = *end - &cp[i];

if ('\0' != **end)

(*end)++;

return(ESCAPE_NUMBERED);

* Sizes get a special category of their own.

Line 428 mandoc_realloc(void *ptr, size_t size)

Line 448 mandoc_realloc(void *ptr, size_t size)

return(ptr);

}

char *

mandoc_strndup(const char *ptr, size_t sz)

{

char *p;

p = mandoc_malloc(sz + 1);

memcpy(p, ptr, sz);

p[(int)sz] = '\0';

return(p);

}

char *

mandoc_strdup(const char *ptr)

{

Line 528 a2time(time_t *t, const char *fmt, const char *p)

Line 558 a2time(time_t *t, const char *fmt, const char *p)

memset(&tm, 0, sizeof(struct tm));

pp = NULL;

#ifdef HAVE_STRPTIME

pp = strptime(p, fmt, &tm);

#endif

if (NULL != pp && '\0' == *pp) {

*t = mktime(&tm);

return(1);

Line 540 a2time(time_t *t, const char *fmt, const char *p)

Line 573 a2time(time_t *t, const char *fmt, const char *p)

static char *

time2a(time_t t)

{

struct tm tm;

struct tm *tm;

char *buf, *p;

size_t ssz;

int isz;

localtime_r(&t, &tm);

tm = localtime(&t);

* Reserve space:

Line 555 time2a(time_t t)

Line 588 time2a(time_t t)

p = buf = mandoc_malloc(10 + 4 + 4 + 1);

if (0 == (ssz = strftime(p, 10 + 1, "%B ", &tm)))

if (0 == (ssz = strftime(p, 10 + 1, "%B ", tm)))

goto fail;

p += (int)ssz;

if (-1 == (isz = snprintf(p, 4 + 1, "%d, ", tm.tm_mday)))

if (-1 == (isz = snprintf(p, 4 + 1, "%d, ", tm->tm_mday)))

goto fail;

p += isz;

if (0 == strftime(p, 4 + 1, "%Y", &tm))

if (0 == strftime(p, 4 + 1, "%Y", tm))

goto fail;

return(buf);

Line 636 mandoc_eos(const char *p, size_t sz, int enclosed)

Line 669 mandoc_eos(const char *p, size_t sz, int enclosed)

return(found && !enclosed);

}

int

mandoc_hyph(const char *start, const char *c)

{

* Choose whether to break at a hyphenated character. We only

* do this if it's free-standing within a word.

/* Skip first/last character of buffer. */

if (c == start || '\0' == *(c + 1))

return(0);

/* Skip first/last character of word. */

if ('\t' == *(c + 1) || '\t' == *(c - 1))

return(0);

if (' ' == *(c + 1) || ' ' == *(c - 1))

return(0);

/* Skip double invocations. */

if ('-' == *(c + 1) || '-' == *(c - 1))

return(0);

/* Skip escapes. */

if ('\\' == *(c - 1))

return(0);

return(1);

}

* Find out whether a line is a macro line or not. If it is, adjust the

* current position and return one; if it isn't, return zero and don't

Line 694 mandoc_getcontrol(const char *cp, int *ppos)

Line 700 mandoc_getcontrol(const char *cp, int *ppos)

* If the string is invalid, or is less than 0, return -1.

int

mandoc_strntou(const char *p, size_t sz, int base)

mandoc_strntoi(const char *p, size_t sz, int base)

{

char buf[32];

char *ep;

Line 704 mandoc_strntou(const char *p, size_t sz, int base)

Line 710 mandoc_strntou(const char *p, size_t sz, int base)

return(-1);

memcpy(buf, p, sz);

buf[sz] = '\0';

buf[(int)sz] = '\0';

errno = 0;

v = strtol(buf, &ep, base);

Line 712 mandoc_strntou(const char *p, size_t sz, int base)

Line 718 mandoc_strntou(const char *p, size_t sz, int base)

if (buf[0] == '\0' || *ep != '\0')

return(-1);

if ((errno == ERANGE &&

if (v > INT_MAX)

(v == LONG_MAX || v == LONG_MIN)) ||

v = INT_MAX;

(v > INT_MAX || v < 0))

if (v < INT_MIN)

return(-1);

v = INT_MIN;

return((int)v);

}

CVSweb