 @@ -1,14 +1,14 @@
-/* $NetBSD: mkubootimage.c,v 1.6 2011/02/26 20:03:09 phx Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.7 2011/06/08 05:54:38 matt Exp $ */
 /*-
  * Copyright (c) 2010 Jared D. McNeill <jmcneill@invisible.ca>
  * 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. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
 @@ -20,27 +20,27 @@
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (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>
-__RCSID("$NetBSD: mkubootimage.c,v 1.6 2011/02/26 20:03:09 phx Exp $");
+__RCSID("$NetBSD: mkubootimage.c,v 1.7 2011/06/08 05:54:38 matt Exp $");
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 @@ -74,122 +74,178 @@ struct uboot_os {
 static enum uboot_image_os
 get_os(const char *name)
+{
 	unsigned int i;
 	for (i = 0; i < __arraycount(uboot_os); i++) {
 		if (strcmp(uboot_os[i].name, name) == 0)
 			return uboot_os[i].os;
+	}
 	return IH_OS_UNKNOWN;
+}
 static const char *
 get_os_name(enum uboot_image_os os)
+{
 	unsigned int i;
 	for (i = 0; i < __arraycount(uboot_os); i++) {
 		if (uboot_os[i].os == os)
 			return uboot_os[i].name;
+	}
 	return "Unknown";
+}
 struct uboot_arch {
 	enum uboot_image_arch arch;
 	const char *name;
 } uboot_arch[] = {
 	{ IH_ARCH_ARM,		"arm" },
 	{ IH_ARCH_MIPS,		"mips" },
 	{ IH_ARCH_MIPS64,	"mips64" },
 	{ IH_ARCH_PPC,		"powerpc" },
 };
 static enum uboot_image_arch
 get_arch(const char *name)
+{
 	unsigned int i;
 	for (i = 0; i < __arraycount(uboot_arch); i++) {
 		if (strcmp(uboot_arch[i].name, name) == 0)
 			return uboot_arch[i].arch;
+	}
 	return IH_ARCH_UNKNOWN;
+}
 static const char *
 get_arch_name(enum uboot_image_arch arch)
+{
 	unsigned int i;
 	for (i = 0; i < __arraycount(uboot_arch); i++) {
 		if (uboot_arch[i].arch == arch)
 			return uboot_arch[i].name;
+	}
 	return "Unknown";
+}
 struct uboot_type {
 	enum uboot_image_type type;
 	const char *name;
 } uboot_type[] = {
 	{ IH_TYPE_STANDALONE,	"standalone" },
 	{ IH_TYPE_KERNEL,	"kernel" },
 	{ IH_TYPE_RAMDISK,	"ramdisk" },
 	{ IH_TYPE_FILESYSTEM,	"fs" },
 };
 static enum uboot_image_type
 get_type(const char *name)
+{
 	unsigned int i;
 	for (i = 0; i < __arraycount(uboot_type); i++) {
 		if (strcmp(uboot_type[i].name, name) == 0)
 			return uboot_type[i].type;
+	}
 	return IH_TYPE_UNKNOWN;
+}
 static const char *
 get_type_name(enum uboot_image_type type)
+{
 	unsigned int i;
 	for (i = 0; i < __arraycount(uboot_type); i++) {
 		if (uboot_type[i].type == type)
 			return uboot_type[i].name;
+	}
 	return "Unknown";
+}
 struct uboot_comp {
 	enum uboot_image_comp comp;
 	const char *name;
 } uboot_comp[] = {
 	{ IH_COMP_NONE,		"none" },
 	{ IH_COMP_GZIP,		"gz" },
 	{ IH_COMP_BZIP2,	"bz2" },
 };
 static enum uboot_image_comp
 get_comp(const char *name)
+{
 	unsigned int i;
 	for (i = 0; i < __arraycount(uboot_comp); i++) {
 		if (strcmp(uboot_comp[i].name, name) == 0)
 			return uboot_comp[i].comp;
+	}
 	return IH_TYPE_UNKNOWN;
+}
 static const char *
 get_comp_name(enum uboot_image_comp comp)
+{
 	unsigned int i;
 	for (i = 0; i < __arraycount(uboot_comp); i++) {
 		if (uboot_comp[i].comp == comp)
 			return uboot_comp[i].name;
+	}
 	return "Unknown";
+}
 static void
 usage(void)
+{
 	fprintf(stderr, "usage: mkubootimage -A <arm|mips|mips64|powerpc>");
 	fprintf(stderr, " -C <none|gz|bz2>");
 	fprintf(stderr, " -O <openbsd|netbsd|freebsd|linux>");
 	fprintf(stderr, " -T <standalone|kernel|ramdisk|fs>");
 	fprintf(stderr, " -a <addr> [-e <ep>] -n <name>");
 	fprintf(stderr, " <srcfile> <dstfile>\n");
 	exit(EXIT_FAILURE);
+}
 static void
 dump_header(struct uboot_image_header *hdr)
+{
 	time_t tm = ntohl(hdr->ih_time);
 	printf(" magic:       0x%08x\n", ntohl(hdr->ih_magic));
 	printf(" time:        %s", ctime(&tm));
 	printf(" size:        %u\n", ntohl(hdr->ih_size));
 	printf(" load addr:   0x%08x\n", ntohl(hdr->ih_load));
 	printf(" entry point: 0x%08x\n", ntohl(hdr->ih_ep));
 	printf(" data crc:    0x%08x\n", ntohl(hdr->ih_dcrc));
-	printf(" os:          %d\n", hdr->ih_os);
+	printf(" os:          %d (%s)\n", hdr->ih_os,
-	printf(" arch:        %d\n", hdr->ih_arch);
+	    get_os_name(hdr->ih_os));
-	printf(" type:        %d\n", hdr->ih_type);
+	printf(" arch:        %d (%s)\n", hdr->ih_arch,
-	printf(" comp:        %d\n", hdr->ih_comp);
+	    get_arch_name(hdr->ih_arch));
 	printf(" type:        %d (%s)\n", hdr->ih_type,
 	    get_type_name(hdr->ih_type));
 	printf(" comp:        %d (%s)\n", hdr->ih_comp,
 	    get_comp_name(hdr->ih_comp));
 	printf(" name:        %s\n", hdr->ih_name);
 	printf(" header crc:  0x%08x\n", hdr->ih_hcrc);
+}
 static int
 generate_header(struct uboot_image_header *hdr, int kernel_fd)
+{
 	uint8_t *p;
 	struct stat st;
 	uint32_t crc;
 	int error;
 	error = fstat(kernel_fd, &st);
 @@ -212,27 +268,27 @@ generate_header(struct uboot_image_heade
 	munmap(p, st.st_size);
 	memset(hdr, 0, sizeof(*hdr));
 	hdr->ih_magic = htonl(IH_MAGIC);
 	hdr->ih_time = htonl(st.st_mtime);
 	hdr->ih_size = htonl(st.st_size);
 	hdr->ih_load = htonl(image_loadaddr);
 	hdr->ih_ep = htonl(image_entrypoint);
 	hdr->ih_dcrc = htonl(crc);
 	hdr->ih_os = image_os;
 	hdr->ih_arch = image_arch;
 	hdr->ih_type = image_type;
 	hdr->ih_comp = image_comp;
-	strncpy((char *)hdr->ih_name, image_name, sizeof(hdr->ih_name));
+	strlcpy((char *)hdr->ih_name, image_name, sizeof(hdr->ih_name));
 	crc = crc32((void *)hdr, sizeof(*hdr));
 	hdr->ih_hcrc = htonl(crc);
 	dump_header(hdr);
 	return 0;
+}
 static int
 write_image(struct uboot_image_header *hdr, int kernel_fd, int image_fd)
+{
 	uint8_t buf[4096];
 	ssize_t rlen, wlen;