 @@ -23,53 +23,53 @@
  * (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 __FBSDID
 __FBSDID("$FreeBSD: src/sbin/gpt/destroy.c,v 1.6 2005/08/31 01:47:19 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: destroy.c,v 1.13 2019/10/16 19:03:53 jnemeth Exp $");
+__RCSID("$NetBSD: destroy.c,v 1.14 2022/11/20 11:57:02 mlelstv Exp $");
 #endif
 #include <sys/types.h>
 #include <err.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "map.h"
 #include "gpt.h"
 #include "gpt_private.h"
 static int cmd_destroy(gpt_t, int, char *[]);
 static const char *destroyhelp[] = {
 	"[-r]",
 };
 struct gpt_cmd c_destroy = {
 	"destroy",
 	cmd_destroy,
 	destroyhelp, __arraycount(destroyhelp),
-	GPT_SYNC,
+	GPT_OPTGPT | GPT_SYNC,
 };
 #define usage() gpt_usage(NULL, &c_destroy)
 static int
 destroy(gpt_t gpt, int force, int recoverable)
+{
 	map_t pri_hdr, sec_hdr, pmbr;
 	pri_hdr = map_find(gpt, MAP_TYPE_PRI_GPT_HDR);
 	sec_hdr = map_find(gpt, MAP_TYPE_SEC_GPT_HDR);
 	pmbr = map_find(gpt, MAP_TYPE_PMBR);

 @@ -25,27 +25,27 @@
+ *
  * CRC32 code derived from work by Gary S. Brown.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.82 2020/05/24 18:42:20 jmcneill Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.83 2022/11/20 11:57:02 mlelstv Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/bootblock.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
 #include <stddef.h>
 @@ -564,28 +564,45 @@ gpt_open(const char *dev, int flags, int
 	if (gpt->verbose) {
 		gpt_msg(gpt, "mediasize=%ju; sectorsize=%u; blocks=%ju",
 		    (uintmax_t)gpt->mediasz, gpt->secsz, (uintmax_t)devsz);
+	}
 	if (map_init(gpt, devsz) == -1)
 		goto close;
 	index = 1;
 	if (gpt_mbr(gpt, 0LL, &index, 0U) == -1)
 		goto close;
 	if ((found = gpt_gpt(gpt, 1LL, 1)) == -1)
 		goto close;
 	if (gpt_gpt(gpt, devsz - 1LL, found) == -1)
-		goto close;
+	if (found) {
 		struct map *map;
 		struct gpt_hdr *hdr;
 		/*
 		 * read secondary GPT from position stored in primary header
 		 * when possible
 		 */
 		map = map_find(gpt, MAP_TYPE_PRI_GPT_HDR);
 		hdr = map ? map->map_data : NULL;
 		if (hdr && hdr->hdr_lba_alt > 0 && hdr->hdr_lba_alt < (uint64_t)devsz) {
 			if (gpt_gpt(gpt, (off_t)hdr->hdr_lba_alt, found) == -1)
 				goto close;
+		}
 	} else {
 		if (gpt_gpt(gpt, devsz - 1LL, found) == -1)
 			goto close;
+	}
 	return gpt;
  close:
 	if (gpt->fd != -1)
 		close(gpt->fd);
 	free(gpt);
 	return NULL;
+}
 void
 gpt_close(gpt_t gpt)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gpt.h,v 1.43 2022/07/16 12:57:14 mlelstv Exp $	*/
+/*	$NetBSD: gpt.h,v 1.44 2022/11/20 11:57:02 mlelstv Exp $	*/
 /*-
  * Copyright (c) 2002 Marcel Moolenaar
  * 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
 @@ -75,26 +75,27 @@ struct gpt_cmd {
 uint32_t crc32(const void *, size_t);
 void	gpt_close(gpt_t);
 int	gpt_gpt(gpt_t, off_t, int);
 gpt_t	gpt_open(const char *, int, int, off_t, u_int, time_t);
 #define GPT_READONLY	0x01
 #define GPT_MODIFIED	0x02
 #define GPT_QUIET	0x04
 #define GPT_NOSYNC	0x08
 #define GPT_FILE	0x10
 #define GPT_TIMESTAMP	0x20
 #define GPT_SYNC	0x40
 #define GPT_HYBRID	0x80
 #define GPT_OPTGPT	0x4000
 #define GPT_OPTDEV	0x8000
 void*	gpt_read(gpt_t, off_t, size_t);
 off_t	gpt_last(gpt_t);
 off_t	gpt_create(gpt_t, off_t, u_int, int);
 int	gpt_write(gpt_t, map_t);
 int	gpt_write_crc(gpt_t, map_t, map_t);
 int	gpt_write_primary(gpt_t);
 int	gpt_write_backup(gpt_t);
 struct gpt_hdr *gpt_hdr(gpt_t);
 void	gpt_msg(gpt_t, const char *, ...) __printflike(2, 3);
 void	gpt_warn(gpt_t, const char *, ...) __printflike(2, 3);
 void	gpt_warnx(gpt_t, const char *, ...) __printflike(2, 3);

 @@ -23,27 +23,27 @@
  * (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 __FBSDID
 __FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: resizedisk.c,v 1.18 2020/05/24 14:42:44 jmcneill Exp $");
+__RCSID("$NetBSD: resizedisk.c,v 1.19 2022/11/20 11:57:02 mlelstv Exp $");
 #endif
 #include <sys/bootblock.h>
 #include <sys/types.h>
 #include <err.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 @@ -52,27 +52,27 @@ __RCSID("$NetBSD: resizedisk.c,v 1.18 20
 #include "gpt_private.h"
 static int cmd_resizedisk(gpt_t, int, char *[]);
 static const char *resizediskhelp[] = {
 	"[-s size] [-q]",
 };
 struct gpt_cmd c_resizedisk = {
 	"resizedisk",
 	cmd_resizedisk,
 	resizediskhelp, __arraycount(resizediskhelp),
-,
+	GPT_OPTGPT,
 };
 #define usage() gpt_usage(NULL, &c_resizedisk)
 /*
  * relocate the secondary GPT based on the following criteria:
  * - size not specified
  *   - disk has not changed size, do nothing
  *   - disk has grown, relocate secondary
  *   - disk has shrunk, create new secondary
  * - size specified
  *   - size is larger then disk or same as current location, do nothing
  *   - relocate or create new secondary
 @@ -113,57 +113,42 @@ resizedisk(gpt_t gpt, off_t sector, off_
+	}
 	gpt->tbl = map_find(gpt, MAP_TYPE_PRI_GPT_TBL);
 	if (gpt->tbl == NULL) {
 		gpt_warnx(gpt, "No primary GPT table; Run recover");
 		return -1;
+	}
 	hdr = gpt->gpt->map_data;
 	oldloc = (off_t)le64toh((uint64_t)hdr->hdr_lba_alt);
 	gpt->tpg = map_find(gpt, MAP_TYPE_SEC_GPT_HDR);
 	gpt->lbt = map_find(gpt, MAP_TYPE_SEC_GPT_TBL);
 	if (gpt->tpg == NULL || gpt->lbt == NULL) {
 		if (gpt_gpt(gpt, oldloc, 1) == -1) {
 			gpt_warnx(gpt,
 			    "Error reading backup GPT information at %#jx",
 			    oldloc);
 			return -1;
-	gpt->tpg = map_find(gpt, MAP_TYPE_SEC_GPT_HDR);
+	if (gpt->tpg == NULL || gpt->lbt == NULL)
-	if (gpt->tpg == NULL) {
+		gpt_warnx(gpt, "No secondary GPT table");
 		gpt_warnx(gpt, "No secondary GPT header; Run recover");
 		return -1;
 	gpt->lbt = map_find(gpt, MAP_TYPE_SEC_GPT_TBL);
 	if (gpt->lbt == NULL) {
 		gpt_warnx(gpt, "No secondary GPT table; Run recover");
 		return -1;
 	gpt_size = gpt->tbl->map_size;
 	if (sector == oldloc) {
 		if (!quiet)
 			gpt_warnx(gpt, "Device is already the specified size");
 		return 0;
+	}
 	if (sector == 0 && last == oldloc) {
 		if (!quiet)
 			gpt_warnx(gpt, "Device hasn't changed size");
-		return 0;
+		if (gpt->tpg != NULL && gpt->lbt != NULL)
 			return 0;
+	}
 	for (ent = gpt->tbl->map_data; ent <
 	    (struct gpt_ent *)((char *)gpt->tbl->map_data +
 	    le32toh(hdr->hdr_entries) * le32toh(hdr->hdr_entsz)); ent++) {
 		if (!gpt_uuid_is_nil(ent->ent_type) &&
 		    ((off_t)le64toh(ent->ent_lba_end) > lastdata)) {
 			lastdata = (off_t)le64toh((uint64_t)ent->ent_lba_end);
+		}
+	}
 	if (sector - gpt_size <= lastdata) {
 		gpt_warnx(gpt, "Not enough space at %" PRIu64
 @@ -173,38 +158,34 @@ resizedisk(gpt_t gpt, off_t sector, off_
 	if (last - gpt_size <= lastdata) {
 		gpt_warnx(gpt, "Not enough space for new secondary GPT table");
 		return -1;
+	}
 	if (sector > oldloc)
 		newloc = sector;
 	if (sector > 0 && sector < oldloc && last >= oldloc)
 		newloc = sector;
 	if (sector == 0 && last > oldloc)
 		newloc = last;
-	if (newloc > 0) {
+	if (newloc > 0 && gpt->tpg != NULL && gpt->lbt != NULL) {
-		if (gpt->tpg == NULL) {
+		if (!quiet)
-			gpt_warnx(gpt, "No secondary GPT header; run recover");
+			gpt_msg(gpt, "Moving secondary GPT header");
 			return -1;
 		if (gpt->lbt == NULL) {
 			gpt_warnx(gpt, "Run recover");
 			return -1;
 		gpt->tpg->map_start = newloc;
 		gpt->lbt->map_start = newloc - gpt_size;
 	} else {
 		if (!quiet)
 			gpt_msg(gpt, "Creating new secondary GPT header");
 		if (sector > 0)
 			newloc = sector;
 		else
 			newloc = last;
 		if (gpt_add_hdr(gpt, MAP_TYPE_SEC_GPT_HDR, newloc) == -1)
 			return -1;
 		gpt->lbt = map_add(gpt, newloc - gpt_size, gpt_size,
 		    MAP_TYPE_SEC_GPT_TBL, gpt->tbl->map_data, 0);
 		if (gpt->lbt == NULL) {
 			gpt_warn(gpt, "Error adding secondary GPT table");
 			return -1;