2009-07-05 Bean <bean123ch@gmail.com>
* conf/common.rmk (lua_mode_SOURCES): Add script/lua/lstrlib.c. * script/lua/grub_lib.c (grub_lua_run): Check input parameter. (grub_lua_getenv): Likewise. (grub_lua_setenv): Likewise. (save_errno): New function. (push_result): Likewise. (grub_lua_enum_device): Likewise. (grub_lua_enum_file): Likewise. (grub_lua_file_open): Likewise. (grub_lua_file_close): Likewise. (grub_lua_file_seek): Likewise. (grub_lua_file_read): Likewise. (grub_lua_file_getline): Likewise. (grub_lua_file_getsize): Likewise. (grub_lua_file_getpos): Likewise. (grub_lua_file_eof): Likewise. (grub_lua_file_exist): Likewise. (grub_lua_add_menu): Likewise. * script/lua/grub_lua.h (isupper): New inline function. (islower): Likewise. (ispunct): Likewise. (isxdigit): Likewise. (strcspn): Change to normal function. (strpbkr): New function declaration. (memchr): Likewise. * script/lua/grub_main.c (scan_str): New function. (strcspn): Likewise. (strpbrk): Likewise. (memchr): Likewise. * script/lua/linit.c (lualibs): Enable the string library. * util/osdetect.lua: New file.
This commit is contained in:
parent
2da9229550
commit
b4a1dc7990
7 changed files with 581 additions and 41 deletions
|
@ -24,6 +24,61 @@
|
|||
#include <grub/dl.h>
|
||||
#include <grub/parser.h>
|
||||
|
||||
static const char *
|
||||
scan_str (const char *s1, const char *s2)
|
||||
{
|
||||
while (*s1)
|
||||
{
|
||||
const char *p = s2;
|
||||
|
||||
while (*p)
|
||||
{
|
||||
if (*s1 == *p)
|
||||
return s1;
|
||||
p++;
|
||||
}
|
||||
|
||||
s1++;
|
||||
}
|
||||
|
||||
return s1;
|
||||
}
|
||||
|
||||
int
|
||||
strcspn (const char *s1, const char *s2)
|
||||
{
|
||||
const char *r;
|
||||
|
||||
r = scan_str (s1, s2);
|
||||
return r - s1;
|
||||
}
|
||||
|
||||
char *
|
||||
strpbrk (const char *s1, const char *s2)
|
||||
{
|
||||
const char *r;
|
||||
|
||||
r = scan_str (s1, s2);
|
||||
return (*r) ? (char *) r : 0;
|
||||
}
|
||||
|
||||
void *
|
||||
memchr (const void *s, int c, size_t n)
|
||||
{
|
||||
const unsigned char *p = s;
|
||||
|
||||
while (n)
|
||||
{
|
||||
if (*p == c)
|
||||
return (void *) p;
|
||||
|
||||
n--;
|
||||
p++;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static lua_State *state;
|
||||
|
||||
/* Call `grub_error' to report a Lua error. The error message string must be
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue