d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts.

Browse Source
This commit is contained in:
Xin LI 2007-11-26 08:58:07 +00:00
parent ddccfc1d45
commit 3951d17b6c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=173935
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/less/search.c
View File

@ -120,13 +120,16 @@ cvt_length(len, ops)
int len;
int ops;
{
if (utf_mode && (ops & CVT_TO_LC))
if (utf_mode)
/*
* Converting case can cause a UTF-8 string to increase in length.
* Multiplying by 3 is the worst case.
* Just copying a string in UTF-8 mode can cause it to grow
* in length.
* Six output bytes for one input byte is the worst case
* (and unfortunately is far more than is needed in any
* non-pathological situation, so this is very wasteful).
*/
len *= 3;
return len+1;
len *= 6;
return len + 1;
}
/*