Module Name: src
Committed By: tsutsui
Date: Tue May 7 19:55:14 UTC 2024
Modified Files:
src/sys/arch/hp300/stand/mkboot: mkboot.c volhdr.h
Log Message:
Use proper signedness for the LIF file system data structures.
Ancient 4.3BSD used short and int for location, file size, file type,
and addresses etc. but all of them should be unsigned.
Also rename several variables and add comments for readability.
The LIF file system info can be found in "The HPDir Project" page:
https://www.hp9845.net/9845/projects/hpdir/
The same uboot.lif binaries are generated.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp300/stand/mkboot/mkboot.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hp300/stand/mkboot/volhdr.h
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/hp300/stand/mkboot/mkboot.c
diff -u src/sys/arch/hp300/stand/mkboot/mkboot.c:1.18 src/sys/arch/hp300/stand/mkboot/mkboot.c:1.19
--- src/sys/arch/hp300/stand/mkboot/mkboot.c:1.18 Mon May 6 18:08:49 2024
+++ src/sys/arch/hp300/stand/mkboot/mkboot.c Tue May 7 19:55:14 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mkboot.c,v 1.18 2024/05/06 18:08:49 tsutsui Exp $ */
+/* $NetBSD: mkboot.c,v 1.19 2024/05/07 19:55:14 tsutsui Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -46,7 +46,7 @@ The Regents of the University of Califor
#ifdef notdef
static char sccsid[] = "@(#)mkboot.c 7.2 (Berkeley) 12/16/90";
#endif
-__RCSID("$NetBSD: mkboot.c,v 1.18 2024/05/06 18:08:49 tsutsui Exp $");
+__RCSID("$NetBSD: mkboot.c,v 1.19 2024/05/07 19:55:14 tsutsui Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -90,7 +90,7 @@ int main(int, char **);
static void bcddate(char *, char *);
static char *lifname(char *);
-static int putfile(char *, int);
+static size_t putfile(char *, int);
static void usage(void);
#ifndef __CTASSERT
@@ -120,9 +120,9 @@ memcpy((a), (b), (c))
int
main(int argc, char **argv)
{
- char *n1, *n2, *n3;
- int n, to, ch;
- int count;
+ char *name1, *name2, *name3;
+ int to, ch;
+ uint32_t count, nsec;
while ((ch = getopt(argc, argv, "l:t:")) != -1)
switch (ch) {
@@ -140,23 +140,23 @@ main(int argc, char **argv)
argv += optind;
if (loadpoint == ULONG_MAX || argc == 0)
usage();
- n1 = argv[0];
+ name1 = argv[0];
argv++;
argc--;
if (argc == 0)
usage();
if (argc > 1) {
- n2 = argv[0];
+ name2 = argv[0];
argv++;
argc--;
if (argc > 1) {
- n3 = argv[0];
+ name3 = argv[0];
argv++;
argc--;
} else
- n3 = NULL;
+ name3 = NULL;
} else
- n2 = n3 = NULL;
+ name2 = name3 = NULL;
if ((to = open(argv[0], O_WRONLY | O_TRUNC | O_CREAT, 0644)) == -1)
err(1, "Can't open `%s'", argv[0]);
@@ -180,28 +180,28 @@ main(int argc, char **argv)
/* output bootfile one */
lseek(to, LIF_FILESTART, SEEK_SET);
- count = putfile(n1, to);
- n = btolifs(count);
- strcpy(lifd[0].dir_name, lifname(n1));
+ count = putfile(name1, to);
+ nsec = btolifs(count);
+ strcpy(lifd[0].dir_name, lifname(name1));
lifd[0].dir_type = htobe16(DIR_TYPE);
lifd[0].dir_addr = htobe32(btolifs(LIF_FILESTART));
- lifd[0].dir_length = htobe32(n);
- bcddate(n1, lifd[0].dir_toc);
+ lifd[0].dir_length = htobe32(nsec);
+ bcddate(name1, lifd[0].dir_toc);
lifd[0].dir_flag = htobe16(DIR_FLAG);
lifd[0].dir_exec = htobe32(loadpoint);
lifv.vol_length = htobe32(be32toh(lifd[0].dir_addr) +
be32toh(lifd[0].dir_length));
/* if there is an optional second boot program, output it */
- if (n2 != NULL) {
- lseek(to, LIF_FILESTART + lifstob(n), SEEK_SET);
- count = putfile(n2, to);
- n = btolifs(count);
- strcpy(lifd[1].dir_name, lifname(n2));
+ if (name2 != NULL) {
+ lseek(to, LIF_FILESTART + lifstob(nsec), SEEK_SET);
+ count = putfile(name2, to);
+ nsec = btolifs(count);
+ strcpy(lifd[1].dir_name, lifname(name2));
lifd[1].dir_type = htobe16(DIR_TYPE);
lifd[1].dir_addr = htobe32(lifv.vol_length);
- lifd[1].dir_length = htobe32(n);
- bcddate(n2, lifd[1].dir_toc);
+ lifd[1].dir_length = htobe32(nsec);
+ bcddate(name2, lifd[1].dir_toc);
lifd[1].dir_flag = htobe16(DIR_FLAG);
lifd[1].dir_exec = htobe32(loadpoint);
lifv.vol_length = htobe32(be32toh(lifd[1].dir_addr) +
@@ -209,16 +209,16 @@ main(int argc, char **argv)
}
/* ditto for three */
- if (n3 != NULL) {
- lseek(to, LIF_FILESTART + lifstob(lifd[0].dir_length + n),
+ if (name3 != NULL) {
+ lseek(to, LIF_FILESTART + lifstob(lifd[0].dir_length + nsec),
SEEK_SET);
- count = putfile(n3, to);
- n = btolifs(count);
- strcpy(lifd[2].dir_name, lifname(n3));
+ count = putfile(name3, to);
+ nsec = btolifs(count);
+ strcpy(lifd[2].dir_name, lifname(name3));
lifd[2].dir_type = htobe16(DIR_TYPE);
lifd[2].dir_addr = htobe32(lifv.vol_length);
- lifd[2].dir_length = htobe32(n);
- bcddate(n3, lifd[2].dir_toc);
+ lifd[2].dir_length = htobe32(nsec);
+ bcddate(name3, lifd[2].dir_toc);
lifd[2].dir_flag = htobe16(DIR_FLAG);
lifd[2].dir_exec = htobe32(loadpoint);
lifv.vol_length = htobe32(be32toh(lifd[2].dir_addr) +
@@ -234,7 +234,7 @@ main(int argc, char **argv)
return EXIT_SUCCESS;
}
-static int
+static size_t
putfile(char *from, int to)
{
int fd;
Index: src/sys/arch/hp300/stand/mkboot/volhdr.h
diff -u src/sys/arch/hp300/stand/mkboot/volhdr.h:1.5 src/sys/arch/hp300/stand/mkboot/volhdr.h:1.6
--- src/sys/arch/hp300/stand/mkboot/volhdr.h:1.5 Tue Feb 8 20:20:14 2011
+++ src/sys/arch/hp300/stand/mkboot/volhdr.h Tue May 7 19:55:14 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: volhdr.h,v 1.5 2011/02/08 20:20:14 rmind Exp $ */
+/* $NetBSD: volhdr.h,v 1.6 2024/05/07 19:55:14 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -41,37 +41,37 @@
*/
struct lifvol {
- int16_t vol_id;
- char vol_label[6];
- int32_t vol_addr;
- int16_t vol_oct;
- int16_t vol_dummy;
- int32_t vol_dirsize;
- int16_t vol_version;
- int16_t vol_zero;
- int32_t vol_huh1;
- int32_t vol_huh2;
- int32_t vol_length;
+ uint16_t vol_id;
+ char vol_label[6];
+ uint32_t vol_addr;
+ uint16_t vol_oct;
+ uint16_t vol_dummy;
+ uint32_t vol_dirsize;
+ uint16_t vol_version;
+ uint16_t vol_zero;
+ uint32_t vol_huh1;
+ uint32_t vol_huh2;
+ uint32_t vol_length;
};
struct lifdir {
- char dir_name[10];
- uint16_t dir_type;
- int32_t dir_addr;
- int32_t dir_length;
- char dir_toc[6];
- int16_t dir_flag;
+ char dir_name[10];
+ uint16_t dir_type;
+ uint32_t dir_addr;
+ uint32_t dir_length;
+ char dir_toc[6];
+ uint16_t dir_flag;
int32_t dir_exec;
};
/* load header for boot rom */
struct load {
- int32_t address;
- int32_t count;
+ uint32_t address;
+ uint32_t count;
};
-#define VOL_ID -32768
+#define VOL_ID 0x8000 /* always $8000 */
#define VOL_OCT 4096
-#define DIR_TYPE -5822
-#define DIR_FLAG 0x8001 /* dont ask me! */
-#define SECTSIZE 256
+#define DIR_TYPE 0xe942 /* "SYS9k Series 9000" */
+#define DIR_FLAG 0x8001 /* don't ask me! */
+#define SECTSIZE 256
