2009-01-26 Daniel Mierswa <impulze@impulze.org>
* kern/misc.c (grub_strcasecmp): New function. (grub_strcasecmp): Use grub_size_t instead of int for length. Fix return value. * include/grub/misc.h: Update function prototypes.
This commit is contained in:
parent
ef257b36a6
commit
1806b56e2b
3 changed files with 33 additions and 10 deletions
33
kern/misc.c
33
kern/misc.c
|
@ -194,7 +194,7 @@ grub_strcmp (const char *s1, const char *s2)
|
|||
while (*s1 && *s2)
|
||||
{
|
||||
if (*s1 != *s2)
|
||||
return (int) *s1 - (int) *s2;
|
||||
break;
|
||||
|
||||
s1++;
|
||||
s2++;
|
||||
|
@ -212,7 +212,7 @@ grub_strncmp (const char *s1, const char *s2, grub_size_t n)
|
|||
while (*s1 && *s2 && --n)
|
||||
{
|
||||
if (*s1 != *s2)
|
||||
return (int) *s1 - (int) *s2;
|
||||
break;
|
||||
|
||||
s1++;
|
||||
s2++;
|
||||
|
@ -222,21 +222,36 @@ grub_strncmp (const char *s1, const char *s2, grub_size_t n)
|
|||
}
|
||||
|
||||
int
|
||||
grub_strncasecmp (const char *s1, const char *s2, int c)
|
||||
grub_strcasecmp (const char *s1, const char *s2)
|
||||
{
|
||||
int p = 1;
|
||||
|
||||
while (grub_tolower (*s1) && grub_tolower (*s2) && p < c)
|
||||
while (*s1 && *s2)
|
||||
{
|
||||
if (grub_tolower (*s1) != grub_tolower (*s2))
|
||||
return (int) grub_tolower (*s1) - (int) grub_tolower (*s2);
|
||||
break;
|
||||
|
||||
s1++;
|
||||
s2++;
|
||||
}
|
||||
|
||||
return (int) grub_tolower (*s1) - (int) grub_tolower (*s2);
|
||||
}
|
||||
|
||||
int
|
||||
grub_strncasecmp (const char *s1, const char *s2, grub_size_t n)
|
||||
{
|
||||
if (n == 0)
|
||||
return 0;
|
||||
|
||||
while (*s1 && *s2 && --n)
|
||||
{
|
||||
if (grub_tolower (*s1) != grub_tolower (*s2))
|
||||
break;
|
||||
|
||||
s1++;
|
||||
s2++;
|
||||
p++;
|
||||
}
|
||||
|
||||
return (int) *s1 - (int) *s2;
|
||||
return (int) grub_tolower (*s1) - (int) grub_tolower (*s2);
|
||||
}
|
||||
|
||||
char *
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue