 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd9660.c,v 1.28 2010/11/19 15:47:32 tsutsui Exp $	*/
+/*	$NetBSD: cd9660.c,v 1.29 2011/05/22 21:51:39 christos Exp $	*/
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
  * Perez-Rathke and Ram Vedam.  All rights reserved.
+ *
  * This code was written by Daniel Watt, Walter Deignan, Ryan Gabrys,
  * Alan Perez-Rathke and Ram Vedam.
+ *
  * 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.
 @@ -93,27 +93,27 @@
  * 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"
 #else
 #include <sys/mount.h>
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660.c,v 1.28 2010/11/19 15:47:32 tsutsui Exp $");
+__RCSID("$NetBSD: cd9660.c,v 1.29 2011/05/22 21:51:39 christos Exp $");
 #endif  /* !__lint */
 #include <string.h>
 #include <ctype.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include "makefs.h"
 #include "cd9660.h"
 #include "cd9660/iso9660_rrip.h"
 #include "cd9660/cd9660_archimedes.h"
 /*
 @@ -205,26 +205,27 @@ cd9660_set_defaults(void)
 	/* Set up defaults in our own structure */
 	diskStructure.verbose_level = 0;
 	diskStructure.keep_bad_images = 0;
 	diskStructure.follow_sym_links = 0;
 	diskStructure.isoLevel = 2;
 	diskStructure.rock_ridge_enabled = 0;
 	diskStructure.rock_ridge_renamed_dir_name = 0;
 	diskStructure.rock_ridge_move_count = 0;
 	diskStructure.rr_moved_dir = 0;
 	diskStructure.archimedes_enabled = 0;
 	diskStructure.chrp_boot = 0;
 	diskStructure.include_padding_areas = 1;
 	/* Spec breaking functionality */
 	diskStructure.allow_deep_trees =
 	    diskStructure.allow_start_dot =
 	    diskStructure.allow_max_name =
 	    diskStructure.allow_illegal_chars =
 	    diskStructure.allow_lowercase =
 	    diskStructure.allow_multidot =
 	    diskStructure.omit_trailing_period = 0;
 	/* Make sure the PVD is clear */
 @@ -389,26 +390,28 @@ cd9660_parse_opts(const char *option, fs
+		}
 	} else if (CD9660_IS_COMMAND_ARG_DUAL(var, "G", "generic-bootimage")) {
 		if (val == NULL)
 			warnx("error: The Boot Image parameter requires a valid boot information string");
 		else
 			rv = cd9660_add_generic_bootimage(val);
 	} else if (CD9660_IS_COMMAND_ARG(var, "no-trailing-padding"))
 		diskStructure.include_padding_areas = 0;
 	/* RRIP */
 	else if (CD9660_IS_COMMAND_ARG_DUAL(var, "R", "rockridge"))
 		diskStructure.rock_ridge_enabled = 1;
 	else if (CD9660_IS_COMMAND_ARG_DUAL(var, "A", "archimedes"))
 		diskStructure.archimedes_enabled = 1;
 	else if (CD9660_IS_COMMAND_ARG(var, "chrp-boot"))
 		diskStructure.chrp_boot = 1;
 	else if (CD9660_IS_COMMAND_ARG_DUAL(var, "K", "keep-bad-images"))
 		diskStructure.keep_bad_images = 1;
 	else if (CD9660_IS_COMMAND_ARG(var, "allow-deep-trees"))
 		diskStructure.allow_deep_trees = 1;
 	else if (CD9660_IS_COMMAND_ARG(var, "allow-max-name"))
 		diskStructure.allow_max_name = 1;
 	else if (CD9660_IS_COMMAND_ARG(var, "allow-illegal-chars"))
 		diskStructure.allow_illegal_chars = 1;
 	else if (CD9660_IS_COMMAND_ARG(var, "allow-lowercase"))
 		diskStructure.allow_lowercase = 1;
 	else if (CD9660_IS_COMMAND_ARG(var,"allow-multidot"))
 		diskStructure.allow_multidot = 1;
 	else if (CD9660_IS_COMMAND_ARG(var, "omit-trailing-period"))

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd9660.h,v 1.15 2010/10/27 18:51:34 christos Exp $	*/
+/*	$NetBSD: cd9660.h,v 1.16 2011/05/22 21:51:39 christos Exp $	*/
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
  * Perez-Rathke and Ram Vedam.  All rights reserved.
+ *
  * This code was written by Daniel Watt, Walter Deignan, Ryan Gabrys,
  * Alan Perez-Rathke and Ram Vedam.
+ *
  * 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.
 @@ -276,26 +276,27 @@ typedef struct _iso9660_disk {
 	/* SUSP options and variables */
 	int64_t susp_continuation_area_start_sector;
 	int64_t susp_continuation_area_size;
 	int64_t susp_continuation_area_current_free;
 	int rock_ridge_enabled;
 	/* Other Rock Ridge Variables */
 	char *rock_ridge_renamed_dir_name;
 	int rock_ridge_move_count;
 	cd9660node *rr_moved_dir;
 	int archimedes_enabled;
 	int chrp_boot;
 	/* Spec breaking options */
 	u_char allow_deep_trees;
 	u_char allow_start_dot;
 	u_char allow_max_name; /* Allow 37 char filenames*/
 	u_char allow_illegal_chars; /* ~, !, # */
 	u_char allow_lowercase;
 	u_char allow_multidot;
 	u_char omit_trailing_period;
 	/* BOOT INFORMATION HERE */
 	int has_generic_bootimage; /* Default to 0 */
 	char *generic_bootimage;

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: makefs.8,v 1.32 2009/01/20 20:47:25 bjh21 Exp $
+.\"	$NetBSD: makefs.8,v 1.33 2011/05/22 21:51:39 christos Exp $
 .\"
 .\" Copyright (c) 2001-2003 Wasabi Systems, Inc.
 .\" All rights reserved.
 .\"
 .\" Written by Luke Mewburn for Wasabi Systems, Inc.
 .\"
 .\" 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
 @@ -23,27 +23,27 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 .\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
 .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, 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.
 .\"
-.Dd January 10, 2009
+.Dd May 22, 2011
 .Dt MAKEFS 8
 .Os
 .Sh NAME
 .Nm makefs
 .Nd create a file system image from a directory tree
 .Sh SYNOPSIS
 .Nm
 .Op Fl x
 .Op Fl B Ar byte-order
 .Op Fl b Ar free-blocks
 .Op Fl d Ar debug-mask
 .Op Fl F Ar specfile
 .Op Fl f Ar free-files
 @@ -273,26 +273,29 @@ the spec.
 .It Sy allow-max-name
 Allow 37 instead of 33 characters for filenames by omitting the
 version id.
 .It Sy allow-multidot
 Allow multiple dots in a filename.
 .It Sy applicationid
 Application ID of the image.
 .It Sy archimedes
 Use the
 .Ql ARCHIMEDES
 extension to encode
 .Tn RISC OS
 metadata.
 .It Sy chrp-boot
 Write an MBR partition table to the image to allow older CHRP hardware to
 boot.
 .It Sy boot-load-segment
 Set load segment for the boot image.
 .It Sy bootimage
 Filename of a boot image in the format
 .Dq sysid;filename ,
 where
 .Dq sysid
 is one of
 .Ql i386 ,
 .Ql mac68k ,
 .Ql macppc ,
 or
 .Ql powerpc .

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd9660_eltorito.c,v 1.14 2010/10/27 18:51:35 christos Exp $	*/
+/*	$NetBSD: cd9660_eltorito.c,v 1.15 2011/05/22 21:51:39 christos Exp $	*/
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
  * Perez-Rathke and Ram Vedam.  All rights reserved.
+ *
  * This code was written by Daniel Watt, Walter Deignan, Ryan Gabrys,
  * Alan Perez-Rathke and Ram Vedam.
+ *
  * 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.
 @@ -21,32 +21,35 @@
  * GABRYS, ALAN PEREZ-RATHKE AND RAM VEDAM ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL DANIEL WATT, WALTER DEIGNAN, RYAN
  * GABRYS, ALAN PEREZ-RATHKE AND RAM VEDAM BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
  */
 #include <sys/endian.h>
 #include "cd9660.h"
 #include "cd9660_eltorito.h"
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660_eltorito.c,v 1.14 2010/10/27 18:51:35 christos Exp $");
+__RCSID("$NetBSD: cd9660_eltorito.c,v 1.15 2011/05/22 21:51:39 christos Exp $");
 #endif  /* !__lint */
 #ifdef DEBUG
 #define	ELTORITO_DPRINTF(__x)	printf __x
 #else
 #define	ELTORITO_DPRINTF(__x)
 #endif
 static struct boot_catalog_entry *cd9660_init_boot_catalog_entry(void);
 static struct boot_catalog_entry *cd9660_boot_setup_validation_entry(char);
 static struct boot_catalog_entry *cd9660_boot_setup_default_entry(
     struct cd9660_boot_image *);
 static struct boot_catalog_entry *cd9660_boot_setup_section_head(char);
 @@ -489,31 +492,101 @@ cd9660_setup_boot_volume_descriptor(volu
 	boot_volume_descriptor *bvdData =
 	    (boot_volume_descriptor*)bvd->volumeDescriptorData;
 	bvdData->boot_record_indicator[0] = ISO_VOLUME_DESCRIPTOR_BOOT;
 	memcpy(bvdData->identifier, ISO_VOLUME_DESCRIPTOR_STANDARD_ID, 5);
 	bvdData->version[0] = 1;
 	memcpy(bvdData->boot_system_identifier, ET_ID, 23);
 	memcpy(bvdData->identifier, ISO_VOLUME_DESCRIPTOR_STANDARD_ID, 5);
 	diskStructure.boot_descriptor =
 	    (boot_volume_descriptor*) bvd->volumeDescriptorData;
 	return 1;
+}
 static int
 cd9660_write_mbr_partition_entry(FILE *fd, int idx, off_t sector_start,
     off_t nsectors, int type)
+{
 	uint8_t val;
 	uint32_t lba;
 	if (fseeko(fd, (off_t)(idx) * 16 + 0x1be, SEEK_SET) == -1)
 		err(1, "fseeko");
 	val = 0x80; /* Bootable */
 	fwrite(&val, sizeof(val), 1, fd);
 	val = 0xff; /* CHS begin */
 	fwrite(&val, sizeof(val), 1, fd);
 	fwrite(&val, sizeof(val), 1, fd);
 	fwrite(&val, sizeof(val), 1, fd);
 	val = type; /* Part type */
 	fwrite(&val, sizeof(val), 1, fd);
 	val = 0xff; /* CHS end */
 	fwrite(&val, sizeof(val), 1, fd);
 	fwrite(&val, sizeof(val), 1, fd);
 	fwrite(&val, sizeof(val), 1, fd);
 	/* LBA extent */
 	lba = htole32(sector_start);
 	fwrite(&lba, sizeof(lba), 1, fd);
 	lba = htole32(nsectors);
 	fwrite(&lba, sizeof(lba), 1, fd);
 	return 0;
+}
 static int
 cd9660_write_apm_partition_entry(FILE *fd, int idx, int total_partitions,
     off_t sector_start, off_t nsectors, off_t sector_size,
     const char *part_name, const char *part_type)
+{
 	uint32_t apm32;
 	uint16_t apm16;
 	if (fseeko(fd, (off_t)(idx + 1) * sector_size, SEEK_SET) == -1)
 		err(1, "fseeko");
 	/* Signature */
 	apm16 = htobe16(0x504d);
 	fwrite(&apm16, sizeof(apm16), 1, fd);
 	apm16 = 0;
 	fwrite(&apm16, sizeof(apm16), 1, fd);
 	/* Total number of partitions */
 	apm32 = htobe32(total_partitions);
 	fwrite(&apm32, sizeof(apm32), 1, fd);
 	/* Bounds */
 	apm32 = htobe32(sector_start);
 	fwrite(&apm32, sizeof(apm32), 1, fd);
 	apm32 = htobe32(nsectors);
 	fwrite(&apm32, sizeof(apm32), 1, fd);
 	fwrite(part_name, strlen(part_name) + 1, 1, fd);
 	fseek(fd, 32 - strlen(part_name) - 1, SEEK_CUR);
 	fwrite(part_type, strlen(part_type) + 1, 1, fd);
 	return 0;
+}
 int
 cd9660_write_boot(FILE *fd)
+{
 	struct boot_catalog_entry *e;
 	struct cd9660_boot_image *t;
 	int apm_partitions = 0;
 	int mbr_partitions = 0;
 	/* write boot catalog */
 	if (fseeko(fd, (off_t)diskStructure.boot_catalog_sector *
 	    diskStructure.sectorSize, SEEK_SET) == -1)
 		err(1, "fseeko");
 	if (diskStructure.verbose_level > 0) {
 		printf("Writing boot catalog to sector %" PRId64 "\n",
 		    diskStructure.boot_catalog_sector);
+	}
 	LIST_FOREACH(e, &diskStructure.boot_entries, ll_struct) {
 		if (diskStructure.verbose_level > 0) {
 			printf("Writing catalog entry of type %d\n",
 @@ -525,17 +598,98 @@ cd9660_write_boot(FILE *fd)
 		 */
 		fwrite(&(e->entry_data.VE), 1, 32, fd);
+	}
 	if (diskStructure.verbose_level > 0)
 		printf("Finished writing boot catalog\n");
 	/* copy boot images */
 	TAILQ_FOREACH(t, &diskStructure.boot_images, image_list) {
 		if (diskStructure.verbose_level > 0) {
 			printf("Writing boot image from %s to sectors %d\n",
 			    t->filename, t->sector);
+		}
 		cd9660_copy_file(fd, t->sector, t->filename);
 		if (t->system == ET_SYS_MAC)
 			apm_partitions++;
 		if (t->system == ET_SYS_PPC)
 			mbr_partitions++;
+	}
 	/* some systems need partition tables as well */
 	if (mbr_partitions > 0 || diskStructure.chrp_boot) {
 		uint16_t sig;
 		fseek(fd, 0x1fe, SEEK_SET);
 		sig = htole16(0xaa55);
 		fwrite(&sig, sizeof(sig), 1, fd);
 		mbr_partitions = 0;
 		/* Write ISO9660 descriptor, enclosing the whole disk */
 		if (diskStructure.chrp_boot)
 			cd9660_write_mbr_partition_entry(fd, mbr_partitions++,
 , diskStructure.totalSectors *
 			    (diskStructure.sectorSize / 512), 0x96);
 		/* Write all partition entries */
 		TAILQ_FOREACH(t, &diskStructure.boot_images, image_list) {
 			if (t->system != ET_SYS_PPC)
 				continue;
 			cd9660_write_mbr_partition_entry(fd, mbr_partitions++,
 			    t->sector * (diskStructure.sectorSize / 512),
 			    t->num_sectors * (diskStructure.sectorSize / 512),
 x41 /* PReP Boot */);
+		}
+	}
 	if (apm_partitions > 0) {
 		/* Write DDR and global APM info */
 		uint32_t apm32;
 		uint16_t apm16;
 		int total_parts;
 		fseek(fd, 0, SEEK_SET);
 		apm16 = htobe16(0x4552);
 		fwrite(&apm16, sizeof(apm16), 1, fd);
 		/* Device block size */
 		apm16 = htobe16(512);
 		fwrite(&apm16, sizeof(apm16), 1, fd);
 		/* Device block count */
 		apm32 = htobe32(diskStructure.totalSectors *
 		    (diskStructure.sectorSize / 512));
 		fwrite(&apm32, sizeof(apm32), 1, fd);
 		/* Device type/id */
 		apm16 = htobe16(1);
 		fwrite(&apm16, sizeof(apm16), 1, fd);
 		fwrite(&apm16, sizeof(apm16), 1, fd);
 		/* Count total needed entries */
 		total_parts = 2 + apm_partitions; /* Self + ISO9660 */
 		/* Write self-descriptor */
 		cd9660_write_apm_partition_entry(fd, 0, total_parts, 1,
 		    total_parts, 512, "Apple", "Apple_partition_map");
 		/* Write ISO9660 descriptor, enclosing the whole disk */
 		cd9660_write_apm_partition_entry(fd, 1, total_parts, 0,
 		    diskStructure.totalSectors *
 		    (diskStructure.sectorSize / 512), 512, "ISO9660",
 		    "CD_ROM_Mode_1");
 		/* Write all partition entries */
 		apm_partitions = 0;
 		TAILQ_FOREACH(t, &diskStructure.boot_images, image_list) {
 			if (t->system != ET_SYS_MAC)
 				continue;
 			cd9660_write_apm_partition_entry(fd,
 + apm_partitions++, total_parts,
 			    t->sector * (diskStructure.sectorSize / 512),
 			    t->num_sectors * (diskStructure.sectorSize / 512),
 , "CD Boot", "Apple_Bootstrap");
+		}
+	}
 	return 0;
+}