fbt
/
sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use runetypebody.h-functions in tr(1) 

That's one small step for a man, one giant leap for mankind.
This commit is contained in:
FRIGN 2015-02-11 13:03:32 +01:00
parent 02ec321419
commit 5836ef72e3
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
tr.c
View File

@ -1,5 +1,4 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
#include <wctype.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -18,28 +17,28 @@ struct range {
static struct { static struct {
char *name; char *name;
int (*check)(wint_t); int (*check)(Rune);
} classes[] = { } classes[] = {
{ "alnum", iswalnum }, { "alnum", isalnumrune },
{ "alpha", iswalpha }, { "alpha", isalpharune },
{ "blank", iswblank }, { "blank", isblankrune },
{ "cntrl", iswcntrl }, { "cntrl", iscntrlrune },
{ "digit", iswdigit }, { "digit", isdigitrune },
{ "graph", iswgraph }, { "graph", isgraphrune },
{ "lower", iswlower }, { "lower", islowerrune },
{ "print", iswprint }, { "print", isprintrune },
{ "punct", iswpunct }, { "punct", ispunctrune },
{ "space", iswspace }, { "space", isspacerune },
{ "upper", iswupper }, { "upper", isupperrune },
{ "xdigit", iswxdigit }, { "xdigit", isxdigitrune },
}; };
static struct range *set1 = NULL; static struct range *set1 = NULL;
static size_t set1ranges = 0; static size_t set1ranges = 0;
static int (*set1check)(wint_t) = NULL; static int (*set1check)(Rune) = NULL;
static struct range *set2 = NULL; static struct range *set2 = NULL;
static size_t set2ranges = 0; static size_t set2ranges = 0;
static int (*set2check)(wint_t) = NULL; static int (*set2check)(Rune) = NULL;
static size_t static size_t
@ -71,7 +70,7 @@ rstrmatch(Rune *r, char *s, size_t n)
} }
static size_t static size_t
makeset(char *str, struct range **set, int (**check)(wint_t)) makeset(char *str, struct range **set, int (**check)(Rune))
{ {
Rune *rstr; Rune *rstr;
size_t len, i, j, m, n; size_t len, i, j, m, n;
@ -200,7 +199,7 @@ main(int argc, char *argv[])
set2ranges = makeset(argv[1], &set2, &set2check); set2ranges = makeset(argv[1], &set2, &set2check);
if (dflag == sflag && !set2ranges && !set2check) if (dflag == sflag && !set2ranges && !set2check)
eprintf("set2 must be non-empty.\n"); eprintf("set2 must be non-empty.\n");
if (set2check && set2check != iswlower && set2check != iswupper) if (set2check && set2check != islowerrune && set2check != isupperrune)
eprintf("set2 can only be the 'lower' or 'upper' class.\n"); eprintf("set2 can only be the 'lower' or 'upper' class.\n");
if (set2check && cflag && !dflag) if (set2check && cflag && !dflag)
eprintf("set2 can't be imaged to from a complement.\n"); eprintf("set2 can't be imaged to from a complement.\n");
@ -242,7 +241,7 @@ read:
goto write; goto write;
} }
} }
if (set1check && set1check((wint_t)r)) { if (set1check && set1check(r)) {
if (dflag) { if (dflag) {
if (!cflag || (sflag && r == lastrune)) if (!cflag || (sflag && r == lastrune))
goto read; goto read;
@ -255,10 +254,10 @@ read:
else else
goto write; goto write;
} }
if (set1check == iswupper && set2check == iswlower) if (set1check == isupperrune && set2check == islowerrune)
r = towlower((wint_t)r); r = tolowerrune(r);
else if (set1check == iswlower && set2check == iswupper) else if (set1check == islowerrune && set2check == isupperrune)
r = towupper((wint_t)r); r = toupperrune(r);
else if (set2ranges > 0) else if (set2ranges > 0)
r = cflag ? r : set2[set2ranges - 1].end; r = cflag ? r : set2[set2ranges - 1].end;
else else