Module Name: src Committed By: manu Date: Mon Sep 2 06:10:24 UTC 2019
Modified Files: src/sys/arch/i386/stand/boot: boot2.c src/sys/arch/i386/stand/efiboot: boot.c devopen.c Log Message: Make sure devices names are copied including last byte Fix from M. Levinson. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sys/arch/i386/stand/boot/boot2.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/stand/efiboot/boot.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/i386/stand/efiboot/devopen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/i386/stand/boot/boot2.c diff -u src/sys/arch/i386/stand/boot/boot2.c:1.71 src/sys/arch/i386/stand/boot/boot2.c:1.72 --- src/sys/arch/i386/stand/boot/boot2.c:1.71 Sun Aug 18 02:18:24 2019 +++ src/sys/arch/i386/stand/boot/boot2.c Mon Sep 2 06:10:24 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: boot2.c,v 1.71 2019/08/18 02:18:24 manu Exp $ */ +/* $NetBSD: boot2.c,v 1.72 2019/09/02 06:10:24 manu Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -172,7 +172,8 @@ parsebootfile(const char *fname, char ** if (default_part_name == NULL) { *devname = default_devname; } else { - snprintf(savedevname, MAXDEVNAME, "NAME=%s", default_part_name); + snprintf(savedevname, sizeof(savedevname), + "NAME=%s", default_part_name); *devname = savedevname; } *unit = default_unit; Index: src/sys/arch/i386/stand/efiboot/boot.c diff -u src/sys/arch/i386/stand/efiboot/boot.c:1.14 src/sys/arch/i386/stand/efiboot/boot.c:1.15 --- src/sys/arch/i386/stand/efiboot/boot.c:1.14 Sun Aug 18 02:18:24 2019 +++ src/sys/arch/i386/stand/efiboot/boot.c Mon Sep 2 06:10:24 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: boot.c,v 1.14 2019/08/18 02:18:24 manu Exp $ */ +/* $NetBSD: boot.c,v 1.15 2019/09/02 06:10:24 manu Exp $ */ /*- * Copyright (c) 2016 Kimihiro Nonaka <non...@netbsd.org> @@ -130,7 +130,8 @@ parsebootfile(const char *fname, char ** if (default_part_name == NULL) { *devname = default_devname; } else { - snprintf(savedevname, MAXDEVNAME, "NAME=%s", default_part_name); + snprintf(savedevname, sizeof(savedevname), + "NAME=%s", default_part_name); *devname = savedevname; } *unit = default_unit; Index: src/sys/arch/i386/stand/efiboot/devopen.c diff -u src/sys/arch/i386/stand/efiboot/devopen.c:1.6 src/sys/arch/i386/stand/efiboot/devopen.c:1.7 --- src/sys/arch/i386/stand/efiboot/devopen.c:1.6 Sun Aug 18 02:18:24 2019 +++ src/sys/arch/i386/stand/efiboot/devopen.c Mon Sep 2 06:10:24 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: devopen.c,v 1.6 2019/08/18 02:18:24 manu Exp $ */ +/* $NetBSD: devopen.c,v 1.7 2019/09/02 06:10:24 manu Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -100,7 +100,8 @@ bios2dev(int biosdev, daddr_t sector, ch (void)biosdisk_findpartition(biosdev, sector, partition, part_name); if (*part_name != NULL) { - snprintf(savedevname, MAXDEVNAME, "NAME=%s", *part_name); + snprintf(savedevname, sizeof(savedevname), + "NAME=%s", *part_name); *devname = savedevname; } }