tailix
/
libkernaux
mirror of https://github.com/tailix/libkernaux.git
1
0
Fork 0
Code Releases Activity

Fix struct KernAux_Multiboot2_Tag_BootCmdLine

This commit is contained in:
Alex Kotov 2022-01-11 14:10:16 +05:00
parent 6ce8ab0e97
commit 949c43436e
Signed by: kotovalexarian
GPG Key ID: 553C0EBBEB5D5F08
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/kernaux/multiboot2.h
View File

@ -5,10 +5,13 @@
extern "C" {
#endif
#include <stdint.h>
#include <stdbool.h>
#define KERNAUX_MULTIBOOT2_MAGIC 0x36d76289
#define KERNAUX_MULTIBOOT2_TAG_DATA(tag) (((uint8_t*)(tag)) + sizeof(*(tag)))
/****************
* Common types *
****************/
@ -67,8 +70,6 @@ struct KernAux_Multiboot2_Tag_BootCmdLine {
// type = 1
// size = ?
struct KernAux_Multiboot2_TagBase base;
char cmdline[];
}
__attribute__((packed));

2
src/multiboot2/helpers.c
View File

@ -63,5 +63,5 @@ const char *KernAux_Multiboot2_boot_cmd_line(
if (!tag) return NULL;
return tag->cmdline;
return (char*)KERNAUX_MULTIBOOT2_TAG_DATA(tag);
}

2
src/multiboot2/is_valid.c
View File

@ -162,7 +162,7 @@ bool KernAux_Multiboot2_Tag_BootCmdLine_is_valid(
size_t index = 1;
for (
const char *ptr = tag->cmdline;
const char *ptr = (char*)KERNAUX_MULTIBOOT2_TAG_DATA(tag);
*ptr && index < tag->base.size;
++ptr
) {

4
src/multiboot2/print.c
View File

@ -120,7 +120,9 @@ void KernAux_Multiboot2_TagBase_print(
case KERNAUX_MULTIBOOT2_TAGTYPE_BOOT_CMD_LINE:
printf(
" cmdline: %s\n",
((struct KernAux_Multiboot2_Tag_BootCmdLine*)tag_base)->cmdline
KERNAUX_MULTIBOOT2_TAG_DATA(
(struct KernAux_Multiboot2_Tag_BootCmdLine*)tag_base
)
);
break;
case KERNAUX_MULTIBOOT2_TAGTYPE_BOOT_LOADER_NAME: