rpms/cmigemo/devel cmigemo-1.3c-MIT-ignore-random-string.patch, NONE, 1.1 cmigemo.spec, 1.3, 1.4 cmigemo-1.3c-MIT-signore-random-string.patch, 1.1, NONE
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Wed Jul 11 14:45:55 UTC 2007
- Previous message: rpms/cmigemo/FC-6 cmigemo-1.3c-MIT-ignore-random-string.patch, NONE, 1.1 cmigemo.spec, 1.3, 1.4 cmigemo-1.3c-MIT-signore-random-string.patch, 1.1, NONE
- Next message: rpms/deltarpm/devel deltarpm-3.4-no-skip-doc.patch, NONE, 1.1 deltarpm-3.4-prelink-bugfix.patch, NONE, 1.1 deltarpm.spec, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/cmigemo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1155/devel
Modified Files:
cmigemo.spec
Added Files:
cmigemo-1.3c-MIT-ignore-random-string.patch
Removed Files:
cmigemo-1.3c-MIT-signore-random-string.patch
Log Message:
* Wed Jul 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.6.c_MIT
- Re-enable Migemo autocompletion
cmigemo-1.3c-MIT-ignore-random-string.patch:
--- NEW FILE cmigemo-1.3c-MIT-ignore-random-string.patch ---
--- cmigemo-1.3c-MIT/src/migemo.c.random 2004-06-19 20:21:19.000000000 +0900
+++ cmigemo-1.3c-MIT/src/migemo.c 2007-07-11 23:21:37.000000000 +0900
@@ -388,9 +388,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 +432,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 +441,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/devel/cmigemo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cmigemo.spec 27 May 2007 12:28:40 -0000 1.3
+++ cmigemo.spec 11 Jul 2007 14:45:23 -0000 1.4
@@ -2,7 +2,7 @@
%define minorver c-MIT
%define prerelease 1
-%define fedorarel 5
+%define fedorarel 6
%define uprel %(echo %{?minorver} | %{__sed} -e 's|^--*||' | %{__sed} -e 's|-|_|g' )
@@ -21,7 +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
+Patch0: cmigemo-1.3c-MIT-ignore-random-string.patch
Patch1: cmigemo-1.3c-MIT-dont-escape.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -132,6 +132,9 @@
%{_libdir}/libmigemo.so
%changelog
+* Wed Jul 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.6.c_MIT
+- Re-enable Migemo autocompletion
+
* Sun May 26 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.5.c_MIT
- Don't make special character escaped.
--- cmigemo-1.3c-MIT-signore-random-string.patch DELETED ---
- Previous message: rpms/cmigemo/FC-6 cmigemo-1.3c-MIT-ignore-random-string.patch, NONE, 1.1 cmigemo.spec, 1.3, 1.4 cmigemo-1.3c-MIT-signore-random-string.patch, 1.1, NONE
- Next message: rpms/deltarpm/devel deltarpm-3.4-no-skip-doc.patch, NONE, 1.1 deltarpm-3.4-prelink-bugfix.patch, NONE, 1.1 deltarpm.spec, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list