Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a couple of error handling bugs. Some minor code simplification.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12420 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2007-02-20 21:08:54 +00:00
parent 51223e5395
commit 12bf62524d
1 changed files with 21 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
apps/bookmark.c
View file

@ -59,7 +59,8 @@
#define MAX_BOOKMARK_SIZE 350 #define MAX_BOOKMARK_SIZE 350
#define RECENT_BOOKMARK_FILE ROCKBOX_DIR "/most-recent.bmark" #define RECENT_BOOKMARK_FILE ROCKBOX_DIR "/most-recent.bmark"
static bool add_bookmark(const char* bookmark_file_name, const char* bookmark); static bool add_bookmark(const char* bookmark_file_name, const char* bookmark,
bool most_recent);
static bool check_bookmark(const char* bookmark); static bool check_bookmark(const char* bookmark);
static char* create_bookmark(void); static char* create_bookmark(void);
static bool delete_bookmark(const char* bookmark_file_name, int bookmark_id); static bool delete_bookmark(const char* bookmark_file_name, int bookmark_id);
@ -211,7 +212,7 @@ static bool write_bookmark(bool create_bookmark_file)
return false; /* something didn't happen correctly, do nothing */ return false; /* something didn't happen correctly, do nothing */
if (global_settings.usemrb) if (global_settings.usemrb)
success = add_bookmark(RECENT_BOOKMARK_FILE, bookmark); success = add_bookmark(RECENT_BOOKMARK_FILE, bookmark, true);
/* writing the bookmark */ /* writing the bookmark */
@ -221,7 +222,7 @@ static bool write_bookmark(bool create_bookmark_file)
sizeof(global_temp_buffer)); sizeof(global_temp_buffer));
if (generate_bookmark_file_name(name)) if (generate_bookmark_file_name(name))
{ {
success = add_bookmark(global_bookmark_file_name, bookmark); success = add_bookmark(global_bookmark_file_name, bookmark, false);
} }
} }
@ -234,7 +235,8 @@ static bool write_bookmark(bool create_bookmark_file)
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/* This function adds a bookmark to a file. */ /* This function adds a bookmark to a file. */
/* ------------------------------------------------------------------------*/ /* ------------------------------------------------------------------------*/
static bool add_bookmark(const char* bookmark_file_name, const char* bookmark) static bool add_bookmark(const char* bookmark_file_name, const char* bookmark,
bool most_recent)
{ {
int temp_bookmark_file = 0; int temp_bookmark_file = 0;
int bookmark_file = 0; int bookmark_file = 0;
@ -253,8 +255,7 @@ static bool add_bookmark(const char* bookmark_file_name, const char* bookmark)
if (temp_bookmark_file < 0) if (temp_bookmark_file < 0)
return false; /* can't open the temp file */ return false; /* can't open the temp file */
if (!strcmp(bookmark_file_name,RECENT_BOOKMARK_FILE) && if (most_recent && (global_settings.usemrb == BOOKMARK_UNIQUE_ONLY))
(global_settings.usemrb == BOOKMARK_UNIQUE_ONLY))
{ {
playlist = strchr(bookmark,'/'); playlist = strchr(bookmark,'/');
cp = strrchr(bookmark,';'); cp = strrchr(bookmark,';');
@ -272,15 +273,12 @@ static bool add_bookmark(const char* bookmark_file_name, const char* bookmark)
if (bookmark_file >= 0) if (bookmark_file >= 0)
{ {
while (read_line(bookmark_file, global_read_buffer, while (read_line(bookmark_file, global_read_buffer,
sizeof(global_read_buffer))) sizeof(global_read_buffer)) > 0)
{ {
/* The MRB has a max of MAX_BOOKMARKS in it */ /* The MRB has a max of MAX_BOOKMARKS in it */
/* This keeps it from getting too large */ /* This keeps it from getting too large */
if ((strcmp(bookmark_file_name,RECENT_BOOKMARK_FILE)==0)) if (most_recent && (bookmark_count >= MAX_BOOKMARKS))
{
if(bookmark_count >= MAX_BOOKMARKS)
break; break;
}
cp = strchr(global_read_buffer,'/'); cp = strchr(global_read_buffer,'/');
tmp = strrchr(global_read_buffer,';'); tmp = strrchr(global_read_buffer,';');
@ -442,7 +440,7 @@ bool bookmark_load(const char* file, bool autoload)
fd = open(file, O_RDONLY); fd = open(file, O_RDONLY);
if(fd >= 0) if(fd >= 0)
{ {
if(read_line(fd, global_read_buffer, sizeof(global_read_buffer))) if(read_line(fd, global_read_buffer, sizeof(global_read_buffer)) > 0)
bookmark=global_read_buffer; bookmark=global_read_buffer;
close(fd); close(fd);
} }
@ -471,10 +469,9 @@ static int get_bookmark_count(const char* bookmark_file_name)
return -1; return -1;
/* Get the requested bookmark */ /* Get the requested bookmark */
while(read_line(file, global_read_buffer, sizeof(global_read_buffer))) while(read_line(file, global_read_buffer, sizeof(global_read_buffer)) > 0)
{ {
if(check_bookmark(global_read_buffer)) read_count++;
read_count++;
} }
close(file); close(file);
@ -532,6 +529,7 @@ static char* select_bookmark(const char* bookmark_file_name)
{ {
bookmark_id_prev = bookmark_id; bookmark_id_prev = bookmark_id;
bookmark_id--; bookmark_id--;
continue;
} }
} }
else else
@ -602,24 +600,16 @@ static bool delete_bookmark(const char* bookmark_file_name, int bookmark_id)
"%s.tmp", bookmark_file_name); "%s.tmp", bookmark_file_name);
temp_bookmark_file = open(global_temp_buffer, temp_bookmark_file = open(global_temp_buffer,
O_WRONLY | O_CREAT | O_TRUNC); O_WRONLY | O_CREAT | O_TRUNC);
bookmark_file = open(bookmark_file_name, O_RDONLY);
if (temp_bookmark_file < 0 || bookmark_file < 0) if (temp_bookmark_file < 0)
return false; /* can't open one of the files */ return false; /* can't open the temp file */
/* Reading in the previous bookmarks and writing them to the temp file */ /* Reading in the previous bookmarks and writing them to the temp file */
while (read_line(bookmark_file, global_read_buffer, bookmark_file = open(bookmark_file_name, O_RDONLY);
sizeof(global_read_buffer))) if (bookmark_file >= 0)
{ {
/* The MRB has a max of MAX_BOOKMARKS in it */ while (read_line(bookmark_file, global_read_buffer,
/* This keeps it from getting too large */ sizeof(global_read_buffer)) > 0)
if ((strcmp(bookmark_file_name,RECENT_BOOKMARK_FILE)==0))
{
if(bookmark_count >= MAX_BOOKMARKS)
break;
}
if (check_bookmark(global_read_buffer))
{ {
if (bookmark_id != bookmark_count) if (bookmark_id != bookmark_count)
{ {
@ -629,9 +619,8 @@ static bool delete_bookmark(const char* bookmark_file_name, int bookmark_id)
} }
bookmark_count++; bookmark_count++;
} }
close(bookmark_file);
} }
close(bookmark_file);
close(temp_bookmark_file); close(temp_bookmark_file);
remove(bookmark_file_name); remove(bookmark_file_name);
@ -834,9 +823,6 @@ static char* get_bookmark(const char* bookmark_file, int bookmark_count)
if (file < 0) if (file < 0)
return NULL; return NULL;
if (bookmark_count < 0)
return NULL;
/* Get the requested bookmark */ /* Get the requested bookmark */
while (read_count < bookmark_count) while (read_count < bookmark_count)
{ {
@ -854,7 +840,7 @@ static char* get_bookmark(const char* bookmark_file, int bookmark_count)
} }
close(file); close(file);
if (read_count == bookmark_count) if ((read_count >= 0) && (read_count == bookmark_count))
return global_read_buffer; return global_read_buffer;
else else
return NULL; return NULL;