devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix FS#8986, problem where current file changes during deletion.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17494 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Steve Bavin 2008-05-13 13:49:50 +00:00
parent fa0eabdd9a
commit bc186c1a6b
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
apps/onplay.c
View file

@ -524,13 +524,16 @@ static int remove_dir(char* dirname, int len)
/* share code for file and directory deletion, saves space */ /* share code for file and directory deletion, saves space */
static bool delete_handler(bool is_dir) static bool delete_handler(bool is_dir)
{ {
char file_to_delete[MAX_PATH];
strcpy(file_to_delete, selected_file);
const char *lines[]={ const char *lines[]={
ID2P(LANG_REALLY_DELETE), ID2P(LANG_REALLY_DELETE),
selected_file file_to_delete
}; };
const char *yes_lines[]={ const char *yes_lines[]={
ID2P(LANG_DELETED), ID2P(LANG_DELETED),
selected_file file_to_delete
}; };
struct text_message message={lines, 2}; struct text_message message={lines, 2};
@ -546,16 +549,16 @@ static bool delete_handler(bool is_dir)
{ {
char pathname[MAX_PATH]; /* space to go deep */ char pathname[MAX_PATH]; /* space to go deep */
cpu_boost(true); cpu_boost(true);
strncpy(pathname, selected_file, sizeof pathname); strncpy(pathname, file_to_delete, sizeof pathname);
res = remove_dir(pathname, sizeof(pathname)); res = remove_dir(pathname, sizeof(pathname));
cpu_boost(false); cpu_boost(false);
} }
else else
res = remove(selected_file); res = remove(file_to_delete);
if (!res) { if (!res)
onplay_result = ONPLAY_RELOAD_DIR; onplay_result = ONPLAY_RELOAD_DIR;
}
return false; return false;
} }