version 1.196, 2011/05/20 15:44:55 |
version 1.198, 2011/09/18 14:14:15 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2011 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 |
Line 447 term_word(struct termp *p, const char *word) |
|
Line 447 term_word(struct termp *p, const char *word) |
|
break; |
break; |
encode1(p, uc); |
encode1(p, uc); |
continue; |
continue; |
case (ESCAPE_PREDEF): |
|
uc = mchars_res2cp(p->symtab, seq, sz); |
|
if (uc <= 0) |
|
break; |
|
encode1(p, uc); |
|
continue; |
|
case (ESCAPE_SPECIAL): |
case (ESCAPE_SPECIAL): |
uc = mchars_spec2cp(p->symtab, seq, sz); |
uc = mchars_spec2cp(p->symtab, seq, sz); |
if (uc <= 0) |
if (uc <= 0) |
Line 472 term_word(struct termp *p, const char *word) |
|
Line 466 term_word(struct termp *p, const char *word) |
|
if ('\0' != c) |
if ('\0' != c) |
encode(p, &c, 1); |
encode(p, &c, 1); |
break; |
break; |
case (ESCAPE_PREDEF): |
|
cp = mchars_res2str(p->symtab, seq, sz, &ssz); |
|
if (NULL != cp) |
|
encode(p, cp, ssz); |
|
break; |
|
case (ESCAPE_SPECIAL): |
case (ESCAPE_SPECIAL): |
cp = mchars_spec2str(p->symtab, seq, sz, &ssz); |
cp = mchars_spec2str(p->symtab, seq, sz, &ssz); |
if (NULL != cp) |
if (NULL != cp) |
Line 648 term_strlen(const struct termp *p, const char *cp) |
|
Line 637 term_strlen(const struct termp *p, const char *cp) |
|
break; |
break; |
sz += (*p->width)(p, c); |
sz += (*p->width)(p, c); |
continue; |
continue; |
case (ESCAPE_PREDEF): |
|
c = mchars_res2cp |
|
(p->symtab, seq, ssz); |
|
if (c <= 0) |
|
break; |
|
sz += (*p->width)(p, c); |
|
continue; |
|
case (ESCAPE_SPECIAL): |
case (ESCAPE_SPECIAL): |
c = mchars_spec2cp |
c = mchars_spec2cp |
(p->symtab, seq, ssz); |
(p->symtab, seq, ssz); |
Line 676 term_strlen(const struct termp *p, const char *cp) |
|
Line 658 term_strlen(const struct termp *p, const char *cp) |
|
c = mchars_num2char(seq, ssz); |
c = mchars_num2char(seq, ssz); |
if ('\0' != c) |
if ('\0' != c) |
sz += (*p->width)(p, c); |
sz += (*p->width)(p, c); |
break; |
|
case (ESCAPE_PREDEF): |
|
rhs = mchars_res2str |
|
(p->symtab, seq, ssz, &rsz); |
|
break; |
break; |
case (ESCAPE_SPECIAL): |
case (ESCAPE_SPECIAL): |
rhs = mchars_spec2str |
rhs = mchars_spec2str |