Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed a mistake in sv_split, causing CR being recognized as EOL character, even when only LF was specified (since r12459).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14594 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2010-12-16 20:55:41 +00:00
parent ddca23e35d
commit 9eeaa7dc47
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -1,5 +1,7 @@
Date Added Date Added
2010/12/16
* Fixed a mistake in sv_split, causing CR being recognized as EOL character, even when only LF was specified (since r12459). [Ai4rei]
2010/12/15 2010/12/15
* Corrected type of second argument of script command 'setbattleflag' from string to number (bugreport:4640, topic:261833, since r5407, related r14577). [Ai4rei] * Corrected type of second argument of script command 'setbattleflag' from string to number (bugreport:4640, topic:261833, since r5407, related r14577). [Ai4rei]
* Fixed missing check in cooking, causing cooking kit requirement could be bypassed by sending 0x25b (CZ_REQ_MAKINGITEM) directly (bugreport:4642, since r13628). [Ai4rei] * Fixed missing check in cooking, causing cooking kit requirement could be bypassed by sending 0x25b (CZ_REQ_MAKINGITEM) directly (bugreport:4642, since r13628). [Ai4rei]

2
src/common/strlib.c
View File

@ -657,7 +657,7 @@ int sv_split(char* str, int len, int startoff, char delim, char** out_fields, in
end[0] = end[1] = '\0'; end[0] = end[1] = '\0';
*out_fields = end + 2; *out_fields = end + 2;
} }
else if( (opt&SV_TERMINATE_LF) && end[0] == '\r' ) else if( (opt&SV_TERMINATE_CR) && end[0] == '\r' )
{ {
if( !(opt&SV_KEEP_TERMINATOR) ) if( !(opt&SV_KEEP_TERMINATOR) )
end[0] = '\0'; end[0] = '\0';