Deleted Added
sdiff udiff text old ( 18331 ) new ( 19129 )
full compact
collcmp.c (18331) collcmp.c (19129)
1/*
2 * Copyright (C) 1996 by Andrey A. Chernov, Moscow, Russia.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*
2 * Copyright (C) 1996 by Andrey A. Chernov, Moscow, Russia.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $Id: collcmp.c,v 1.5 1996/08/14 19:47:02 ache Exp $
26 * $Id: collcmp.c,v 1.6 1996/09/17 19:27:06 ache Exp $
27 */
28
27 */
28
29#include <ctype.h>
29#define ASCII_COMPATIBLE_COLLATE /* see usr.bin/colldef/data */
30
30#include <string.h>
31#include <limits.h>
32#include <locale.h>
31#include <string.h>
32#include <limits.h>
33#include <locale.h>
34#ifndef ASCII_COMPATIBLE_COLLATE
35#include <ctype.h>
36#endif
33
34/*
35 * Compare two characters converting collate information
36 * into ASCII-compatible range, it allows to handle
37 * "[a-z]"-type ranges with national characters.
38 */
39
40int collate_range_cmp (c1, c2)
41 int c1, c2;
42{
37
38/*
39 * Compare two characters converting collate information
40 * into ASCII-compatible range, it allows to handle
41 * "[a-z]"-type ranges with national characters.
42 */
43
44int collate_range_cmp (c1, c2)
45 int c1, c2;
46{
43 int as1, as2, al1, al2, ret;
44 static char s1[2], s2[2];
47 static char s1[2], s2[2];
48 int ret;
49#ifndef ASCII_COMPATIBLE_COLLATE
50 int as1, as2, al1, al2;
51#endif
45
46 c1 &= UCHAR_MAX;
47 c2 &= UCHAR_MAX;
48 if (c1 == c2)
49 return (0);
50
52
53 c1 &= UCHAR_MAX;
54 c2 &= UCHAR_MAX;
55 if (c1 == c2)
56 return (0);
57
58#ifndef ASCII_COMPATIBLE_COLLATE
51 as1 = isascii(c1);
52 as2 = isascii(c2);
53 al1 = isalpha(c1);
54 al2 = isalpha(c2);
55
56 if (as1 || as2 || al1 || al2) {
57 if ((as1 && as2) || (!al1 && !al2))
58 return (c1 - c2);

--- 4 unchanged lines hidden (view full) ---

63 return ('a' - c2);
64 } else if (al2 && !al1) {
65 if (isupper(c2))
66 return (c1 - 'A');
67 else
68 return (c1 - 'a');
69 }
70 }
59 as1 = isascii(c1);
60 as2 = isascii(c2);
61 al1 = isalpha(c1);
62 al2 = isalpha(c2);
63
64 if (as1 || as2 || al1 || al2) {
65 if ((as1 && as2) || (!al1 && !al2))
66 return (c1 - c2);

--- 4 unchanged lines hidden (view full) ---

71 return ('a' - c2);
72 } else if (al2 && !al1) {
73 if (isupper(c2))
74 return (c1 - 'A');
75 else
76 return (c1 - 'a');
77 }
78 }
71
79#endif
72 s1[0] = c1;
73 s2[0] = c2;
74 if ((ret = strcoll(s1, s2)) != 0)
75 return (ret);
76 return (c1 - c2);
77}
80 s1[0] = c1;
81 s2[0] = c2;
82 if ((ret = strcoll(s1, s2)) != 0)
83 return (ret);
84 return (c1 - c2);
85}