Re: 9.99.100 fallout: file(1)

[mlelstv%serpens.de@localhost (Michael van Elst)]

campbell+netbsd-tech-kern%mumble.net@localhost (Taylor R Campbell) writes:

>We appear to have revived the old alphanumeric versioning scheme,
>according to file(1)!  Someone needs to teach file(1) that this is
>9.99.100, not 9.99A(.0).

Index: external/bsd/file/dist/src/readelf.c
===================================================================
RCS file: /cvsroot/src/external/bsd/file/dist/src/readelf.c,v
retrieving revision 1.25
diff -p -u -r1.25 readelf.c
--- external/bsd/file/dist/src/readelf.c	9 Apr 2021 19:11:42 -0000	1.25
+++ external/bsd/file/dist/src/readelf.c	21 Sep 2022 19:32:32 -0000
@@ -456,7 +456,11 @@ do_note_netbsd_version(struct magic_set 
 
 		if (file_printf(ms, " %u.%u", ver_maj, ver_min) == -1)
 			return -1;
-		if (ver_rel == 0 && ver_patch != 0) {
+		if (ver_maj >= 9) {
+			ver_patch += 100 * ver_rel;
+			if (file_printf(ms, ".%u", ver_patch) == -1)
+				return -1;
+		} else if (ver_rel == 0 && ver_patch != 0) {
 			if (file_printf(ms, ".%u", ver_patch) == -1)
 				return -1;
 		} else if (ver_rel != 0) {

% file /bin/ls
/bin/ls: ELF 64-bit LSB pie executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /libexec/ld.elf_so, for NetBSD 9.99.100, not stripped