a4e7e54 osversion: set the string value when actually determining it. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

osversion: set the string value when actually determining it.

Baptiste Daroussin committed 1 year ago

commit a4e7e544f9e6851a55d500d933148c84d33f9ac4
parent da2358f

2 files changed +3 -2

modified libpkg/pkg_config.c

@@ -1117,7 +1117,6 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)

 	}
 #ifdef __FreeBSD__
 	ctx.osversion = oi.osversion;
 	snprintf(oi.str_osversion, sizeof(oi.str_osversion), "%d", oi.osversion);
 #endif
 	if (parsed != false) {
 		pkg_emit_error("pkg_init() must only be called once");

modified libpkg/pkg_elf.c

@@ -700,8 +700,10 @@ elf_note_analyse(Elf_Data *data, GElf_Ehdr *elfhdr, struct os_info *oi)

 		xasprintf(&oi->version, "%d.%d.%d", gnu_abi_tag[1],
 		    gnu_abi_tag[2], gnu_abi_tag[3]);
 	} else {
 		if (oi->osversion == 0)
 		if (oi->osversion == 0) {
 			oi->osversion = version;
 			snprintf(oi->str_osversion, sizeof(oi->str_osversion), "%d", version);
 		}
 #ifdef __DragonFly__
 		xasprintf(&oi->version, "%d.%d", version / 100000, (((version / 100 % 1000)+1)/2)*2);
 #endif