version 1.59, 2014/08/10 23:54:41 |
version 1.63, 2014/10/28 13:24:44 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011, 2014 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 104 mchars_spec2cp(const struct mchars *arg, const char *p |
|
Line 104 mchars_spec2cp(const struct mchars *arg, const char *p |
|
const struct ln *ln; |
const struct ln *ln; |
|
|
ln = find(arg, p, sz); |
ln = find(arg, p, sz); |
if (NULL == ln) |
return(ln != NULL ? ln->unicode : sz == 1 ? *p : 0xFFFD); |
return(-1); |
|
return(ln->unicode); |
|
} |
} |
|
|
char |
char |
Line 125 mchars_num2uc(const char *p, size_t sz) |
|
Line 123 mchars_num2uc(const char *p, size_t sz) |
|
{ |
{ |
int i; |
int i; |
|
|
if ((i = mandoc_strntoi(p, sz, 16)) < 0) |
i = mandoc_strntoi(p, sz, 16); |
return('\0'); |
assert(i >= 0 && i <= 0x10FFFF); |
|
return(i); |
/* |
|
* Security warning: |
|
* Never extend the range of accepted characters |
|
* to overlap with the ASCII range, 0x00-0x7F |
|
* without re-auditing the callers of this function. |
|
* Some callers might relay on the fact that we never |
|
* return ASCII characters for their escaping decisions. |
|
* |
|
* XXX Code is missing here to exclude bogus ranges. |
|
*/ |
|
|
|
return(i > 0x80 && i <= 0x10FFFF ? i : '\0'); |
|
} |
} |
|
|
const char * |
const char * |
Line 149 mchars_spec2str(const struct mchars *arg, |
|
Line 135 mchars_spec2str(const struct mchars *arg, |
|
const struct ln *ln; |
const struct ln *ln; |
|
|
ln = find(arg, p, sz); |
ln = find(arg, p, sz); |
if (NULL == ln) { |
if (ln == NULL) { |
*rsz = 1; |
*rsz = 1; |
return(NULL); |
return(sz == 1 ? p : NULL); |
} |
} |
|
|
*rsz = strlen(ln->ascii); |
*rsz = strlen(ln->ascii); |
return(ln->ascii); |
return(ln->ascii); |
|
} |
|
|
|
const char * |
|
mchars_uc2str(int uc) |
|
{ |
|
int i; |
|
|
|
for (i = 0; i < LINES_MAX; i++) |
|
if (uc == lines[i].unicode) |
|
return(lines[i].ascii); |
|
return("<?>"); |
} |
} |
|
|
static const struct ln * |
static const struct ln * |