vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/fs/proc.c: Allow \0 in proc files.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-11-12 15:57:09 +01:00
parent ba82db7a0d
commit 3bbeade41d
5 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-11-12 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/proc.c: Allow \0 in proc files.
2013-11-12 Vladimir Serbinenko <phcoder@gmail.com> 2013-11-12 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/tests/xnu_uuid_test.c: Fix assert message. * grub-core/tests/xnu_uuid_test.c: Fix assert message.

5
grub-core/fs/proc.c
View file

@ -128,10 +128,11 @@ grub_procfs_open (struct grub_file *file, const char *path)
FOR_LIST_ELEMENTS((entry), (grub_procfs_entries)) FOR_LIST_ELEMENTS((entry), (grub_procfs_entries))
if (grub_strcmp (pathptr, entry->name) == 0) if (grub_strcmp (pathptr, entry->name) == 0)
{ {
file->data = entry->get_contents (); grub_size_t sz;
file->data = entry->get_contents (&sz);
if (!file->data) if (!file->data)
return grub_errno; return grub_errno;
file->size = grub_strlen (file->data); file->size = sz;
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }

3
grub-core/tests/cmdline_cat_test.c
View file

@ -54,8 +54,9 @@ static const char testfile[] =
; ;
static char * static char *
get_test_txt (void) get_test_txt (grub_size_t *sz)
{ {
*sz = grub_strlen (testfile);
return grub_strdup (testfile); return grub_strdup (testfile);
} }

3
grub-core/tests/gfxterm_menu.c
View file

@ -57,8 +57,9 @@ static const char testfile[] =
"timeout=3\n"; "timeout=3\n";
static char * static char *
get_test_cfg (void) get_test_cfg (grub_size_t *sz)
{ {
*sz = grub_strlen (testfile);
return grub_strdup (testfile); return grub_strdup (testfile);
} }

2
include/grub/procfs.h
View file

@ -27,7 +27,7 @@ struct grub_procfs_entry
struct grub_procfs_entry **prev; struct grub_procfs_entry **prev;
const char *name; const char *name;
char * (*get_contents) (void); char * (*get_contents) (grub_size_t *sz);
}; };
extern struct grub_procfs_entry *grub_procfs_entries; extern struct grub_procfs_entry *grub_procfs_entries;