Sat Jul 17 19:27:23 2021 UTC ()

Use strlcpy() to copy the wedge device name (the code still assumes
the string is short enough and 0 terminated, but now gcc is happy).


(martin)

diff -r1.25 -r1.26 src/usr.sbin/sysinst/gpt.c

--- src/usr.sbin/sysinst/gpt.c 2021/07/17 18:07:22	1.25
+++ src/usr.sbin/sysinst/gpt.c 2021/07/17 19:27:22	1.26

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gpt.c,v 1.25 2021/07/17 18:07:22 martin Exp $	*/
+/*	$NetBSD: gpt.c,v 1.26 2021/07/17 19:27:22 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.
 @@ -1370,27 +1370,27 @@ gpt_sanitize(int diskfd, const struct gp
 		for (struct gpt_part_entry *pe = parts->partitions;
 		    pe != NULL; pe = pe->gp_next) {
 			if (pe == ignore)
 				continue;
 			if ((pe->gp_flags & GPEF_WEDGE) &&
 			    strcmp(pe->gp_dev_name, devname) == 0) {
 				found = true;
 				break;
+			}
+		}
 		if (found)
 			continue;
 		memset(&delw, 0, sizeof(delw));
-		strncpy(delw.dkw_devname, devname, sizeof(delw.dkw_devname));
+		strlcpy(delw.dkw_devname, devname, sizeof(delw.dkw_devname));
 		(void)ioctl(diskfd, DIOCDWEDGE, &delw);
+	}
 	/* cleanup */
 	free(dkw);
+}
 static bool
 gpt_add_wedge(const char *disk, struct gpt_part_entry *p,
     const struct gpt_disk_partitions *parts)
+{
 	struct dkwedge_info dkw;
 	const char *tname;