From 3640957b38bc623785f446efcf9abde23a1ab1b3 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Fri, 28 Feb 2003 18:24:58 +0000
Subject: [PATCH] If the NetBSD version note looks reasonable, parse it and
 display the info.

---
 dist/file/readelf.c    | 51 ++++++++++++++++++++++++++++++++++++++----
 usr.bin/file/readelf.c | 51 ++++++++++++++++++++++++++++++++++++++----
 2 files changed, 94 insertions(+), 8 deletions(-)

diff --git a/dist/file/readelf.c b/dist/file/readelf.c
index 4b8e33ae492c..6b5d3f41baa7 100644
--- a/dist/file/readelf.c
+++ b/dist/file/readelf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: readelf.c,v 1.1.1.1 2003/02/23 23:08:26 pooka Exp $	*/
+/*	$NetBSD: readelf.c,v 1.2 2003/02/28 18:25:09 thorpej Exp $	*/
 
 #include "file.h"
 
@@ -16,7 +16,7 @@
 #if 0
 FILE_RCSID("@(#)Id: readelf.c,v 1.23 2003/02/08 18:33:53 christos Exp ")
 #else
-__RCSID("$NetBSD: readelf.c,v 1.1.1.1 2003/02/23 23:08:26 pooka Exp $");
+__RCSID("$NetBSD: readelf.c,v 1.2 2003/02/28 18:25:09 thorpej Exp $");
 #endif
 #endif
 
@@ -257,11 +257,54 @@ dophn_exec(int class, int swap, int fd, off_t off, int num, size_t size)
 				    strcmp(&nbuf[nameoffset], "NetBSD") == 0 &&
 				    nh_type == NT_NETBSD_VERSION &&
 				    nh_descsz == 4) {
+					uint32_t desc = getu32(swap,
+					    *(uint32_t *)&nbuf[offset]);
+
 					printf(", for NetBSD");
 					/*
-					 * Version number is stuck at 199905,
-					 * and hence is basically content-free.
+					 * The version number used to be
+					 * stuck as 199906, and was thus
+					 * basically content-free.  Newer
+					 * versions of NetBSD have fixed
+					 * this, however, and now use the
+					 * encoding of __NetBSD_Version__:
+					 *
+					 *	MMmmrrpp00
+					 *
+					 * M = major version
+					 * m = minor version
+					 * r = release ["",A-Z,Z[A-Z] but
+					 *     numeric]
+					 * p = patchlevel
 					 */
+					if (desc > 100000000U) {
+						u_int ver_patch =
+						    (desc / 100) % 100;
+						u_int ver_rel =
+						    (desc / 10000) % 100;
+						u_int ver_min =
+						    (desc / 1000000) % 100;
+						u_int ver_maj =
+						    desc / 100000000;
+
+						printf(" %u.%u", ver_maj,
+						    ver_min);
+						if (ver_rel == 0 &&
+						    ver_patch != 0) {
+							printf(".%u",
+							    ver_patch);
+						} else if (ver_rel != 0 &&
+							   ver_rel <= 26) {
+							printf("%c",
+							    'A' + ver_rel - 1);
+						} else if (ver_rel != 0 &&
+							   ver_rel <= 52) {
+							printf("Z%c",
+							    'A' + ver_rel - 1);
+						} else if (ver_rel != 0) {
+							printf("<unknown>");
+						}
+					}
 				}
 
 				if (nh_namesz == 8 &&
diff --git a/usr.bin/file/readelf.c b/usr.bin/file/readelf.c
index 3c228f74eb39..82225d465202 100644
--- a/usr.bin/file/readelf.c
+++ b/usr.bin/file/readelf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: readelf.c,v 1.17 2003/02/26 18:36:24 christos Exp $	*/
+/*	$NetBSD: readelf.c,v 1.18 2003/02/28 18:24:58 thorpej Exp $	*/
 
 #include "file.h"
 
@@ -17,7 +17,7 @@
 #if 0
 FILE_RCSID("@(#)Id: readelf.c,v 1.22 2002/07/03 18:26:38 christos Exp ")
 #else
-__RCSID("$NetBSD: readelf.c,v 1.17 2003/02/26 18:36:24 christos Exp $");
+__RCSID("$NetBSD: readelf.c,v 1.18 2003/02/28 18:24:58 thorpej Exp $");
 #endif
 #endif
 
@@ -256,11 +256,54 @@ dophn_exec(int class, int swap, int fd, off_t off, int num, size_t size)
 				    strcmp(&nbuf[nameoffset], "NetBSD") == 0 &&
 				    nh_type == NT_NETBSD_VERSION &&
 				    nh_descsz == 4) {
+					uint32_t desc = getu32(swap,
+					    *(uint32_t *)&nbuf[offset]);
+
 					printf(", for NetBSD");
 					/*
-					 * Version number is stuck at 199905,
-					 * and hence is basically content-free.
+					 * The version number used to be
+					 * stuck as 199906, and was thus
+					 * basically content-free.  Newer
+					 * versions of NetBSD have fixed
+					 * this, however, and now use the
+					 * encoding of __NetBSD_Version__:
+					 *
+					 *	MMmmrrpp00
+					 *
+					 * M = major version
+					 * m = minor version
+					 * r = release ["",A-Z,Z[A-Z] but
+					 *     numeric]
+					 * p = patchlevel
 					 */
+					if (desc > 100000000U) {
+						u_int ver_patch =
+						    (desc / 100) % 100;
+						u_int ver_rel =
+						    (desc / 10000) % 100;
+						u_int ver_min =
+						    (desc / 1000000) % 100;
+						u_int ver_maj =
+						    desc / 100000000;
+
+						printf(" %u.%u", ver_maj,
+						    ver_min);
+						if (ver_rel == 0 &&
+						    ver_patch != 0) {
+							printf(".%u",
+							    ver_patch);
+						} else if (ver_rel != 0 &&
+							   ver_rel <= 26) {
+							printf("%c",
+							    'A' + ver_rel - 1);
+						} else if (ver_rel != 0 &&
+							   ver_rel <= 52) {
+							printf("Z%c",
+							    'A' + ver_rel - 1);
+						} else if (ver_rel != 0) {
+							printf("<unknown>");
+						}
+					}
 				}
 
 				if (nh_namesz == 8 &&