diff options
| author | grehan <grehan@FreeBSD.org> | 2011-06-28 06:26:03 +0000 |
|---|---|---|
| committer | grehan <grehan@FreeBSD.org> | 2011-06-28 06:26:03 +0000 |
| commit | 2c6741be0f59191f2283eb268e4f7690399d578a (patch) | |
| tree | b139c8c6dcca4fa284815daade405b75886ee360 /usr.bin/printf/printf.c | |
| parent | 3c35264f695e0a1f8a04dbcca1c93bb5159b2274 (diff) | |
| parent | 19ae02bba572390c7299166228d31e54003e094a (diff) | |
| download | FreeBSD-src-2c6741be0f59191f2283eb268e4f7690399d578a.zip FreeBSD-src-2c6741be0f59191f2283eb268e4f7690399d578a.tar.gz | |
IFC @ r222830
Diffstat (limited to 'usr.bin/printf/printf.c')
| -rw-r--r-- | usr.bin/printf/printf.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c index 56c1caf..eace370 100644 --- a/usr.bin/printf/printf.c +++ b/usr.bin/printf/printf.c @@ -58,6 +58,7 @@ static const char rcsid[] = #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <wchar.h> #ifdef SHELL #define main printfcmd @@ -537,10 +538,23 @@ static int asciicode(void) { int ch; - - ch = **gargv; - if (ch == '\'' || ch == '"') - ch = (*gargv)[1]; + wchar_t wch; + mbstate_t mbs; + + ch = (unsigned char)**gargv; + if (ch == '\'' || ch == '"') { + memset(&mbs, 0, sizeof(mbs)); + switch (mbrtowc(&wch, *gargv + 1, MB_LEN_MAX, &mbs)) { + case (size_t)-2: + case (size_t)-1: + wch = (unsigned char)gargv[0][1]; + break; + case 0: + wch = 0; + break; + } + ch = wch; + } ++gargv; return (ch); } |
