diff options
| author | jb <jb@FreeBSD.org> | 2008-04-26 04:11:16 +0000 |
|---|---|---|
| committer | jb <jb@FreeBSD.org> | 2008-04-26 04:11:16 +0000 |
| commit | db2123cf650f6e33e84a312f5f111c206e8d7edd (patch) | |
| tree | 1b9f4219e5621f607898eeccebaf58857f17ad16 /cddl | |
| parent | 7063bf54fd1f37b7658fe7cc6df47eede851f445 (diff) | |
| download | FreeBSD-src-db2123cf650f6e33e84a312f5f111c206e8d7edd.zip FreeBSD-src-db2123cf650f6e33e84a312f5f111c206e8d7edd.tar.gz | |
Simplify for FreeBSD for now, bypassing the multibyte char variables
that Solaris has. We may need to revisit this issue later.
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libgen/common/gmatch.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c b/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c index dc47f7e..cfd66e8 100644 --- a/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c +++ b/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c @@ -32,15 +32,28 @@ /*LINTLIBRARY*/ +#if defined(sun) #pragma weak gmatch = _gmatch +#endif +#if defined(sun) #include "gen_synonyms.h" +#endif #include <sys/types.h> #include <libgen.h> #include <stdlib.h> #include <limits.h> +#if defined(sun) #include <widec.h> #include "_range.h" +#else +/* DOODAD */ static int multibyte = 0; +#define WCHAR_CSMASK 0x30000000 +#define valid_range(c1, c2) \ + (((c1) & WCHAR_CSMASK) == ((c2) & WCHAR_CSMASK) && \ + ((c1) > 0xff || !iscntrl((int)c1)) && ((c2) > 0xff || \ + !iscntrl((int)c2))) +#endif #define Popwchar(p, c) \ n = mbtowc(&cl, p, MB_LEN_MAX); \ |
