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

I totally wrecked the search functionality when i replaced strpcasecmp() with strcasecmp()

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4952 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2004-07-26 23:28:37 +00:00
parent ade5d7b848
commit a6880a4f73
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apps/plugins/search.c
View file

@ -40,6 +40,16 @@ static int line_end; /* Index of the end of line */
char resultfile[MAX_PATH]; char resultfile[MAX_PATH];
char path[MAX_PATH]; char path[MAX_PATH];
static int strpcasecmp(const char *s1, const char *s2)
{
while (*s1 != '\0' && tolower(*s1) == tolower(*s2)) {
s1++;
s2++;
}
return (*s1 == '\0') ;
}
static void fill_buffer(int pos) static void fill_buffer(int pos)
{ {
int numread; int numread;
@ -84,11 +94,12 @@ static void fill_buffer(int pos)
default: default:
if (!found && tolower(buffer[i]) == tolower(search_string[0])) if (!found && tolower(buffer[i]) == tolower(search_string[0]))
{ {
found = rb->strcasecmp(&search_string[0],&buffer[i]) ; found = strpcasecmp(&search_string[0],&buffer[i]) ;
} }
break; break;
} }
} }
DEBUGF("\n-------------------\n");
} }
static void search_buffer(void) static void search_buffer(void)
@ -103,6 +114,8 @@ static void search_buffer(void)
static bool search_init(char* file) static bool search_init(char* file)
{ {
rb->memset(search_string, 0, sizeof(search_string));
if (!rb->kbd_input(search_string,sizeof search_string)) if (!rb->kbd_input(search_string,sizeof search_string))
{ {
rb->lcd_clear_display(); rb->lcd_clear_display();
@ -141,8 +154,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb = api; rb = api;
DEBUGF("%s - %s\n", parameter, &filename[rb->strlen(filename)-4]);
/* Check the extension. We only allow .m3u files. */ /* Check the extension. We only allow .m3u files. */
if(!rb->strcasecmp(&filename[rb->strlen(filename)-4], ".m3u")) { if(rb->strcasecmp(&filename[rb->strlen(filename)-4], ".m3u")) {
rb->splash(HZ, true, "Not a .m3u file"); rb->splash(HZ, true, "Not a .m3u file");
return PLUGIN_ERROR; return PLUGIN_ERROR;
} }