diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-12-16 20:55:41 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-12-16 20:55:41 +0000 |
| commit | 0cbf5d3429e72b56980c41611cdb798179f0366b (patch) | |
| tree | 0e3fcf274b4a19456cf2e493959172f78f89c8ca | |
| parent | 75249417a0a7e234485ae763b6de8a3517ad77f9 (diff) | |
| download | hercules-0cbf5d3429e72b56980c41611cdb798179f0366b.tar.gz hercules-0cbf5d3429e72b56980c41611cdb798179f0366b.tar.bz2 hercules-0cbf5d3429e72b56980c41611cdb798179f0366b.tar.xz hercules-0cbf5d3429e72b56980c41611cdb798179f0366b.zip | |
* Fixed a mistake in sv_split, causing CR being recognized as EOL character, even when only LF was specified (since r12459).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14594 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/common/strlib.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 1fcbf5230..2d2564252 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,5 +1,7 @@ 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 * 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] diff --git a/src/common/strlib.c b/src/common/strlib.c index 633d6d45b..bb1f67fdb 100644 --- a/src/common/strlib.c +++ b/src/common/strlib.c @@ -657,7 +657,7 @@ int sv_split(char* str, int len, int startoff, char delim, char** out_fields, in end[0] = end[1] = '\0'; *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) ) end[0] = '\0'; |