From d08ea721a5b11c5a032c7d5982b28a4bc6b3459a Mon Sep 17 00:00:00 2001 From: mintsuki Date: Tue, 20 Jun 2023 10:19:01 +0200 Subject: [PATCH] limine.c: Add copyright and license information to version command --- GNUmakefile.in | 2 +- host/limine.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index 30fdab46..5c76c96f 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -120,7 +120,7 @@ override LIMINE_NO_BIOS := -DLIMINE_NO_BIOS $(call MKESCAPE,$(BINDIR))/limine: $(call MKESCAPE,$(BINDIR))/Makefile $(call MKESCAPE,$(SRCDIR))/host/limine.c endif - $(SED) 's/@LIMINE_VERSION@/@PACKAGE_VERSION@/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 $(call MKESCAPE,$(BINDIR))/Makefile: $(call MKESCAPE,$(SRCDIR))/host/Makefile $(call MKESCAPE,$(SRCDIR))/host/.gitignore diff --git a/host/limine.c b/host/limine.c index da741a8f..d8a1baa1 100644 --- a/host/limine.c +++ b/host/limine.c @@ -1120,10 +1120,14 @@ cleanup: return ret; } -#define LIMINE_VERSION "@LIMINE_VERSION@" +#define LIMINE_VERSION "%VERSION%" +#define LIMINE_COPYRIGHT "%COPYRIGHT%" static int version(void) { - puts(LIMINE_VERSION); + puts("Limine " LIMINE_VERSION); + puts(LIMINE_COPYRIGHT); + puts("Limine is distributed under the terms of the BSD-2-Clause license."); + puts("There is ABSOLUTELY NO WARRANTY, to the extent permitted by law."); return EXIT_SUCCESS; } @@ -1153,7 +1157,8 @@ int main(int argc, char *argv[]) { #endif } else if (strcmp(argv[1], "enroll-config") == 0) { return enroll_config(argc - 1, &argv[1]); - } else if (strcmp(argv[1], "version") == 0) { + } else if (strcmp(argv[1], "version") == 0 + || strcmp(argv[1], "--version") == 0) { return version(); }