Lines 1-17
Link Here
|
1 |
diff -ru ../dictd-freebsd/dictd.c ./dictd.c |
1 |
--- dictd.c.orig Mon Mar 10 01:07:36 2003 |
2 |
--- ../dictd-freebsd/dictd.c Sun Nov 24 09:35:55 2002 |
2 |
+++ dictd.c Fri Oct 10 00:19:17 2003 |
3 |
+++ ./dictd.c Sun Dec 1 22:29:55 2002 |
3 |
@@ -1064,6 +1064,8 @@ |
4 |
@@ -662,6 +662,8 @@ |
|
|
5 |
|
4 |
|
6 |
static void set_utf8_mode (const char *locale) |
5 |
static void set_utf8bit_mode (const char *loc) |
7 |
{ |
6 |
{ |
8 |
+#include <osreldate.h> |
7 |
+#include <osreldate.h> |
9 |
+#if __FreeBSD_version > 499999 |
8 |
+#if __FreeBSD_version > 499999 |
10 |
char *locale_copy; |
9 |
char *locale_copy; |
11 |
locale_copy = strdup (locale); |
10 |
locale_copy = strdup (loc); |
12 |
strlwr_8bit (locale_copy); |
11 |
strlwr_8bit (locale_copy); |
13 |
@@ -671,6 +673,9 @@ |
12 |
@@ -1075,6 +1077,9 @@ |
14 |
strstr (locale_copy, "utf8"); |
13 |
bit8_mode = !utf8_mode && (locale_copy [0] != 'c' || locale_copy [1] != 0); |
15 |
|
14 |
|
16 |
free (locale_copy); |
15 |
free (locale_copy); |
17 |
+#else |
16 |
+#else |
Lines 20-29
Link Here
|
20 |
} |
19 |
} |
21 |
|
20 |
|
22 |
static void init (const char *fn) |
21 |
static void init (const char *fn) |
23 |
diff -ru ../dictd-freebsd/index.c ./index.c |
22 |
--- index.c.orig Mon Mar 10 01:06:16 2003 |
24 |
--- ../dictd-freebsd/index.c Sun Dec 1 22:12:49 2002 |
23 |
+++ index.c Fri Oct 10 00:20:22 2003 |
25 |
+++ ./index.c Sun Dec 1 22:25:06 2002 |
24 |
@@ -123,6 +123,10 @@ |
26 |
@@ -111,6 +111,10 @@ |
|
|
27 |
const char *src, char *dest, |
25 |
const char *src, char *dest, |
28 |
int allchars_mode) |
26 |
int allchars_mode) |
29 |
{ |
27 |
{ |
Lines 31-60
Link Here
|
31 |
+#if __FreeBSD_version < 500000 |
29 |
+#if __FreeBSD_version < 500000 |
32 |
+ abort(); |
30 |
+ abort(); |
33 |
+#else |
31 |
+#else |
34 |
wint_t ucs4_char; |
32 |
wchar_t ucs4_char; |
35 |
|
33 |
size_t len; |
36 |
while (src && src [0]){ |
34 |
int len2; |
37 |
@@ -130,6 +134,7 @@ |
35 |
@@ -154,6 +158,7 @@ |
38 |
*dest = 0; |
36 |
*dest = 0; |
39 |
|
37 |
|
40 |
return (src != NULL); |
38 |
return (src != NULL); |
41 |
+#endif |
39 |
+#endif |
42 |
} |
40 |
} |
43 |
|
41 |
|
44 |
static void dict_table_init(void) |
42 |
static void dict_table_init(void) |
45 |
@@ -166,9 +171,11 @@ |
43 |
@@ -200,9 +205,11 @@ |
46 |
p[i] = &s[2 * i]; |
44 |
p[i] = &s[2 * i]; |
47 |
} |
45 |
} |
48 |
/* Sort those strings in the locale */ |
46 |
/* Sort those strings in the locale */ |
49 |
+#if __FreeBSD_version > 499999 |
47 |
+#if __FreeBSD_version > 499999 |
50 |
if (utf8_mode) |
48 |
if (utf8_mode) |
51 |
qsort(p, UCHAR_MAX + 1, sizeof(p[0]), dict_table_init_compare_utf8); |
49 |
qsort(p, UCHAR_MAX + 1, sizeof(p[0]), dict_table_init_compare_utf8); |
52 |
else |
50 |
else |
53 |
+#endif |
51 |
+#endif |
54 |
qsort(p, UCHAR_MAX + 1, sizeof(p[0]), dict_table_init_compare_strcoll); |
52 |
qsort(p, UCHAR_MAX + 1, sizeof(p[0]), dict_table_init_compare_strcoll); |
55 |
|
53 |
|
56 |
/* Extract our unordered arrays */ |
54 |
/* Extract our unordered arrays */ |
57 |
@@ -1126,6 +1133,9 @@ |
55 |
@@ -1258,6 +1265,9 @@ |
58 |
*/ |
56 |
*/ |
59 |
static int stranagram_utf8 (char *str) |
57 |
static int stranagram_utf8 (char *str) |
60 |
{ |
58 |
{ |
Lines 62-70
Link Here
|
62 |
+ abort(); |
60 |
+ abort(); |
63 |
+#else |
61 |
+#else |
64 |
size_t len; |
62 |
size_t len; |
65 |
char *p; |
63 |
char *p; |
66 |
|
64 |
|
67 |
@@ -1142,6 +1151,7 @@ |
65 |
@@ -1280,6 +1290,7 @@ |
68 |
|
66 |
|
69 |
stranagram_8bit (str, -1); |
67 |
stranagram_8bit (str, -1); |
70 |
return 1; |
68 |
return 1; |
Lines 72-102
Link Here
|
72 |
} |
70 |
} |
73 |
|
71 |
|
74 |
/* makes anagram of utf-8 string 'str' */ |
72 |
/* makes anagram of utf-8 string 'str' */ |
75 |
diff -ru ../dictd-freebsd/utf8_ucs4.c ./utf8_ucs4.c |
|
|
76 |
--- ../dictd-freebsd/utf8_ucs4.c Sun Nov 24 09:35:55 2002 |
77 |
+++ ./utf8_ucs4.c Sun Dec 1 22:44:40 2002 |
78 |
@@ -1,3 +1,5 @@ |
79 |
+#include <osreldate.h> |
80 |
+#if __FreeBSD_version > 499999 |
81 |
#include <wctype.h> |
82 |
#include <stdlib.h> |
83 |
#include <ctype.h> |
84 |
@@ -210,3 +212,4 @@ |
85 |
else |
86 |
return (size_t) -1; |
87 |
} |
88 |
+#endif // __FreeBSD_version > 499999 |
89 |
diff -ru ../dictd-freebsd/utf8_ucs4.h ./utf8_ucs4.h |
90 |
--- ../dictd-freebsd/utf8_ucs4.h Sun Nov 24 09:35:55 2002 |
91 |
+++ ./utf8_ucs4.h Sun Dec 1 22:26:15 2002 |
92 |
@@ -1,3 +1,5 @@ |
93 |
+#include <osreldate.h> |
94 |
+#if __FreeBSD_version > 499999 |
95 |
#ifndef _UTF8_UCS4_H_ |
96 |
#define _UTF8_UCS4_H_ |
97 |
|
98 |
@@ -73,3 +75,4 @@ |
99 |
__END_DECLS |
100 |
|
101 |
#endif // _UTF8_UCS4_H_ |
102 |
+#endif // __FreeBSD_version > 499999 |