 @@ -1,14 +1,14 @@
-/*	$NetBSD: gpt_uuid.c,v 1.16 2018/11/06 04:04:33 mrg Exp $	*/
+/*	$NetBSD: gpt_uuid.c,v 1.17 2018/12/20 14:58:10 martin Exp $	*/
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,27 +22,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #ifdef __RCSID
-__RCSID("$NetBSD: gpt_uuid.c,v 1.16 2018/11/06 04:04:33 mrg Exp $");
+__RCSID("$NetBSD: gpt_uuid.c,v 1.17 2018/12/20 14:58:10 martin Exp $");
 #endif
 #include <err.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
 #include "map.h"
 #include "gpt.h"
 #include "gpt_private.h"
 #if defined(HAVE_SYS_ENDIAN_H) || ! defined(HAVE_NBTOOL_CONFIG_H)
 #include <sys/endian.h>
 @@ -77,29 +77,29 @@ static const struct {
 	{ GPT_ENT_TYPE_LINUX_DATA, "linux-data", "Linux data" },
 	{ GPT_ENT_TYPE_LINUX_RAID, "linux-raid", "Linux RAID" },
 	{ GPT_ENT_TYPE_LINUX_SWAP, "linux-swap", "Linux swap" },
 	{ GPT_ENT_TYPE_LINUX_LVM, "linux-lvm", "Linux LVM" },
 	{ GPT_ENT_TYPE_MS_BASIC_DATA, "windows", "Windows basic data" },
 	{ GPT_ENT_TYPE_MS_RESERVED, "windows-reserved", "Windows reserved" },
 	{ GPT_ENT_TYPE_NETBSD_CCD, "ccd", "NetBSD ccd component" },
 	{ GPT_ENT_TYPE_NETBSD_CGD, "cgd", "NetBSD Cryptographic Disk" },
 	{ GPT_ENT_TYPE_NETBSD_FFS, "ffs", "NetBSD FFSv1/FFSv2" },
 	{ GPT_ENT_TYPE_NETBSD_LFS, "lfs", "NetBSD LFS" },
 	{ GPT_ENT_TYPE_NETBSD_RAIDFRAME, "raid",
 	    "NetBSD RAIDFrame component" },
 	{ GPT_ENT_TYPE_NETBSD_SWAP, "swap", "NetBSD swap" },
-	{ GPT_ENT_TYPE_VMWARE_VMKCORE, "swap", "VMware VMkernel core dump" },
+	{ GPT_ENT_TYPE_VMWARE_VMKCORE, "vmcore", "VMware VMkernel core dump" },
-	{ GPT_ENT_TYPE_VMWARE_VMFS, "swap", "VMware VMFS" },
+	{ GPT_ENT_TYPE_VMWARE_VMFS, "vmfs", "VMware VMFS" },
-	{ GPT_ENT_TYPE_VMWARE_RESERVED, "swap", "VMware reserved" },
+	{ GPT_ENT_TYPE_VMWARE_RESERVED, "vmresered", "VMware reserved" },
 };
 static void
 gpt_uuid_to_dce(const gpt_uuid_t buf, struct dce_uuid *uuid)
