version 1.52, 2011/05/15 15:30:33 |
version 1.56, 2011/07/24 18:15:14 |
Line 164 mandoc_escape(const char **end, const char **start, in |
|
Line 164 mandoc_escape(const char **end, const char **start, in |
|
if (ESCAPE_ERROR == gly) |
if (ESCAPE_ERROR == gly) |
gly = ESCAPE_IGNORE; |
gly = ESCAPE_IGNORE; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('*'): |
|
if (ESCAPE_ERROR == gly) |
|
gly = ESCAPE_PREDEF; |
|
/* FALLTHROUGH */ |
|
case ('f'): |
case ('f'): |
if (ESCAPE_ERROR == gly) |
if (ESCAPE_ERROR == gly) |
gly = ESCAPE_FONT; |
gly = ESCAPE_FONT; |
Line 436 mandoc_realloc(void *ptr, size_t size) |
|
Line 432 mandoc_realloc(void *ptr, size_t size) |
|
return(ptr); |
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 * |
char * |
mandoc_strdup(const char *ptr) |
mandoc_strdup(const char *ptr) |
{ |
{ |
Line 536 a2time(time_t *t, const char *fmt, const char *p) |
|
Line 542 a2time(time_t *t, const char *fmt, const char *p) |
|
|
|
memset(&tm, 0, sizeof(struct tm)); |
memset(&tm, 0, sizeof(struct tm)); |
|
|
|
pp = NULL; |
|
#ifdef HAVE_STRPTIME |
pp = strptime(p, fmt, &tm); |
pp = strptime(p, fmt, &tm); |
|
#endif |
if (NULL != pp && '\0' == *pp) { |
if (NULL != pp && '\0' == *pp) { |
*t = mktime(&tm); |
*t = mktime(&tm); |
return(1); |
return(1); |
Line 548 a2time(time_t *t, const char *fmt, const char *p) |
|
Line 557 a2time(time_t *t, const char *fmt, const char *p) |
|
static char * |
static char * |
time2a(time_t t) |
time2a(time_t t) |
{ |
{ |
struct tm tm; |
struct tm *tm; |
char *buf, *p; |
char *buf, *p; |
size_t ssz; |
size_t ssz; |
int isz; |
int isz; |
|
|
localtime_r(&t, &tm); |
tm = localtime(&t); |
|
|
/* |
/* |
* Reserve space: |
* Reserve space: |
Line 563 time2a(time_t t) |
|
Line 572 time2a(time_t t) |
|
*/ |
*/ |
p = buf = mandoc_malloc(10 + 4 + 4 + 1); |
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; |
goto fail; |
p += (int)ssz; |
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; |
goto fail; |
p += isz; |
p += isz; |
|
|
if (0 == strftime(p, 4 + 1, "%Y", &tm)) |
if (0 == strftime(p, 4 + 1, "%Y", tm)) |
goto fail; |
goto fail; |
return(buf); |
return(buf); |
|
|
Line 702 mandoc_getcontrol(const char *cp, int *ppos) |
|
Line 711 mandoc_getcontrol(const char *cp, int *ppos) |
|
* If the string is invalid, or is less than 0, return -1. |
* If the string is invalid, or is less than 0, return -1. |
*/ |
*/ |
int |
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 buf[32]; |
char *ep; |
char *ep; |
Line 720 mandoc_strntou(const char *p, size_t sz, int base) |
|
Line 729 mandoc_strntou(const char *p, size_t sz, int base) |
|
if (buf[0] == '\0' || *ep != '\0') |
if (buf[0] == '\0' || *ep != '\0') |
return(-1); |
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); |
return((int)v); |
} |
} |
|
|