Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If the NetBSD version note looks reasonable, parse it and display the 

info.
This commit is contained in:
thorpej 2003-02-28 18:24:58 +00:00
parent 527c1efca7
commit 3640957b38
2 changed files with 94 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
dist/file/readelf.c vendored
View File

@ -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" #include "file.h"
@ -16,7 +16,7 @@
#if 0 #if 0
FILE_RCSID("@(#)Id: readelf.c,v 1.23 2003/02/08 18:33:53 christos Exp ") FILE_RCSID("@(#)Id: readelf.c,v 1.23 2003/02/08 18:33:53 christos Exp ")
#else #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
#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 && strcmp(&nbuf[nameoffset], "NetBSD") == 0 &&
nh_type == NT_NETBSD_VERSION && nh_type == NT_NETBSD_VERSION &&
nh_descsz == 4) { nh_descsz == 4) {
uint32_t desc = getu32(swap,
*(uint32_t *)&nbuf[offset]);
printf(", for NetBSD"); printf(", for NetBSD");
/* /*
* Version number is stuck at 199905, * The version number used to be
* and hence is basically content-free. * 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 && if (nh_namesz == 8 &&

51
usr.bin/file/readelf.c
View File

@ -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" #include "file.h"
@ -17,7 +17,7 @@
#if 0 #if 0
FILE_RCSID("@(#)Id: readelf.c,v 1.22 2002/07/03 18:26:38 christos Exp ") FILE_RCSID("@(#)Id: readelf.c,v 1.22 2002/07/03 18:26:38 christos Exp ")
#else #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
#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 && strcmp(&nbuf[nameoffset], "NetBSD") == 0 &&
nh_type == NT_NETBSD_VERSION && nh_type == NT_NETBSD_VERSION &&
nh_descsz == 4) { nh_descsz == 4) {
uint32_t desc = getu32(swap,
*(uint32_t *)&nbuf[offset]);
printf(", for NetBSD"); printf(", for NetBSD");
/* /*
* Version number is stuck at 199905, * The version number used to be
* and hence is basically content-free. * 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 && if (nh_namesz == 8 &&