diff options
author | Jeff Johnston <jjohnstn@redhat.com> | 2008-11-01 00:03:42 +0300 |
---|---|---|
committer | Jeff Johnston <jjohnstn@redhat.com> | 2008-11-01 00:03:42 +0300 |
commit | d456d606e35a460db59c6609f8c994e658fe3d7c (patch) | |
tree | ad333ffd13bbc4aab45e4f7ff147836da64cf052 /newlib/libc/posix/collcmp.c | |
parent | 029d147e9488a30456226dd76be4ec25aff350d6 (diff) |
2008-10-31 Jeff Johnston <jjohnstn@redhat.com>
* libc/include/limits.h: Add ARG_MAX, PATH_MAX, and _POSIX2_RE_DUP_MAX.
* libc/include/envlock.h: New file.
* libc/include/fnmatch.h: Ditto.
* libc/include/glob.h: Ditto.
* libc/include/regex.h: Ditto.
* libc/include/wordexp.h: Ditto.
* libc/posix/Makefile.am: Add new files moved from
libc/sys/linux/stdlib.
* libc/posix/Makefile.in: Regenerated.
* libc/posix/COPYRIGHT: New file moved from libc/sys/linux/stdlib.
* libc/posix/cclass.h: Ditto.
* libc/posix/cname.h: Ditto.
* libc/posix/collate.c: Ditto.
* libc/posix/collate.h: Ditto.
* libc/posix/collcmp.c: Ditto.
* libc/posix/engine.c: Ditto.
* libc/posix/fnmatch.3: Ditto.
* libc/posix/glob.3: Ditto.
* libc/posix/fnmatch.c: Ditto.
* libc/posix/glob.c: Ditto.
* libc/posix/namespace.h: Ditto.
* libc/posix/reallocf.c: Ditto.
* libc/posix/regcomp.c: Ditto.
* libc/posix/regerror.c: Ditto.
* libc/posix/regex.3: Ditto.
* libc/posix/regex2.h: Ditto.
* libc/posix/regexec.c: Ditto.
* libc/posix/regfree.c: Ditto.
* libc/posix/rune.h: Ditto.
* libc/posix/runetype.h: Ditto.
* libc/posix/scandir.c: Remove advertising clause which is not in
effect.
* libc/posix/sysexits.h: Ditto.
* libc/posix/un-namespace.h: Ditto.
* libc/posix/utils.h: Ditto.
* libc/posix/wordexp.c: Ditto.
* libc/posix/wordfree.c: Ditto.
* libc/posix/execl.c: Add !_NO_EXECVE flag check.
* libc/posix/execle.c: Ditto.
* libc/posix/execlp.c: Ditto.
* libc/posix/execv.c: Ditto.
* libc/posix/execve.c: Ditto.
* libc/posix/execvp.c: Ditto.
* libc/posix/popen.c: Add !_NO_POPEN flag check.
* libc/sys/linux/configure: Regenerated.
* libc/sys/linux/configure.in: Remove stdlib.
* libc/sys/linux/include/limits.h: Add include of linux/limits.h.
* libc/sys/linux/stdlib/Makefile.am: Removed.
* libc/sys/linux/stdlib/Makefile.in: Ditto.
* libc/sys/linux/stdlib/COPYRIGHT: Moved to libc/posix.
* libc/sys/linux/stdlib/cclass.h: Ditto.
* libc/sys/linux/stdlib/cname.h: Ditto.
* libc/sys/linux/stdlib/collate.c: Ditto.
* libc/sys/linux/stdlib/collate.h: Ditto.
* libc/sys/linux/stdlib/collcmp.c: Ditto.
* libc/sys/linux/stdlib/engine.c: Ditto.
* libc/sys/linux/stdlib/fnmatch.3: Ditto.
* libc/sys/linux/stdlib/fnmatch.c: Ditto.
* libc/sys/linux/stdlib/glob.3: Ditto.
* libc/sys/linux/stdlib/glob.c: Ditto.
* libc/sys/linux/stdlib/reallocf.c: Ditto.
* libc/sys/linux/stdlib/regcomp.c: Ditto.
* libc/sys/linux/stdlib/regerror.c: Ditto.
* libc/sys/linux/stdlib/regex.3: Ditto.
* libc/sys/linux/stdlib/regex2.h: Ditto.
* libc/sys/linux/stdlib/regexec.c: Ditto.
* libc/sys/linux/stdlib/regfree.c: Ditto.
* libc/sys/linux/stdlib/utils.h: Ditto.
* libc/sys/linux/stdlib/wordexp.c: Ditto.
* libc/sys/linux/stdlib/wordfree.c: Ditto.
Diffstat (limited to 'newlib/libc/posix/collcmp.c')
-rw-r--r-- | newlib/libc/posix/collcmp.c | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/newlib/libc/posix/collcmp.c b/newlib/libc/posix/collcmp.c new file mode 100644 index 000000000..777089761 --- /dev/null +++ b/newlib/libc/posix/collcmp.c @@ -0,0 +1,84 @@ +/* + * Copyright (C) 1996 by Andrey A. Chernov, Moscow, Russia. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/cdefs.h> + +#define ASCII_COMPATIBLE_COLLATE /* see share/colldef */ + +#include <string.h> +#include "collate.h" +#ifndef ASCII_COMPATIBLE_COLLATE +#include <ctype.h> +#endif + +/* + * Compare two characters converting collate information + * into ASCII-compatible range, it allows to handle + * "[a-z]"-type ranges with national characters. + */ + +int __collate_range_cmp (c1, c2) + int c1, c2; +{ + static char s1[2], s2[2]; + int ret; +#ifndef ASCII_COMPATIBLE_COLLATE + int as1, as2, al1, al2; +#endif + + c1 &= UCHAR_MAX; + c2 &= UCHAR_MAX; + if (c1 == c2) + return (0); + +#ifndef ASCII_COMPATIBLE_COLLATE + as1 = isascii(c1); + as2 = isascii(c2); + al1 = isalpha(c1); + al2 = isalpha(c2); + + if (as1 || as2 || al1 || al2) { + if ((as1 && as2) || (!al1 && !al2)) + return (c1 - c2); + if (al1 && !al2) { + if (isupper(c1)) + return ('A' - c2); + else + return ('a' - c2); + } else if (al2 && !al1) { + if (isupper(c2)) + return (c1 - 'A'); + else + return (c1 - 'a'); + } + } +#endif + s1[0] = c1; + s2[0] = c2; + if ((ret = strcoll(s1, s2)) != 0) + return (ret); + return (c1 - c2); +} |