mirrors/limine
1
0
Fork 0
mirror of https://github.com/limine-bootloader/limine synced 2024-11-27 02:49:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

host/limine: Add --print-datadir switch

Browse Source
This commit is contained in:
mintsuki 2023-12-13 12:13:16 +01:00
parent d7692741a4
commit 8824f096e3
2 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile.in
View File

@ -124,7 +124,7 @@ override LIMINE_NO_BIOS := -DLIMINE_NO_BIOS
$(call MKESCAPE,$(BINDIR))/limine: $(call MKESCAPE,$(BINDIR))/Makefile $(call MKESCAPE,$(SRCDIR))/host/limine.c $(call MKESCAPE,$(BINDIR))/limine: $(call MKESCAPE,$(BINDIR))/Makefile $(call MKESCAPE,$(SRCDIR))/host/limine.c
endif endif
$(SED) 's/%VERSION%/@PACKAGE_VERSION@/g;s/%COPYRIGHT%/@LIMINE_COPYRIGHT@/g' <'$(call SHESCAPE,$(SRCDIR))/host/limine.c' >'$(call SHESCAPE,$(BINDIR))/limine.c' $(SED) 's/%VERSION%/@PACKAGE_VERSION@/g;s/%COPYRIGHT%/@LIMINE_COPYRIGHT@/g' <'$(call SHESCAPE,$(SRCDIR))/host/limine.c' >'$(call SHESCAPE,$(BINDIR))/limine.c'
CPPFLAGS="$(CPPFLAGS) $(LIMINE_NO_BIOS)" $(MAKE) -C '$(call SHESCAPE,$(BINDIR))' limine CPPFLAGS='$(CPPFLAGS) $(LIMINE_NO_BIOS) -DLIMINE_DATADIR=\"$(call SHESCAPE,$(datarootdir))/limine\"' $(MAKE) -C '$(call SHESCAPE,$(BINDIR))' limine
$(call MKESCAPE,$(BINDIR))/Makefile: $(call MKESCAPE,$(SRCDIR))/host/Makefile $(call MKESCAPE,$(SRCDIR))/host/.gitignore $(call MKESCAPE,$(BINDIR))/Makefile: $(call MKESCAPE,$(SRCDIR))/host/Makefile $(call MKESCAPE,$(SRCDIR))/host/.gitignore
mkdir -p '$(call SHESCAPE,$(BINDIR))' mkdir -p '$(call SHESCAPE,$(BINDIR))'

45
host/limine.c
View File

@ -18,7 +18,7 @@
#include "limine-bios-hdd.h" #include "limine-bios-hdd.h"
#endif #endif
static const char *program_name = NULL; static char *program_name = NULL;
static void perror_wrap(const char *fmt, ...) { static void perror_wrap(const char *fmt, ...) {
int old_errno = errno; int old_errno = errno;
@ -1157,7 +1157,46 @@ static int version(void) {
static void general_usage(void) { static void general_usage(void) {
printf("usage: %s <command> <args...>\n", program_name); printf("usage: %s <command> <args...>\n", program_name);
printf("\n"); printf("\n");
printf("Valid commands: help, version, bios-install, enroll-config\n"); printf(" --print-datadir Print the directory containing the bootloader files\n");
printf("\n");
printf(" --version Print Limine version (like `version` command)\n");
printf("\n");
printf(" --help | -h Display this help message\n");
printf("\n");
printf("Commands: help, version, bios-install, enroll-config\n");
printf("Use `--help` after specifying the command for command-specific help.\n");
}
static int print_datadir(void) {
#ifdef LIMINE_DATADIR
puts(LIMINE_DATADIR);
return EXIT_SUCCESS;
#else
if (program_name == NULL || strlen(program_name) == 0) {
goto fail;
}
for (size_t i = strlen(program_name) - 1; ; i--) {
#if IS_WINDOWS
if (program_name[i] == '\\')
#else
if (program_name[i] == '/')
#endif
{
program_name[i + 1] = 0;
puts(program_name);
return EXIT_SUCCESS;
}
if (i == 0) {
goto fail;
}
}
fail:
fprintf(stderr, "%s: error: Could not determine datadir path.\n", program_name);
return EXIT_FAILURE;
#endif
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
@ -1182,6 +1221,8 @@ int main(int argc, char *argv[]) {
#endif #endif
} else if (strcmp(argv[1], "enroll-config") == 0) { } else if (strcmp(argv[1], "enroll-config") == 0) {
return enroll_config(argc - 1, &argv[1]); return enroll_config(argc - 1, &argv[1]);
} else if (strcmp(argv[1], "--print-datadir") == 0) {
return print_datadir();
} else if (strcmp(argv[1], "version") == 0 } else if (strcmp(argv[1], "version") == 0
|| strcmp(argv[1], "--version") == 0) { || strcmp(argv[1], "--version") == 0) {
return version(); return version();