bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elementary: properly read file in elm_entry. 

SVN revision: 80300
This commit is contained in:
Cedric BAIL 2012-12-06 07:28:57 +00:00
parent 1f9630075c
commit 4e17a72fc7
3 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/elementary/ChangeLog
View File

@ -767,3 +767,7 @@
* Fix naviframe to not send hide signals even before item doens't created
yet.
2012-12-06 Cedric Bail
* Properly read file elm_entry.

1
legacy/elementary/NEWS
View File

@ -76,6 +76,7 @@ Fixes:
* Fix possible divide by zero in els_scroller animator.
* Fix uninitialized data path in elm_flip, elm_gesture_layer, elm_interface_scrollable,
els_scroller.
* Fix the way we read file in elm_entry.
Removals:

56
legacy/elementary/src/lib/elm_entry.c
View File

@ -118,48 +118,34 @@ ok: // ok - return api
return m->api;
}
static char *
_buf_append(char *buf,
const char *str,
int *len,
int *alloc)
{
int len2 = strlen(str);
if ((*len + len2) >= *alloc)
{
char *buf2 = realloc(buf, *alloc + len2 + 512);
if (!buf2) return NULL;
buf = buf2;
*alloc += (512 + len2);
}
strcpy(buf + *len, str);
*len += len2;
return buf;
}
static char *
_file_load(const char *file)
{
FILE *f;
size_t size;
int alloc = 0, len = 0;
char *text = NULL, buf[16384 + 1];
Eina_File *f;
char *text = NULL;
void *tmp = NULL;
f = fopen(file, "rb");
f = eina_file_open(file, EINA_FALSE);
if (!f) return NULL;
while ((size = fread(buf, 1, sizeof(buf) - 1, f)))
{
char *tmp_text;
buf[size] = 0;
tmp_text = _buf_append(text, buf, &len, &alloc);
if (!tmp_text) break;
text = tmp_text;
tmp = eina_file_map_all(file, EINA_FILE_SEQUENTIAL);
if (!tmp) goto on_error;
text = malloc(eina_file_size_get(f) + 1);
if (!text) goto on_error;
memcpy(text, tmp, eina_file_size_get(f));
text[eina_file_size_get(f)] = 0;
if (eina_file_map_faulted(f))
{
free(text);
text = NULL;
}
fclose(f);
on_error:
if (tmp) eina_file_map_free(tmp);
eina_file_close(f);
return text;
}