 @@ -1,14 +1,14 @@
-/*	$NetBSD: gpt.c,v 1.10 2019/08/14 13:02:23 martin Exp $	*/
+/*	$NetBSD: gpt.c,v 1.11 2019/08/26 12:14:06 martin Exp $	*/
 /*
  * Copyright 2018 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.
 @@ -1121,27 +1121,27 @@ gpt_modify_part(const char *disk, struct
 	strcpy(p->gp_id, old.gp_id);
 	/* Check type */
 	if (p->gp_type != old.gp_type) {
 		if (run_program(RUN_SILENT,
 		    "gpt label -b %" PRIu64 " -T %s %s",
 		    p->gp_start, p->gp_type->tid, disk) != 0)
 			return false;
+	}
 	/* Check label */
 	if (strcmp(p->gp_label, old.gp_label) != 0) {
 		if (run_program(RUN_SILENT,
-		    "gpt label -b %" PRIu64 " -l %s %s",
+		    "gpt label -b %" PRIu64 " -l \'%s\' %s",
 		    p->gp_start, p->gp_label, disk) != 0)
 			return false;
+	}
 	/* Check attributes */
 	if (p->gp_attr != old.gp_attr) {
 		if (p->gp_attr == 0) {
 			if (run_program(RUN_SILENT,
 			    "gpt set -N -b %" PRIu64 " %s",
 			    p->gp_start, disk) != 0)
 				return false;
 		} else {
 			todo_set = (p->gp_attr ^ old.gp_attr) & p->gp_attr;
 @@ -1203,58 +1203,75 @@ gpt_add_wedge(const char *disk, struct g
 	if (fd < 0)
 		return false;
 	if (ioctl(fd, DIOCAWEDGE, &dkw) == -1) {
 		close(fd);
 		return false;
+	}
 	close(fd);
 	strlcpy(p->gp_dev_name, dkw.dkw_devname, sizeof(p->gp_dev_name));
 	p->gp_flags |= GPEF_WEDGE;
 	return true;
+}
 static void
 escape_spaces(char *dest, const char *src)
+{
 	unsigned char c;
 	while (*src) {
 		c = *src++;
 		if (isspace(c) || c == '\\')
 			*dest++ = '\\';
 		*dest++ = c;
+	}
 	*dest = 0;
+}
 static bool
 gpt_get_part_device(const struct disk_partitions *arg,
     part_id id, char *devname, size_t max_devname_len, int *part,
     enum dev_name_usage usage, bool with_path)
+{
 	const struct gpt_disk_partitions *parts =
 	    (const struct gpt_disk_partitions*)arg;
 	struct  gpt_part_entry *p = parts->partitions;
 	char tmpname[GPT_LABEL_LEN*2];
 	part_id no;
 	for (no = 0; p != NULL && no < id; no++)
 		p = p->gp_next;
 	if (no != id || p == NULL)
 		return false;
 	if (part)
 		*part = -1;
 	if (!(p->gp_flags & GPEF_WEDGE) &&
 	    (usage == plain_name || usage == raw_dev_name))
 		gpt_add_wedge(arg->disk, p);
 	switch (usage) {
 	case logical_name:
-		if (p->gp_label[0] != 0)
+		if (p->gp_label[0] != 0) {
 			escape_spaces(tmpname, p->gp_label);
 			snprintf(devname, max_devname_len,
-			    "NAME=%s", p->gp_label);
+			    "NAME=%s", tmpname);
-		else
+		} else {
 			snprintf(devname, max_devname_len,
 			    "NAME=%s", p->gp_id);
+		}
 		break;
 	case plain_name:
 		assert(p->gp_flags & GPEF_WEDGE);
 		if (with_path)
 			snprintf(devname, max_devname_len, _PATH_DEV "%s",
 			    p->gp_dev_name);
 		else
 			strlcpy(devname, p->gp_dev_name, max_devname_len);
 		break;
 	case raw_dev_name:
 		assert(p->gp_flags & GPEF_WEDGE);
 		if (with_path)
 			snprintf(devname, max_devname_len, _PATH_DEV "r%s",
 @@ -1265,51 +1282,49 @@ gpt_get_part_device(const struct disk_pa
 		break;
 	default:
 		return false;
+	}
 	return true;
+}
 static bool
 gpt_write_to_disk(struct disk_partitions *arg)
+{
 	struct gpt_disk_partitions *parts = (struct gpt_disk_partitions*)arg;
 	struct gpt_part_entry *p, *n;
-	char label_arg[sizeof(p->gp_label) + 4];
+	char label_arg[sizeof(p->gp_label) + 10];
 	char diskpath[MAXPATHLEN];
 	int fd, bits = 0;
 	bool root_is_new = false, efi_is_new = false;
 	part_id root_id = NO_PART, efi_id = NO_PART, pno;
 	/*
 	 * Remove all wedges on this disk - they may become invalid and we
 	 * have no easy way to associate them with the partitioning data.
 	 * Instead we will explicitly request creation of wedges on demand
 	 * later.
 	 */
 	fd = opendisk(arg->disk, O_RDWR, diskpath, sizeof(diskpath), 0);
 	if (fd < 0)
 		return false;
 	if (ioctl(fd, DIOCRMWEDGES, &bits) == -1)
 		return false;
 	close(fd);
 	/*
-	 * Mark all partitions as "have no wedge yet". While there,
+	 * Collect first root and efi partition (if available)
 	 * collect first root and efi partition (if available)
 	 */
 	for (pno = 0, p = parts->partitions; p != NULL; p = p->gp_next, pno++) {
 		p->gp_flags &= ~GPEF_WEDGE;
 		if (root_id == NO_PART && p->gp_type != NULL) {
 			if (p->gp_type->gent.generic_ptype == PT_root &&
 			    p->gp_start == pm->ptstart) {
 				root_id = pno;
 				root_is_new = !(p->gp_flags & GPEF_ON_DISK);
 			} else if (efi_id == NO_PART &&
 			    p->gp_type->gent.generic_ptype == PT_EFI_SYSTEM) {
 				efi_id = pno;
 				efi_is_new = !(p->gp_flags & GPEF_ON_DISK);
+			}
+		}
+	}
 @@ -1363,27 +1378,27 @@ gpt_write_to_disk(struct disk_partitions
 	/*
 	 * Add new partitions
 	 */
 	for (p = parts->partitions; p != NULL; p = p->gp_next) {
 		if (p->gp_flags & GPEF_ON_DISK)
 			continue;
 		if (!(p->gp_flags & GPEF_MODIFIED))
 			continue;
 		if (p->gp_label[0] == 0)
 			label_arg[0] = 0;
 		else
-			sprintf(label_arg, "-l %s", p->gp_label);
+			sprintf(label_arg, "-l \'%s\'", p->gp_label);
 		if (p->gp_type != NULL)
 			run_program(RUN_SILENT,
 			    "gpt -n add -b %" PRIu64 " -s %" PRIu64
 			    "s -t %s %s %s",
 			    p->gp_start, p->gp_size, p->gp_type->tid,
 			    label_arg, arg->disk);
 		else
 			run_program(RUN_SILENT,
 			    "gpt -n add -b %" PRIu64 " -s %" PRIu64
 			    "s %s %s",
 			    p->gp_start, p->gp_size, label_arg, arg->disk);
 		gpt_apply_attr(arg->disk, "set", p->gp_start, p->gp_attr);