len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-22 03:22:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

text viewer: fixed garbage data are not stored in the setting file.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27240 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Yoshihisa Uchida 2010-07-02 11:35:28 +00:00
parent 00a3024924
commit 426f4c1e87
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/plugins/text_viewer/tv_settings.c
View file

@ -43,7 +43,7 @@
* overlap_page_mode 1 * overlap_page_mode 1
* header_mode 1 * header_mode 1
* footer_mode 1 * footer_mode 1
* scroll_mode 1 * vertical_scroll_mode 1
* autoscroll_speed 1 * autoscroll_speed 1
* horizontal_scrollbar 1 * horizontal_scrollbar 1
* horizontal_scroll_mode 1 * horizontal_scroll_mode 1
@ -86,7 +86,7 @@
* overlap_page_mode 1 * overlap_page_mode 1
* header_mode 1 * header_mode 1
* footer_mode 1 * footer_mode 1
* scroll_mode 1 * vertical_scroll_mode 1
* autoscroll_speed 1 * autoscroll_speed 1
* horizontal_scrollbar 1 * horizontal_scrollbar 1
* horizontal_scroll_mode 1 * horizontal_scroll_mode 1
@ -140,8 +140,8 @@ static bool tv_read_preferences(int pfd, int version, struct tv_preferences *pre
if (rb->read(pfd, buf, read_size) < 0) if (rb->read(pfd, buf, read_size) < 0)
return false; return false;
prefs->word_mode = *p++; prefs->word_mode = *p++;
prefs->line_mode = *p++; prefs->line_mode = *p++;
prefs->windows = *p++; prefs->windows = *p++;
if (version <= 1) if (version <= 1)
@ -160,7 +160,7 @@ static bool tv_read_preferences(int pfd, int version, struct tv_preferences *pre
if (version < 7) if (version < 7)
{ {
prefs->statusbar = false; prefs->statusbar = false;
if (*p > 1) if (*p > 1)
{ {
prefs->header_mode = ((*p & 1) != 0); prefs->header_mode = ((*p & 1) != 0);
@ -212,7 +212,7 @@ static bool tv_read_preferences(int pfd, int version, struct tv_preferences *pre
prefs->statusbar = (*p++ != 0); prefs->statusbar = (*p++ != 0);
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
rb->memcpy(prefs->font_name, buf + read_size - MAX_PATH, MAX_PATH); rb->strlcpy(prefs->font_name, buf + read_size - MAX_PATH, MAX_PATH);
prefs->font = rb->font_get(FONT_UI); prefs->font = rb->font_get(FONT_UI);
#endif #endif
@ -225,6 +225,7 @@ static bool tv_write_preferences(int pfd, const struct tv_preferences *prefs)
unsigned char buf[TV_PREFERENCES_SIZE]; unsigned char buf[TV_PREFERENCES_SIZE];
unsigned char *p = buf; unsigned char *p = buf;
rb->memset(buf, 0, TV_PREFERENCES_SIZE);
*p++ = prefs->word_mode; *p++ = prefs->word_mode;
*p++ = prefs->line_mode; *p++ = prefs->line_mode;
*p++ = prefs->windows; *p++ = prefs->windows;
@ -245,7 +246,7 @@ static bool tv_write_preferences(int pfd, const struct tv_preferences *prefs)
*p++ = prefs->statusbar; *p++ = prefs->statusbar;
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
rb->memcpy(buf + 28, prefs->font_name, MAX_PATH); rb->strlcpy(buf + 28, prefs->font_name, MAX_PATH);
#endif #endif
return (rb->write(pfd, buf, TV_PREFERENCES_SIZE) >= 0); return (rb->write(pfd, buf, TV_PREFERENCES_SIZE) >= 0);
@ -554,6 +555,7 @@ bool tv_save_settings(void)
{ {
/* save to current read file's preferences and bookmarks */ /* save to current read file's preferences and bookmarks */
res = false; res = false;
rb->memset(buf, 0, MAX_PATH);
rb->strlcpy(buf, preferences->file_name, MAX_PATH); rb->strlcpy(buf, preferences->file_name, MAX_PATH);
if (rb->write(tfd, buf, MAX_PATH + 2) >= 0) if (rb->write(tfd, buf, MAX_PATH + 2) >= 0)