Binary release v2.74.2

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2019, 2020, 2021 mintsuki and contributors.
+Copyright 2019, 2020, 2021, 2022 mintsuki and contributors.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

Makefile

@@ -1,31 +1,29 @@
-CC = cc
+CC ?= cc
 
-PREFIX = /usr/local
-DESTDIR =
+PREFIX ?= /usr/local
+DESTDIR ?=
 
-BUILDDIR = .
-LIMINE_HDD_BIN = limine-hdd.bin
+CFLAGS ?= -O2 -pipe -Wall -Wextra
 
-CFLAGS = -O2 -pipe -Wall -Wextra
-
-.PHONY: all install clean
-
-all: $(BUILDDIR)/limine-install
+.PHONY: all
+all: limine-install
 
+.PHONY: install
 install: all
-	install -d "$(DESTDIR)$(PREFIX)/bin"
-	install -s "$(BUILDDIR)/limine-install" "$(DESTDIR)$(PREFIX)/bin/"
-	install -d "$(DESTDIR)$(PREFIX)/share"
-	install -d "$(DESTDIR)$(PREFIX)/share/limine"
-	install -m 644 limine.sys "$(DESTDIR)$(PREFIX)/share/limine/"
-	install -m 644 limine-cd.bin "$(DESTDIR)$(PREFIX)/share/limine/"
-	install -m 644 limine-eltorito-efi.bin "$(DESTDIR)$(PREFIX)/share/limine/"
-	install -m 644 limine-pxe.bin "$(DESTDIR)$(PREFIX)/share/limine/"
-	install -m 644 BOOTX64.EFI "$(DESTDIR)$(PREFIX)/share/limine/"
-	install -m 644 BOOTIA32.EFI "$(DESTDIR)$(PREFIX)/share/limine/"
+	install -d '$(DESTDIR)$(PREFIX)/bin'
+	install -s limine-install '$(DESTDIR)$(PREFIX)/bin/'
+	install -d '$(DESTDIR)$(PREFIX)/share'
+	install -d '$(DESTDIR)$(PREFIX)/share/limine'
+	install -m 644 limine.sys '$(DESTDIR)$(PREFIX)/share/limine/'
+	install -m 644 limine-cd.bin '$(DESTDIR)$(PREFIX)/share/limine/'
+	install -m 644 limine-eltorito-efi.bin '$(DESTDIR)$(PREFIX)/share/limine/'
+	install -m 644 limine-pxe.bin '$(DESTDIR)$(PREFIX)/share/limine/'
+	install -m 644 BOOTX64.EFI '$(DESTDIR)$(PREFIX)/share/limine/'
+	install -m 644 BOOTIA32.EFI '$(DESTDIR)$(PREFIX)/share/limine/'
 
+.PHONY: clean
 clean:
-	rm -f "$(BUILDDIR)/limine-install" "$(BUILDDIR)/limine-install.exe"
+	rm -f limine-install limine-install.exe
 
-$(BUILDDIR)/limine-install: limine-install.c inc.S $(LIMINE_HDD_BIN)
-	$(CC) $(CFLAGS) -std=c11 -DLIMINE_HDD_BIN='"$(LIMINE_HDD_BIN)"' limine-install.c inc.S -o "$@"
+limine-install: limine-install.c inc.S limine-hdd.bin
+	$(CC) $(CFLAGS) -std=c11 limine-install.c inc.S -o $@

inc.S

@@ -4,7 +4,7 @@
 .data
 .global __binary_limine_hdd_bin_start
 __binary_limine_hdd_bin_start:
-    .incbin LIMINE_HDD_BIN
+    .incbin "limine-hdd.bin"
 .global __binary_limine_hdd_bin_end
 __binary_limine_hdd_bin_end:
 
@@ -13,7 +13,7 @@ __binary_limine_hdd_bin_end:
 .section .data
 .global __binary_limine_hdd_bin_start
 __binary_limine_hdd_bin_start:
-    .incbin LIMINE_HDD_BIN
+    .incbin "limine-hdd.bin"
 .global __binary_limine_hdd_bin_end
 __binary_limine_hdd_bin_end:
 
@@ -26,7 +26,7 @@ __binary_limine_hdd_bin_end:
 .section .data
 .global _binary_limine_hdd_bin_start
 _binary_limine_hdd_bin_start:
-    .incbin LIMINE_HDD_BIN
+    .incbin "limine-hdd.bin"
 .global _binary_limine_hdd_bin_end
 _binary_limine_hdd_bin_end:
 

limine-install.c

@@ -10,6 +10,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
 #define DIV_ROUNDUP(a, b) (((a) + ((b) - 1)) / (b))
 
 struct gpt_table_header {
@@ -287,7 +291,7 @@ int main(int argc, char *argv[]) {
         }
     }
 
-    device = open(argv[1], O_RDWR);
+    device = open(argv[1], O_RDWR | O_BINARY);
     if (device == -1) {
         perror("ERROR");
         goto cleanup;
@@ -455,7 +459,7 @@ int main(int argc, char *argv[]) {
     uint64_t stage2_loc_b = stage2_loc_a + stage2_size_a;
 
     if (gpt) {
-        if (argc > 3) {
+        if (argc >= 3) {
             uint32_t partition_num;
             sscanf(argv[2], "%" SCNu32, &partition_num);
             partition_num--;