summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2013-10-04 01:58:35 +0900
committerChunEon Park <hermet@hermet.pe.kr>2013-10-04 01:58:35 +0900
commit18be4c50d9990c82ed9ce4269b7820e61f772699 (patch)
treeb526ecde86529367c6710c5b8da14302602f5b09
parent44988e4798552cd97d14c8fc87959d1442a612b9 (diff)
eina/eina_file - fix eina_file_map_lines() to not drop of one character in the last line.
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/eina/eina_file_common.c3
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2444fdb920..cb4ea4ee4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-10-04 ChunEon Park (Hermet)
2
3 * Eina: fix eina_file_map_lines() to not drop of one character in the last line.
4
12013-10-02 Cedric Bail 52013-10-02 Cedric Bail
2 6
3 * Eina: add eina_swap16(), eina_swap32(), eina_swap64(). 7 * Eina: add eina_swap16(), eina_swap32(), eina_swap64().
diff --git a/NEWS b/NEWS
index cd3d9f25cc..fc83666916 100644
--- a/NEWS
+++ b/NEWS
@@ -258,6 +258,7 @@ Fixes:
258 - Fix memory leak in eina_xattr_value_ls. 258 - Fix memory leak in eina_xattr_value_ls.
259 - Fix magic failure in eina_value_array_count when array has not been allocated. 259 - Fix magic failure in eina_value_array_count when array has not been allocated.
260 - Fix issue when wchar_t is signed and eina_unicode does negative array lookups. 260 - Fix issue when wchar_t is signed and eina_unicode does negative array lookups.
261 - Eina: fix eina_file_map_lines() to not drop of one character in the last line.
261 * Eet: 262 * Eet:
262 - Fix PPC (big endian) image codec bug. 263 - Fix PPC (big endian) image codec bug.
263 - Fix leak in eet_pbkdf2_sha1 with OpenSSL. 264 - Fix leak in eet_pbkdf2_sha1 with OpenSSL.
diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c
index 5d7ef11c47..ec9cac8a6e 100644
--- a/src/lib/eina/eina_file_common.c
+++ b/src/lib/eina/eina_file_common.c
@@ -543,7 +543,8 @@ _eina_file_map_lines_iterator_next(Eina_Lines_Iterator *it, void **data)
543 it->current.start = it->current.end; 543 it->current.start = it->current.end;
544 544
545 it->current.end = eol; 545 it->current.end = eol;
546 it->current.length = eol - it->current.start - 1; 546 it->current.length = eol - it->current.start;
547 if (eol < it->end) it->current.length--;
547 548
548 *data = &it->current; 549 *data = &it->current;
549 return EINA_TRUE; 550 return EINA_TRUE;