+{
 	const uint8_t *p = buf;
 	size_t i;
 	uuid->time_low = le32dec(p);
 	uuid->time_mid = le16dec(p + 4);
 	uuid->time_hi_and_version = le16dec(p + 6);
 	uuid->clock_seq_hi_and_reserved = p[8];
 	uuid->clock_seq_low = p[9];
 @@ -224,26 +224,43 @@ gpt_uuid_parse(const char *s, gpt_uuid_t
 	if (gpt_uuid_parse_numeric(s, &u) != -1) {
 		gpt_dce_to_uuid(&u, uuid);
 		return 0;
+	}
 	if (gpt_uuid_parse_symbolic(s, &u) == -1)
 		return -1;
 	gpt_dce_to_uuid(&u, uuid);
 	return 0;
+}
 size_t
 gpt_uuid_query(
     void (*func)(const char *uuid, const char *short_name, const char *desc))
+{
 	size_t i;
 	char buf[64];
 	if (func != NULL) {
 		for (i = 0; i < __arraycount(gpt_nv); i++) {
 			gpt_uuid_numeric(buf, sizeof(buf), &gpt_nv[i].u);
 			(*func)(buf, gpt_nv[i].n, gpt_nv[i].d);
+		}
+	}
 	return __arraycount(gpt_nv);
+}
 #ifndef GPT_UUID_QUERY_ONLY
 void
 gpt_uuid_help(const char *prefix)
+{
 	size_t i;
 	for (i = 0; i < __arraycount(gpt_nv); i++)
 		printf("%s%18.18s\t%s\n", prefix, gpt_nv[i].n, gpt_nv[i].d);
+}
 void
 gpt_uuid_create(gpt_type_t t, gpt_uuid_t u, uint16_t *b, size_t s)
+{
 	gpt_dce_to_uuid(&gpt_nv[t].u, u);
 @@ -313,13 +330,14 @@ gpt_uuid_generate(gpt_t gpt, gpt_uuid_t
 		return -1;
 	/* Set the version number to 4.  */
 	u.time_hi_and_version &= (uint16_t)~0xf000;
 	u.time_hi_and_version |= 0x4000;
 	/* Fix the reserved bits.  */
 	u.clock_seq_hi_and_reserved &= (uint8_t)~0x40;
 	u.clock_seq_hi_and_reserved |= 0x80;
 	gpt_dce_to_uuid(&u, t);
 	return 0;
+}
 #endif

 @@ -57,27 +57,30 @@ typedef enum {
 	GPT_TYPE_FREEBSD_VINUM,
 	GPT_TYPE_FREEBSD_ZFS,
 	GPT_TYPE_LINUX_DATA,
 	GPT_TYPE_LINUX_SWAP,
 	GPT_TYPE_LINUX_RAID,
 	GPT_TYPE_LINUX_LVM,
 	GPT_TYPE_MS_BASIC_DATA,
 	GPT_TYPE_MS_RESERVED,
 	GPT_TYPE_NETBSD_CCD,
 	GPT_TYPE_NETBSD_CGD,
 	GPT_TYPE_NETBSD_FFS,
 	GPT_TYPE_NETBSD_LFS,
 	GPT_TYPE_NETBSD_RAIDFRAME,
-	GPT_TYPE_NETBSD_SWAP
+	GPT_TYPE_NETBSD_SWAP,
 	GPT_TYPE_VMWARE_VMKCORE,
 	GPT_TYPE_VMWARE_VMFS,
 	GPT_TYPE_VMWARE_RESERVED
 } gpt_type_t;
 typedef uint8_t gpt_uuid_t[16];
 extern const gpt_uuid_t gpt_uuid_nil;
 __BEGIN_DECLS
 static inline int
 gpt_uuid_is_nil(const gpt_uuid_t u) {
 	return memcmp(u, gpt_uuid_nil, sizeof(gpt_uuid_t)) == 0;
+}
 static inline int
 gpt_uuid_equal(const gpt_uuid_t u1, const gpt_uuid_t u2) {
 @@ -88,18 +91,22 @@ static inline void
 gpt_uuid_copy(gpt_uuid_t u1, const gpt_uuid_t u2) {
 	memcpy(u1, u2, sizeof(gpt_uuid_t));
+}
 int gpt_uuid_snprintf(char *, size_t, const char *, const gpt_uuid_t);
 void gpt_uuid_create(gpt_type_t, gpt_uuid_t, uint16_t *, size_t);
 int gpt_uuid_parse(const char *, gpt_uuid_t);
 struct gpt;
 int gpt_uuid_generate(struct gpt *, gpt_uuid_t);
 /* returns number of entries, callback func may be NULL */
 size_t gpt_uuid_query(
     void (*func)(const char *uuid, const char *short_name, const char *desc));
 void gpt_uuid_help(const char *);
 __END_DECLS
 #endif /* _GPT_UUID_T */