rpms/cmigemo/FC-6 cmigemo-1.3c-MIT-signore-random-string.patch, NONE, 1.1 cmigemo.spec, 1.1, 1.2
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Sat May 26 15:04:57 UTC 2007
Author: mtasaka
Update of /cvs/extras/rpms/cmigemo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15066/FC-6
Modified Files:
cmigemo.spec
Added Files:
cmigemo-1.3c-MIT-signore-random-string.patch
Log Message:
* Sat May 26 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.4.c_MIT
- Suppress completent for too random string.
cmigemo-1.3c-MIT-signore-random-string.patch:
--- NEW FILE cmigemo-1.3c-MIT-signore-random-string.patch ---
--- cmigemo-1.3c-MIT/src/migemo.c.orig 2004-06-19 20:21:19.000000000 +0900
+++ cmigemo-1.3c-MIT/src/migemo.c 2007-05-26 23:48:29.000000000 +0900
@@ -342,6 +342,10 @@
* [}Ï·ªs®S¾Á½ÉA[aiueo]¨æÑ"xn"Æ"xtu"ðâÁÄÏ·µÄ
* ÝéB
*/
+/*
+ _ȶñðüêéƪ}Éå·éÌÅA±Ì@\Í
+ æ踦¸}§
+*/
static void
add_dubious_roma(migemo* object, rxgen* rx, unsigned char* query)
{
@@ -349,6 +353,8 @@
int len;
char *buf;
+ return;
+
if (!(len = strlen(query)))
return;
if (!(buf = malloc(len + 1 + 3))) /* NULÆg£¶p(Å·:xtu) */
@@ -388,9 +394,42 @@
}
/*
+ ]èɳêȶñ͵Ȣ
+*/
+
+static int
+too_random_string(const unsigned char *string)
+{
+
+ unsigned char *query = string;
+ unsigned short int no_vowels = 0;
+ unsigned short int length_bunsetsu = 0;
+ unsigned short int randomness = 0;
+ unsigned short int found_upper = 0;
+ unsigned short int length = 0;
+
+
+ for (; *query; query++, length++){
+ if (isupper (*query)){
+ found_upper = 1;
+ if (length_bunsetsu < 2 && (query != string)) randomness++;
+ length_bunsetsu = 0;
+ }
+ else
+ length_bunsetsu++ ;
+
+ }
+
+ if (randomness >= 2) return 1;
+ if (found_upper && (length <= 3)) return 1;
+ return 0;
+}
+
+/*
* queryð¶ßɪð·éB¶ßÌØêÚÍÊíAt@xbgÌå¶B¶ßª¡
* ¶Ìå¶ÅnÜÁ½¶ßÍñå¶ðæØèÆ·éB
*/
+
static wordlist_p
parse_query(migemo* object, const unsigned char* query)
{
@@ -399,6 +438,8 @@
const unsigned char *end = NULL;
wordlist_p querylist = NULL, *pp = &querylist;
+ int random_query_p = too_random_string (query);
+
while (1)
{
int len, upper;
@@ -406,13 +447,13 @@
if (!object->char2int || (len = object->char2int(curr, NULL)) < 1)
len = 1;
start = curr;
- upper = (len == 1 && isupper(*curr) && isupper(curr[1]));
+ upper = (len == 1 && isupper(*curr) && isupper(curr[1]) && (!random_query_p));
curr += len;
while (1)
{
if (!object->char2int || (len = object->char2int(curr, NULL)) < 1)
len = 1;
- if (*curr == '\0' || (len == 1 && (isupper(*curr) != 0) != upper))
+ if (*curr == '\0' || (len == 1 && ((isupper(*curr) != 0) != upper)) && (!random_query_p))
break;
curr += len;
}
Index: cmigemo.spec
===================================================================
RCS file: /cvs/extras/rpms/cmigemo/FC-6/cmigemo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmigemo.spec 21 May 2007 18:22:16 -0000 1.1
+++ cmigemo.spec 26 May 2007 15:04:23 -0000 1.2
@@ -2,7 +2,7 @@
%define minorver c-MIT
%define prerelease 1
-%define fedorarel 3
+%define fedorarel 4
%define uprel %(echo %{?minorver} | %{__sed} -e 's|^--*||' | %{__sed} -e 's|-|_|g' )
@@ -21,6 +21,7 @@
License: MIT
URL: http://www.kaoriya.net/
Source0: http://www.kaoriya.net/dist/var/%{name}-%{mainver}%{?minorver}.tar.bz2
+Patch0: cmigemo-1.3c-MIT-signore-random-string.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: skkdic
@@ -41,6 +42,7 @@
%prep
%setup -q -n %{name}-%{version}%{?minorver}
+%patch0 -p1 -b .random
# Change default command for configure
%{__sed} -i.bak \
@@ -128,6 +130,9 @@
%{_libdir}/libmigemo.so
%changelog
+* Sat May 26 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.4.c_MIT
+- Suppress completent for too random string.
+
* Sun May 20 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.3.c_MIT
- Don't create unnecessary document backup
More information about the fedora-extras-commits
mailing list