xref: /freebsd/usr.sbin/makefs/cd9660.c (revision 0b3105a37d7adcadcb720112fed4dc4e8040be99)
1 /*	$NetBSD: cd9660.c,v 1.31 2011/08/06 23:25:19 christos Exp $	*/
2 
3 /*
4  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
5  * Perez-Rathke and Ram Vedam.  All rights reserved.
6  *
7  * This code was written by Daniel Watt, Walter Deignan, Ryan Gabrys,
8  * Alan Perez-Rathke and Ram Vedam.
9  *
10  * Redistribution and use in source and binary forms, with or
11  * without modification, are permitted provided that the following
12  * conditions are met:
13  * 1. Redistributions of source code must retain the above copyright
14  *    notice, this list of conditions and the following disclaimer.
15  * 2. Redistributions in binary form must reproduce the above
16  *    copyright notice, this list of conditions and the following
17  *    disclaimer in the documentation and/or other materials provided
18  *    with the distribution.
19  *
20  * THIS SOFTWARE IS PROVIDED BY DANIEL WATT, WALTER DEIGNAN, RYAN
21  * GABRYS, ALAN PEREZ-RATHKE AND RAM VEDAM ``AS IS'' AND ANY EXPRESS OR
22  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
23  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
24  * DISCLAIMED.  IN NO EVENT SHALL DANIEL WATT, WALTER DEIGNAN, RYAN
25  * GABRYS, ALAN PEREZ-RATHKE AND RAM VEDAM BE LIABLE FOR ANY DIRECT, INDIRECT,
26  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
27  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
28  * USE,DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
29  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
30  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
32  * OF SUCH DAMAGE.
33  */
34 /*
35  * Copyright (c) 2001 Wasabi Systems, Inc.
36  * All rights reserved.
37  *
38  * Written by Luke Mewburn for Wasabi Systems, Inc.
39  *
40  * Redistribution and use in source and binary forms, with or without
41  * modification, are permitted provided that the following conditions
42  * are met:
43  * 1. Redistributions of source code must retain the above copyright
44  *    notice, this list of conditions and the following disclaimer.
45  * 2. Redistributions in binary form must reproduce the above copyright
46  *    notice, this list of conditions and the following disclaimer in the
47  *    documentation and/or other materials provided with the distribution.
48  * 3. All advertising materials mentioning features or use of this software
49  *    must display the following acknowledgement:
50  *      This product includes software developed for the NetBSD Project by
51  *      Wasabi Systems, Inc.
52  * 4. The name of Wasabi Systems, Inc. may not be used to endorse
53  *    or promote products derived from this software without specific prior
54  *    written permission.
55  *
56  * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
57  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
58  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
59  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
60  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
61  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
62  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
63  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
64  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
65  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
66  * POSSIBILITY OF SUCH DAMAGE.
67  */
68 /*
69  * Copyright (c) 1982, 1986, 1989, 1993
70  *	The Regents of the University of California.  All rights reserved.
71  *
72  * Redistribution and use in source and binary forms, with or without
73  * modification, are permitted provided that the following conditions
74  * are met:
75  * 1. Redistributions of source code must retain the above copyright
76  *    notice, this list of conditions and the following disclaimer.
77  * 2. Redistributions in binary form must reproduce the above copyright
78  *    notice, this list of conditions and the following disclaimer in the
79  *    documentation and/or other materials provided with the distribution.
80  * 3. Neither the name of the University nor the names of its contributors
81  *    may be used to endorse or promote products derived from this software
82  *    without specific prior written permission.
83  *
84  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
85  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
86  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
87  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
88  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
89  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
90  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
91  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
92  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
93  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
94  * SUCH DAMAGE.
95  *
96   */
97 
98 #include <sys/cdefs.h>
99 __FBSDID("$FreeBSD$");
100 
101 #include <string.h>
102 #include <ctype.h>
103 #include <sys/param.h>
104 #include <sys/queue.h>
105 
106 #include "makefs.h"
107 #include "cd9660.h"
108 #include "cd9660/iso9660_rrip.h"
109 #include "cd9660/cd9660_archimedes.h"
110 
111 /*
112  * Global variables
113  */
114 iso9660_disk diskStructure;
115 
116 static void cd9660_finalize_PVD(void);
117 static cd9660node *cd9660_allocate_cd9660node(void);
118 static void cd9660_set_defaults(void);
119 static int cd9660_arguments_set_string(const char *, const char *, int,
120     char, char *);
121 static void cd9660_populate_iso_dir_record(
122     struct _iso_directory_record_cd9660 *, u_char, u_char, u_char,
123     const char *);
124 static void cd9660_setup_root_node(void);
125 static int cd9660_setup_volume_descriptors(void);
126 #if 0
127 static int cd9660_fill_extended_attribute_record(cd9660node *);
128 #endif
129 static void cd9660_sort_nodes(cd9660node *);
130 static int cd9660_translate_node_common(cd9660node *);
131 static int cd9660_translate_node(fsnode *, cd9660node *);
132 static int cd9660_compare_filename(const char *, const char *);
133 static void cd9660_sorted_child_insert(cd9660node *, cd9660node *);
134 static int cd9660_handle_collisions(cd9660node *, int);
135 static cd9660node *cd9660_rename_filename(cd9660node *, int, int);
136 static void cd9660_copy_filenames(cd9660node *);
137 static void cd9660_sorting_nodes(cd9660node *);
138 static int cd9660_count_collisions(cd9660node *);
139 static cd9660node *cd9660_rrip_move_directory(cd9660node *);
140 static int cd9660_add_dot_records(cd9660node *);
141 
142 static void cd9660_convert_structure(fsnode *, cd9660node *, int,
143     int *, int *);
144 static void cd9660_free_structure(cd9660node *);
145 static int cd9660_generate_path_table(void);
146 static int cd9660_level1_convert_filename(const char *, char *, int);
147 static int cd9660_level2_convert_filename(const char *, char *, int);
148 #if 0
149 static int cd9660_joliet_convert_filename(const char *, char *, int);
150 #endif
151 static int cd9660_convert_filename(const char *, char *, int);
152 static void cd9660_populate_dot_records(cd9660node *);
153 static int64_t cd9660_compute_offsets(cd9660node *, int64_t);
154 #if 0
155 static int cd9660_copy_stat_info(cd9660node *, cd9660node *, int);
156 #endif
157 static cd9660node *cd9660_create_virtual_entry(const char *, cd9660node *, int,
158     int);
159 static cd9660node *cd9660_create_file(const char *, cd9660node *, cd9660node *);
160 static cd9660node *cd9660_create_directory(const char *, cd9660node *,
161     cd9660node *);
162 static cd9660node *cd9660_create_special_directory(u_char, cd9660node *);
163 
164 
165 /*
166  * Allocate and initialize a cd9660node
167  * @returns struct cd9660node * Pointer to new node, or NULL on error
168  */
169 static cd9660node *
170 cd9660_allocate_cd9660node(void)
171 {
172 	cd9660node *temp;
173 
174 	if ((temp = calloc(1, sizeof(cd9660node))) == NULL)
175 		err(EXIT_FAILURE, "%s: calloc", __func__);
176 	TAILQ_INIT(&temp->cn_children);
177 	temp->parent = temp->dot_record = temp->dot_dot_record = NULL;
178 	temp->ptnext = temp->ptprev = temp->ptlast = NULL;
179 	temp->node = NULL;
180 	temp->isoDirRecord = NULL;
181 	temp->isoExtAttributes = NULL;
182 	temp->rr_real_parent = temp->rr_relocated = NULL;
183 	temp->su_tail_data = NULL;
184 	return temp;
185 }
186 
187 int cd9660_defaults_set = 0;
188 
189 /**
190 * Set default values for cd9660 extension to makefs
191 */
192 static void
193 cd9660_set_defaults(void)
194 {
195 	/*Fix the sector size for now, though the spec allows for other sizes*/
196 	diskStructure.sectorSize = 2048;
197 
198 	/* Set up defaults in our own structure */
199 	diskStructure.verbose_level = 0;
200 	diskStructure.keep_bad_images = 0;
201 	diskStructure.follow_sym_links = 0;
202 	diskStructure.isoLevel = 2;
203 
204 	diskStructure.rock_ridge_enabled = 0;
205 	diskStructure.rock_ridge_renamed_dir_name = 0;
206 	diskStructure.rock_ridge_move_count = 0;
207 	diskStructure.rr_moved_dir = 0;
208 
209 	diskStructure.archimedes_enabled = 0;
210 	diskStructure.chrp_boot = 0;
211 
212 	diskStructure.include_padding_areas = 1;
213 
214 	/* Spec breaking functionality */
215 	diskStructure.allow_deep_trees =
216 	    diskStructure.allow_start_dot =
217 	    diskStructure.allow_max_name =
218 	    diskStructure.allow_illegal_chars =
219 	    diskStructure.allow_lowercase =
220 	    diskStructure.allow_multidot =
221 	    diskStructure.omit_trailing_period = 0;
222 
223 	/* Make sure the PVD is clear */
224 	memset(&diskStructure.primaryDescriptor, 0, 2048);
225 
226 	memset(diskStructure.primaryDescriptor.publisher_id,	0x20,128);
227 	memset(diskStructure.primaryDescriptor.preparer_id,	0x20,128);
228 	memset(diskStructure.primaryDescriptor.application_id,	0x20,128);
229 	memset(diskStructure.primaryDescriptor.copyright_file_id, 0x20,37);
230 	memset(diskStructure.primaryDescriptor.abstract_file_id, 0x20,37);
231 	memset(diskStructure.primaryDescriptor.bibliographic_file_id, 0x20,37);
232 
233 	strcpy(diskStructure.primaryDescriptor.system_id, "FreeBSD");
234 
235 	cd9660_defaults_set = 1;
236 
237 	/* Boot support: Initially disabled */
238 	diskStructure.has_generic_bootimage = 0;
239 	diskStructure.generic_bootimage = NULL;
240 
241 	diskStructure.boot_image_directory = 0;
242 	/*memset(diskStructure.boot_descriptor, 0, 2048);*/
243 
244 	diskStructure.is_bootable = 0;
245 	TAILQ_INIT(&diskStructure.boot_images);
246 	LIST_INIT(&diskStructure.boot_entries);
247 }
248 
249 void
250 cd9660_prep_opts(fsinfo_t *fsopts __unused)
251 {
252 	cd9660_set_defaults();
253 }
254 
255 void
256 cd9660_cleanup_opts(fsinfo_t *fsopts __unused)
257 {
258 
259 }
260 
261 static int
262 cd9660_arguments_set_string(const char *val, const char *fieldtitle, int length,
263 			    char testmode, char * dest)
264 {
265 	int len, test;
266 
267 	if (val == NULL)
268 		warnx("error: The %s requires a string argument", fieldtitle);
269 	else if ((len = strlen(val)) <= length) {
270 		if (testmode == 'd')
271 			test = cd9660_valid_d_chars(val);
272 		else
273 			test = cd9660_valid_a_chars(val);
274 		if (test) {
275 			memcpy(dest, val, len);
276 			if (test == 2)
277 				cd9660_uppercase_characters(dest, len);
278 			return 1;
279 		} else
280 			warnx("error: The %s must be composed of "
281 			      "%c-characters", fieldtitle, testmode);
282 	} else
283 		warnx("error: The %s must be at most 32 characters long",
284 		    fieldtitle);
285 	return 0;
286 }
287 
288 /*
289  * Command-line parsing function
290  */
291 
292 int
293 cd9660_parse_opts(const char *option, fsinfo_t *fsopts)
294 {
295 	char *var, *val;
296 	int	rv;
297 	/* Set up allowed options - integer options ONLY */
298 	option_t cd9660_options[] = {
299 		{ "l", &diskStructure.isoLevel, 1, 2, "ISO Level" },
300 		{ "isolevel", &diskStructure.isoLevel, 1, 2, "ISO Level" },
301 		{ "verbose",  &diskStructure.verbose_level, 0, 2,
302 		  "Turns on verbose output" },
303 		{ "v", &diskStructure.verbose_level, 0 , 2,
304 		  "Turns on verbose output"},
305 		{ .name = NULL }
306 	};
307 
308 	if (cd9660_defaults_set == 0)
309 		cd9660_set_defaults();
310 
311 	/*
312 	 * Todo : finish implementing this, and make a function that
313 	 * parses them
314 	 */
315 	/*
316 	string_option_t cd9660_string_options[] = {
317 		{ "L", "Label", &diskStructure.primaryDescriptor.volume_id, 1, 32, "Disk Label", ISO_STRING_FILTER_DCHARS },
318 		{ NULL }
319 	}
320 	*/
321 
322 	assert(option != NULL);
323 
324 	if (debug & DEBUG_FS_PARSE_OPTS)
325 		printf("cd9660_parse_opts: got `%s'\n", option);
326 
327 	if ((var = strdup(option)) == NULL)
328 		err(1, "allocating memory for copy of option string");
329 	rv = 1;
330 
331 	val = strchr(var, '=');
332 	if (val != NULL)
333 		*val++ = '\0';
334 
335 	/* First handle options with no parameters */
336 	if (strcmp(var, "h") == 0) {
337 		diskStructure.displayHelp = 1;
338 		rv = 1;
339 	} else if (CD9660_IS_COMMAND_ARG_DUAL(var, "S", "follow-symlinks")) {
340 		/* this is not handled yet */
341 		diskStructure.follow_sym_links = 1;
342 		rv = 1;
343 	} else if (CD9660_IS_COMMAND_ARG_DUAL(var, "L", "label")) {
344 		rv = cd9660_arguments_set_string(val, "Disk Label", 32, 'd',
345 			diskStructure.primaryDescriptor.volume_id);
346 	} else if (CD9660_IS_COMMAND_ARG_DUAL(var, "A", "applicationid")) {
347 		rv = cd9660_arguments_set_string(val, "Application Identifier", 128, 'a',
348 			diskStructure.primaryDescriptor.application_id);
349 	} else if(CD9660_IS_COMMAND_ARG_DUAL(var, "P", "publisher")) {
350 		rv = cd9660_arguments_set_string(val, "Publisher Identifier",
351 			128, 'a', diskStructure.primaryDescriptor.publisher_id);
352 	} else if (CD9660_IS_COMMAND_ARG_DUAL(var, "p", "preparer")) {
353 		rv = cd9660_arguments_set_string(val, "Preparer Identifier",
354 		    128, 'a', diskStructure.primaryDescriptor.preparer_id);
355 	} else if (CD9660_IS_COMMAND_ARG_DUAL(var, "V", "volumeid")) {
356 		rv = cd9660_arguments_set_string(val, "Volume Set Identifier",
357 		    128, 'a', diskStructure.primaryDescriptor.volume_set_id);
358 	/* Boot options */
359 	} else if (CD9660_IS_COMMAND_ARG_DUAL(var, "B", "bootimage")) {
360 		if (val == NULL)
361 			warnx("error: The Boot Image parameter requires a valid boot information string");
362 		else
363 			rv = cd9660_add_boot_disk(val);
364 	} else if (CD9660_IS_COMMAND_ARG(var, "bootimagedir")) {
365 		/*
366 		 * XXXfvdl this is unused.
367 		 */
368 		if (val == NULL)
369 			errx(1, "error: The Boot Image Directory parameter"
370 			     " requires a directory name\n");
371 		else {
372 			if ((diskStructure.boot_image_directory =
373 			     malloc(strlen(val) + 1)) == NULL) {
374 				CD9660_MEM_ALLOC_ERROR("cd9660_parse_opts");
375 				exit(1);
376 			}
377 
378 			/* BIG TODO: Add the max length function here */
379 			cd9660_arguments_set_string(val, "Boot Image Directory",
380 			    12 , 'd', diskStructure.boot_image_directory);
381 		}
382 	} else if (CD9660_IS_COMMAND_ARG_DUAL(var, "G", "generic-bootimage")) {
383 		if (val == NULL)
384 			warnx("error: The Boot Image parameter requires a valid boot information string");
385 		else
386 			rv = cd9660_add_generic_bootimage(val);
387 	} else if (CD9660_IS_COMMAND_ARG(var, "no-trailing-padding"))
388 		diskStructure.include_padding_areas = 0;
389 	/* RRIP */
390 	else if (CD9660_IS_COMMAND_ARG_DUAL(var, "R", "rockridge"))
391 		diskStructure.rock_ridge_enabled = 1;
392 	else if (CD9660_IS_COMMAND_ARG_DUAL(var, "A", "archimedes"))
393 		diskStructure.archimedes_enabled = 1;
394 	else if (CD9660_IS_COMMAND_ARG(var, "chrp-boot"))
395 		diskStructure.chrp_boot = 1;
396 	else if (CD9660_IS_COMMAND_ARG_DUAL(var, "K", "keep-bad-images"))
397 		diskStructure.keep_bad_images = 1;
398 	else if (CD9660_IS_COMMAND_ARG(var, "allow-deep-trees"))
399 		diskStructure.allow_deep_trees = 1;
400 	else if (CD9660_IS_COMMAND_ARG(var, "allow-max-name"))
401 		diskStructure.allow_max_name = 1;
402 	else if (CD9660_IS_COMMAND_ARG(var, "allow-illegal-chars"))
403 		diskStructure.allow_illegal_chars = 1;
404 	else if (CD9660_IS_COMMAND_ARG(var, "allow-lowercase"))
405 		diskStructure.allow_lowercase = 1;
406 	else if (CD9660_IS_COMMAND_ARG(var,"allow-multidot"))
407 		diskStructure.allow_multidot = 1;
408 	else if (CD9660_IS_COMMAND_ARG(var, "omit-trailing-period"))
409 		diskStructure.omit_trailing_period = 1;
410 	else if (CD9660_IS_COMMAND_ARG(var, "no-emul-boot") ||
411 		 CD9660_IS_COMMAND_ARG(var, "no-boot") ||
412 		 CD9660_IS_COMMAND_ARG(var, "hard-disk-boot")) {
413 		cd9660_eltorito_add_boot_option(var, 0);
414 
415 		/* End of flag variables */
416         } else if (CD9660_IS_COMMAND_ARG(var, "boot-load-segment")) {
417 		if (val == NULL) {
418 			warnx("Option `%s' doesn't contain a value", var);
419 			rv = 0;
420 		} else {
421 			cd9660_eltorito_add_boot_option(var, val);
422 		}
423 	} else {
424 		if (val == NULL) {
425 			warnx("Option `%s' doesn't contain a value", var);
426 			rv = 0;
427 		} else
428 			rv = set_option(cd9660_options, var, val);
429 	}
430 
431 	free(var);
432 	return (rv);
433 }
434 
435 /*
436  * Main function for cd9660_makefs
437  * Builds the ISO image file
438  * @param const char *image The image filename to create
439  * @param const char *dir The directory that is being read
440  * @param struct fsnode *root The root node of the filesystem tree
441  * @param struct fsinfo_t *fsopts Any options
442  */
443 void
444 cd9660_makefs(const char *image, const char *dir, fsnode *root,
445 	      fsinfo_t *fsopts)
446 {
447 	int64_t startoffset;
448 	int numDirectories;
449 	uint64_t pathTableSectors;
450 	int64_t firstAvailableSector;
451 	int64_t totalSpace;
452 	int error;
453 	cd9660node *real_root;
454 
455 	if (diskStructure.verbose_level > 0)
456 		printf("cd9660_makefs: ISO level is %i\n",
457 		    diskStructure.isoLevel);
458 	if (diskStructure.isoLevel < 2 &&
459 	    diskStructure.allow_multidot)
460 		errx(1, "allow-multidot requires iso level of 2\n");
461 
462 	assert(image != NULL);
463 	assert(dir != NULL);
464 	assert(root != NULL);
465 
466 	if (diskStructure.displayHelp) {
467 		/*
468 		 * Display help here - probably want to put it in
469 		 * a separate function
470 		 */
471 		return;
472 	}
473 
474 	if (diskStructure.verbose_level > 0)
475 		printf("cd9660_makefs: image %s directory %s root %p\n",
476 		    image, dir, root);
477 
478 	/* Set up some constants. Later, these will be defined with options */
479 
480 	/* Counter needed for path tables */
481 	numDirectories = 0;
482 
483 	/* Convert tree to our own format */
484 	/* Actually, we now need to add the REAL root node, at level 0 */
485 
486 	real_root = cd9660_allocate_cd9660node();
487 	if ((real_root->isoDirRecord =
488 		malloc( sizeof(iso_directory_record_cd9660) )) == NULL) {
489 		CD9660_MEM_ALLOC_ERROR("cd9660_makefs");
490 		exit(1);
491 	}
492 
493 	/* Leave filename blank for root */
494 	memset(real_root->isoDirRecord->name, 0,
495 	    ISO_FILENAME_MAXLENGTH_WITH_PADDING);
496 
497 	real_root->level = 0;
498 	diskStructure.rootNode = real_root;
499 	real_root->type = CD9660_TYPE_DIR;
500 	error = 0;
501 	real_root->node = root;
502 	cd9660_convert_structure(root, real_root, 1, &numDirectories, &error);
503 
504 	if (TAILQ_EMPTY(&real_root->cn_children)) {
505 		errx(1, "cd9660_makefs: converted directory is empty. "
506 			"Tree conversion failed\n");
507 	} else if (error != 0) {
508 		errx(1, "cd9660_makefs: tree conversion failed\n");
509 	} else {
510 		if (diskStructure.verbose_level > 0)
511 			printf("cd9660_makefs: tree converted\n");
512 	}
513 
514 	/* Add the dot and dot dot records */
515 	cd9660_add_dot_records(real_root);
516 
517 	cd9660_setup_root_node();
518 
519 	if (diskStructure.verbose_level > 0)
520 		printf("cd9660_makefs: done converting tree\n");
521 
522 	/* non-SUSP extensions */
523 	if (diskStructure.archimedes_enabled)
524 		archimedes_convert_tree(diskStructure.rootNode);
525 
526 	/* Rock ridge / SUSP init pass */
527 	if (diskStructure.rock_ridge_enabled) {
528 		cd9660_susp_initialize(diskStructure.rootNode,
529 		    diskStructure.rootNode, NULL);
530 	}
531 
532 	/* Build path table structure */
533 	diskStructure.pathTableLength = cd9660_generate_path_table();
534 
535 	pathTableSectors = CD9660_BLOCKS(diskStructure.sectorSize,
536 		diskStructure.pathTableLength);
537 
538 	firstAvailableSector = cd9660_setup_volume_descriptors();
539 	if (diskStructure.is_bootable) {
540 		firstAvailableSector = cd9660_setup_boot(firstAvailableSector);
541 		if (firstAvailableSector < 0)
542 			errx(1, "setup_boot failed");
543 	}
544 	/* LE first, then BE */
545 	diskStructure.primaryLittleEndianTableSector = firstAvailableSector;
546 	diskStructure.primaryBigEndianTableSector =
547 		diskStructure.primaryLittleEndianTableSector + pathTableSectors;
548 
549 	/* Set the secondary ones to -1, not going to use them for now */
550 	diskStructure.secondaryBigEndianTableSector = -1;
551 	diskStructure.secondaryLittleEndianTableSector = -1;
552 
553 	diskStructure.dataFirstSector =
554 	    diskStructure.primaryBigEndianTableSector + pathTableSectors;
555 	if (diskStructure.verbose_level > 0)
556 		printf("cd9660_makefs: Path table conversion complete. "
557 		       "Each table is %i bytes, or %" PRIu64 " sectors.\n",
558 		    diskStructure.pathTableLength, pathTableSectors);
559 
560 	startoffset = diskStructure.sectorSize*diskStructure.dataFirstSector;
561 
562 	totalSpace = cd9660_compute_offsets(real_root, startoffset);
563 
564 	diskStructure.totalSectors = diskStructure.dataFirstSector +
565 		CD9660_BLOCKS(diskStructure.sectorSize, totalSpace);
566 
567 	/* Disabled until pass 1 is done */
568 	if (diskStructure.rock_ridge_enabled) {
569 		diskStructure.susp_continuation_area_start_sector =
570 		    diskStructure.totalSectors;
571 		diskStructure.totalSectors +=
572 		    CD9660_BLOCKS(diskStructure.sectorSize,
573 			diskStructure.susp_continuation_area_size);
574 		cd9660_susp_finalize(diskStructure.rootNode);
575 	}
576 
577 
578 	cd9660_finalize_PVD();
579 
580 	/* Add padding sectors, just for testing purposes right now */
581 	/* diskStructure.totalSectors+=150; */
582 
583 	/* Debugging output */
584 	if (diskStructure.verbose_level > 0) {
585 		printf("cd9660_makefs: Sectors 0-15 reserved\n");
586 		printf("cd9660_makefs: Primary path tables starts in sector %"
587 		    PRId64 "\n", diskStructure.primaryLittleEndianTableSector);
588 		printf("cd9660_makefs: File data starts in sector %"
589 		    PRId64 "\n", diskStructure.dataFirstSector);
590 		printf("cd9660_makefs: Total sectors: %"
591 		    PRId64 "\n", diskStructure.totalSectors);
592 	}
593 
594 	/*
595 	 * Add padding sectors at the end
596 	 * TODO: Clean this up and separate padding
597 	 */
598 	if (diskStructure.include_padding_areas)
599 		diskStructure.totalSectors += 150;
600 
601 	cd9660_write_image(image);
602 
603 	if (diskStructure.verbose_level > 1) {
604 		debug_print_volume_descriptor_information();
605 		debug_print_tree(real_root,0);
606 		debug_print_path_tree(real_root);
607 	}
608 
609 	/* Clean up data structures */
610 	cd9660_free_structure(real_root);
611 
612 	if (diskStructure.verbose_level > 0)
613 		printf("cd9660_makefs: done\n");
614 }
615 
616 /* Generic function pointer - implement later */
617 typedef int (*cd9660node_func)(cd9660node *);
618 
619 static void
620 cd9660_finalize_PVD(void)
621 {
622 	time_t tim;
623 
624 	/* root should be a fixed size of 34 bytes since it has no name */
625 	memcpy(diskStructure.primaryDescriptor.root_directory_record,
626 		diskStructure.rootNode->dot_record->isoDirRecord, 34);
627 
628 	/* In RRIP, this might be longer than 34 */
629 	diskStructure.primaryDescriptor.root_directory_record[0] = 34;
630 
631 	/* Set up all the important numbers in the PVD */
632 	cd9660_bothendian_dword(diskStructure.totalSectors,
633 	    (unsigned char *)diskStructure.primaryDescriptor.volume_space_size);
634 	cd9660_bothendian_word(1,
635 	    (unsigned char *)diskStructure.primaryDescriptor.volume_set_size);
636 	cd9660_bothendian_word(1,
637 	    (unsigned char *)
638 		diskStructure.primaryDescriptor.volume_sequence_number);
639 	cd9660_bothendian_word(diskStructure.sectorSize,
640 	    (unsigned char *)
641 		diskStructure.primaryDescriptor.logical_block_size);
642 	cd9660_bothendian_dword(diskStructure.pathTableLength,
643 	    (unsigned char *)diskStructure.primaryDescriptor.path_table_size);
644 
645 	cd9660_731(diskStructure.primaryLittleEndianTableSector,
646 		(u_char *)diskStructure.primaryDescriptor.type_l_path_table);
647 	cd9660_732(diskStructure.primaryBigEndianTableSector,
648 		(u_char *)diskStructure.primaryDescriptor.type_m_path_table);
649 
650 	diskStructure.primaryDescriptor.file_structure_version[0] = 1;
651 
652 	/* Pad all strings with spaces instead of nulls */
653 	cd9660_pad_string_spaces(diskStructure.primaryDescriptor.volume_id, 32);
654 	cd9660_pad_string_spaces(diskStructure.primaryDescriptor.system_id, 32);
655 	cd9660_pad_string_spaces(diskStructure.primaryDescriptor.volume_set_id,
656 	    128);
657 	cd9660_pad_string_spaces(diskStructure.primaryDescriptor.publisher_id,
658 	    128);
659 	cd9660_pad_string_spaces(diskStructure.primaryDescriptor.preparer_id,
660 	    128);
661 	cd9660_pad_string_spaces(diskStructure.primaryDescriptor.application_id,
662 	    128);
663 	cd9660_pad_string_spaces(
664 	    diskStructure.primaryDescriptor.copyright_file_id, 37);
665 	cd9660_pad_string_spaces(
666 		diskStructure.primaryDescriptor.abstract_file_id, 37);
667 	cd9660_pad_string_spaces(
668 		diskStructure.primaryDescriptor.bibliographic_file_id, 37);
669 
670 	/* Setup dates */
671 	time(&tim);
672 	cd9660_time_8426(
673 	    (unsigned char *)diskStructure.primaryDescriptor.creation_date,
674 	    tim);
675 	cd9660_time_8426(
676 	    (unsigned char *)diskStructure.primaryDescriptor.modification_date,
677 	    tim);
678 
679 	/*
680 	cd9660_set_date(diskStructure.primaryDescriptor.expiration_date, now);
681 	*/
682 
683 	memset(diskStructure.primaryDescriptor.expiration_date, '0', 16);
684 	diskStructure.primaryDescriptor.expiration_date[16] = 0;
685 	cd9660_time_8426(
686 	    (unsigned char *)diskStructure.primaryDescriptor.effective_date,
687 	    tim);
688 }
689 
690 static void
691 cd9660_populate_iso_dir_record(struct _iso_directory_record_cd9660 *record,
692 			       u_char ext_attr_length, u_char flags,
693 			       u_char name_len, const char * name)
694 {
695 	record->ext_attr_length[0] = ext_attr_length;
696 	record->flags[0] = ISO_FLAG_CLEAR | flags;
697 	record->file_unit_size[0] = 0;
698 	record->interleave[0] = 0;
699 	cd9660_bothendian_word(1, record->volume_sequence_number);
700 	record->name_len[0] = name_len;
701 	memset(record->name, '\0', sizeof (record->name));
702 	memcpy(record->name, name, name_len);
703 	record->length[0] = 33 + name_len;
704 
705 	/* Todo : better rounding */
706 	record->length[0] += (record->length[0] & 1) ? 1 : 0;
707 }
708 
709 static void
710 cd9660_setup_root_node(void)
711 {
712 	cd9660_populate_iso_dir_record(diskStructure.rootNode->isoDirRecord,
713 	    0, ISO_FLAG_DIRECTORY, 1, "\0");
714 
715 }
716 
717 /*********** SUPPORT FUNCTIONS ***********/
718 static int
719 cd9660_setup_volume_descriptors(void)
720 {
721 	/* Boot volume descriptor should come second */
722 	int sector = 16;
723 	/* For now, a fixed 2 : PVD and terminator */
724 	volume_descriptor *temp, *t;
725 
726 	/* Set up the PVD */
727 	if ((temp = malloc(sizeof(volume_descriptor))) == NULL) {
728 		CD9660_MEM_ALLOC_ERROR("cd9660_setup_volume_descriptors");
729 		exit(1);
730 	}
731 
732 	temp->volumeDescriptorData =
733 	   (unsigned char *)&diskStructure.primaryDescriptor;
734 	temp->volumeDescriptorData[0] = ISO_VOLUME_DESCRIPTOR_PVD;
735 	temp->volumeDescriptorData[6] = 1;
736 	temp->sector = sector;
737 	memcpy(temp->volumeDescriptorData + 1,
738 	    ISO_VOLUME_DESCRIPTOR_STANDARD_ID, 5);
739 	diskStructure.firstVolumeDescriptor = temp;
740 
741 	sector++;
742 	/* Set up boot support if enabled. BVD must reside in sector 17 */
743 	if (diskStructure.is_bootable) {
744 		if ((t = malloc(sizeof(volume_descriptor))) == NULL) {
745 			CD9660_MEM_ALLOC_ERROR(
746 			    "cd9660_setup_volume_descriptors");
747 			exit(1);
748 		}
749 		if ((t->volumeDescriptorData = malloc(2048)) == NULL) {
750 			CD9660_MEM_ALLOC_ERROR(
751 			    "cd9660_setup_volume_descriptors");
752 			exit(1);
753 		}
754 		temp->next = t;
755 		temp = t;
756 		memset(t->volumeDescriptorData, 0, 2048);
757 		t->sector = 17;
758 		if (diskStructure.verbose_level > 0)
759 			printf("Setting up boot volume descriptor\n");
760 		cd9660_setup_boot_volume_descriptor(t);
761 		sector++;
762 	}
763 
764 	/* Set up the terminator */
765 	if ((t = malloc(sizeof(volume_descriptor))) == NULL) {
766 		CD9660_MEM_ALLOC_ERROR("cd9660_setup_volume_descriptors");
767 		exit(1);
768 	}
769 	if ((t->volumeDescriptorData = malloc(2048)) == NULL) {
770 		CD9660_MEM_ALLOC_ERROR("cd9660_setup_volume_descriptors");
771 		exit(1);
772 	}
773 
774 	temp->next = t;
775 	memset(t->volumeDescriptorData, 0, 2048);
776 	t->volumeDescriptorData[0] = ISO_VOLUME_DESCRIPTOR_TERMINATOR;
777 	t->next = 0;
778 	t->volumeDescriptorData[6] = 1;
779 	t->sector = sector;
780 	memcpy(t->volumeDescriptorData + 1,
781 	    ISO_VOLUME_DESCRIPTOR_STANDARD_ID, 5);
782 
783 	sector++;
784 	return sector;
785 }
786 
787 #if 0
788 /*
789  * Populate EAR at some point. Not required, but is used by NetBSD's
790  * cd9660 support
791  */
792 static int
793 cd9660_fill_extended_attribute_record(cd9660node *node)
794 {
795 	if ((node->isoExtAttributes =
796 	    malloc(sizeof(struct iso_extended_attributes))) == NULL) {
797 		CD9660_MEM_ALLOC_ERROR("cd9660_fill_extended_attribute_record");
798 		exit(1);
799 	};
800 
801 	return 1;
802 }
803 #endif
804 
805 static int
806 cd9660_translate_node_common(cd9660node *newnode)
807 {
808 	time_t tim;
809 	int test;
810 	u_char flag;
811 	char temp[ISO_FILENAME_MAXLENGTH_WITH_PADDING];
812 
813 	/* Now populate the isoDirRecord structure */
814 	memset(temp, 0, ISO_FILENAME_MAXLENGTH_WITH_PADDING);
815 
816 	test = cd9660_convert_filename(newnode->node->name,
817 		temp, !(S_ISDIR(newnode->node->type)));
818 
819 	flag = ISO_FLAG_CLEAR;
820 	if (S_ISDIR(newnode->node->type))
821 		flag |= ISO_FLAG_DIRECTORY;
822 
823 	cd9660_populate_iso_dir_record(newnode->isoDirRecord, 0,
824 	    flag, strlen(temp), temp);
825 
826 	/* Set the various dates */
827 
828 	/* If we want to use the current date and time */
829 	time(&tim);
830 
831 	cd9660_time_915(newnode->isoDirRecord->date, tim);
832 
833 	cd9660_bothendian_dword(newnode->fileDataLength,
834 	    newnode->isoDirRecord->size);
835 	/* If the file is a link, we want to set the size to 0 */
836 	if (S_ISLNK(newnode->node->type))
837 		newnode->fileDataLength = 0;
838 
839 	return 1;
840 }
841 
842 /*
843  * Translate fsnode to cd9660node
844  * Translate filenames and other metadata, including dates, sizes,
845  * permissions, etc
846  * @param struct fsnode * The node generated by makefs
847  * @param struct cd9660node * The intermediate node to be written to
848  * @returns int 0 on failure, 1 on success
849  */
850 static int
851 cd9660_translate_node(fsnode *node, cd9660node *newnode)
852 {
853 	if (node == NULL) {
854 		if (diskStructure.verbose_level > 0)
855 			printf("cd9660_translate_node: NULL node passed, "
856 			       "returning\n");
857 		return 0;
858 	}
859 	if ((newnode->isoDirRecord =
860 		malloc(sizeof(iso_directory_record_cd9660))) == NULL) {
861 		CD9660_MEM_ALLOC_ERROR("cd9660_translate_node");
862 		return 0;
863 	}
864 
865 	/* Set the node pointer */
866 	newnode->node = node;
867 
868 	/* Set the size */
869 	if (!(S_ISDIR(node->type)))
870 		newnode->fileDataLength = node->inode->st.st_size;
871 
872 	if (cd9660_translate_node_common(newnode) == 0)
873 		return 0;
874 
875 	/* Finally, overwrite some of the values that are set by default */
876 	cd9660_time_915(newnode->isoDirRecord->date, node->inode->st.st_mtime);
877 
878 	return 1;
879 }
880 
881 /*
882  * Compares two ISO filenames
883  * @param const char * The first file name
884  * @param const char * The second file name
885  * @returns : -1 if first is less than second, 0 if they are the same, 1 if
886  * 	the second is greater than the first
887  */
888 static int
889 cd9660_compare_filename(const char *first, const char *second)
890 {
891 	/*
892 	 * This can be made more optimal once it has been tested
893 	 * (the extra character, for example, is for testing)
894 	 */
895 
896 	int p1 = 0;
897 	int p2 = 0;
898 	char c1, c2;
899 	/* First, on the filename */
900 
901 	while (p1 < ISO_FILENAME_MAXLENGTH_BEFORE_VERSION-1
902 		&& p2 < ISO_FILENAME_MAXLENGTH_BEFORE_VERSION-1) {
903 		c1 = first[p1];
904 		c2 = second[p2];
905 		if (c1 == '.' && c2 =='.')
906 			break;
907 		else if (c1 == '.') {
908 			p2++;
909 			c1 = ' ';
910 		} else if (c2 == '.') {
911 			p1++;
912 			c2 = ' ';
913 		} else {
914 			p1++;
915 			p2++;
916 		}
917 
918 		if (c1 < c2)
919 			return -1;
920 		else if (c1 > c2) {
921 			return 1;
922 		}
923 	}
924 
925 	if (first[p1] == '.' && second[p2] == '.') {
926 		p1++;
927 		p2++;
928 		while (p1 < ISO_FILENAME_MAXLENGTH_BEFORE_VERSION - 1
929 			&& p2 < ISO_FILENAME_MAXLENGTH_BEFORE_VERSION - 1) {
930 			c1 = first[p1];
931 			c2 = second[p2];
932 			if (c1 == ';' && c2 == ';')
933 				break;
934 			else if (c1 == ';') {
935 				p2++;
936 				c1 = ' ';
937 			} else if (c2 == ';') {
938 				p1++;
939 				c2 = ' ';
940 			} else {
941 				p1++;
942 				p2++;
943 			}
944 
945 			if (c1 < c2)
946 				return -1;
947 			else if (c1 > c2)
948 				return 1;
949 		}
950 	}
951 	return 0;
952 }
953 
954 /*
955  * Insert a node into list with ISO sorting rules
956  * @param cd9660node * The head node of the list
957  * @param cd9660node * The node to be inserted
958  */
959 static void
960 cd9660_sorted_child_insert(cd9660node *parent, cd9660node *cn_new)
961 {
962 	int compare;
963 	cd9660node *cn;
964 	struct cd9660_children_head *head = &parent->cn_children;
965 
966 	/* TODO: Optimize? */
967 	cn_new->parent = parent;
968 
969 	/*
970 	 * first will either be 0, the . or the ..
971 	 * if . or .., this means no other entry may be written before first
972 	 * if 0, the new node may be inserted at the head
973 	 */
974 
975 	TAILQ_FOREACH(cn, head, cn_next_child) {
976 		/*
977 		 * Dont insert a node twice -
978 		 * that would cause an infinite loop
979 		 */
980 		if (cn_new == cn)
981 			return;
982 
983 		compare = cd9660_compare_filename(cn_new->isoDirRecord->name,
984 			cn->isoDirRecord->name);
985 
986 		if (compare == 0)
987 			compare = cd9660_compare_filename(cn_new->node->name,
988 				cn->node->name);
989 
990 		if (compare < 0)
991 			break;
992 	}
993 	if (cn == NULL)
994 		TAILQ_INSERT_TAIL(head, cn_new, cn_next_child);
995 	else
996 		TAILQ_INSERT_BEFORE(cn, cn_new, cn_next_child);
997 }
998 
999 /*
1000  * Called After cd9660_sorted_child_insert
1001  * handles file collisions by suffixing each filname with ~n
1002  * where n represents the files respective place in the ordering
1003  */
1004 static int
1005 cd9660_handle_collisions(cd9660node *colliding, int past)
1006 {
1007 	cd9660node *iter, *next, *prev;
1008 	int skip;
1009 	int delete_chars = 0;
1010 	int temp_past = past;
1011 	int temp_skip;
1012 	int flag = 0;
1013 	cd9660node *end_of_range;
1014 
1015 	for (iter = TAILQ_FIRST(&colliding->cn_children);
1016 	     iter != NULL && (next = TAILQ_NEXT(iter, cn_next_child)) != NULL;) {
1017 		if (strcmp(iter->isoDirRecord->name,
1018 		           next->isoDirRecord->name) != 0) {
1019 			iter = TAILQ_NEXT(iter, cn_next_child);
1020 			continue;
1021 		}
1022 		flag = 1;
1023 		temp_skip = skip = cd9660_count_collisions(iter);
1024 		end_of_range = iter;
1025 		while (temp_skip > 0) {
1026 			temp_skip--;
1027 			end_of_range = TAILQ_NEXT(end_of_range, cn_next_child);
1028 		}
1029 		temp_past = past;
1030 		while (temp_past > 0) {
1031 			if ((next = TAILQ_NEXT(end_of_range, cn_next_child)) != NULL)
1032 				end_of_range = next;
1033 			else if ((prev = TAILQ_PREV(iter, cd9660_children_head, cn_next_child)) != NULL)
1034 				iter = prev;
1035 			else
1036 				delete_chars++;
1037 			temp_past--;
1038 		}
1039 		skip += past;
1040 		iter = cd9660_rename_filename(iter, skip, delete_chars);
1041 	}
1042 	return flag;
1043 }
1044 
1045 
1046 static cd9660node *
1047 cd9660_rename_filename(cd9660node *iter, int num, int delete_chars)
1048 {
1049 	int i = 0;
1050 	int numbts, digit, digits, temp, powers, count;
1051 	char *naming;
1052 	int maxlength;
1053         char *tmp;
1054 
1055 	if (diskStructure.verbose_level > 0)
1056 		printf("Rename_filename called\n");
1057 
1058 	assert(1 <= diskStructure.isoLevel && diskStructure.isoLevel <= 2);
1059 	/* TODO : A LOT of chanes regarding 8.3 filenames */
1060 	if (diskStructure.isoLevel == 1)
1061 		maxlength = 8;
1062 	else if (diskStructure.isoLevel == 2)
1063 		maxlength = 31;
1064 	else
1065 		maxlength = ISO_FILENAME_MAXLENGTH_BEFORE_VERSION;
1066 
1067 	tmp = malloc(ISO_FILENAME_MAXLENGTH_WITH_PADDING);
1068 
1069 	while (i < num) {
1070 		powers = 1;
1071 		count = 0;
1072 		digits = 1;
1073 		while (((int)(i / powers) ) >= 10) {
1074 			digits++;
1075 			powers = powers * 10;
1076 		}
1077 
1078 		naming = iter->o_name;
1079 
1080 		/*
1081 		while ((*naming != '.') && (*naming != ';')) {
1082 			naming++;
1083 			count++;
1084 		}
1085 		*/
1086 
1087 		while (count < maxlength) {
1088 			if (*naming == ';')
1089 				break;
1090 			naming++;
1091 			count++;
1092 		}
1093 
1094 		if ((count + digits) < maxlength)
1095 			numbts = count;
1096 		else
1097 			numbts = maxlength - (digits);
1098 		numbts -= delete_chars;
1099 
1100 		/* 8.3 rules - keep the extension, add before the dot */
1101 
1102 		/*
1103 		 * This code makes a bunch of assumptions.
1104 		 * See if you can spot them all :)
1105 		 */
1106 
1107 		/*
1108 		if (diskStructure.isoLevel == 1) {
1109 			numbts = 8 - digits - delete_chars;
1110 			if (dot < 0) {
1111 
1112 			} else {
1113 				if (dot < 8) {
1114 					memmove(&tmp[numbts],&tmp[dot],4);
1115 				}
1116 			}
1117 		}
1118 		*/
1119 
1120 		/* (copying just the filename before the '.' */
1121 		memcpy(tmp, (iter->o_name), numbts);
1122 
1123 		/* adding the appropriate number following the name */
1124 		temp = i;
1125 		while (digits > 0) {
1126 			digit = (int)(temp / powers);
1127 			temp = temp - digit * powers;
1128 			sprintf(&tmp[numbts] , "%d", digit);
1129 			digits--;
1130 			numbts++;
1131 			powers = powers / 10;
1132 		}
1133 
1134 		while ((*naming != ';')  && (numbts < maxlength)) {
1135 			tmp[numbts] = (*naming);
1136 			naming++;
1137 			numbts++;
1138 		}
1139 
1140 		tmp[numbts] = ';';
1141 		tmp[numbts+1] = '1';
1142 		tmp[numbts+2] = '\0';
1143 
1144 		/*
1145 		 * now tmp has exactly the identifier
1146 		 * we want so we'll copy it back to record
1147 		 */
1148 		memcpy((iter->isoDirRecord->name), tmp, numbts + 3);
1149 
1150 		iter = TAILQ_NEXT(iter, cn_next_child);
1151 		i++;
1152 	}
1153 
1154 	free(tmp);
1155 	return iter;
1156 }
1157 
1158 /* Todo: Figure out why these functions are nec. */
1159 static void
1160 cd9660_copy_filenames(cd9660node *node)
1161 {
1162 	cd9660node *cn;
1163 
1164 	if (TAILQ_EMPTY(&node->cn_children))
1165 		return;
1166 
1167 	if (TAILQ_FIRST(&node->cn_children)->isoDirRecord == NULL) {
1168 		debug_print_tree(diskStructure.rootNode, 0);
1169 		exit(1);
1170 	}
1171 
1172 	TAILQ_FOREACH(cn, &node->cn_children, cn_next_child) {
1173 		cd9660_copy_filenames(cn);
1174 		memcpy(cn->o_name, cn->isoDirRecord->name,
1175 		    ISO_FILENAME_MAXLENGTH_WITH_PADDING);
1176 	}
1177 }
1178 
1179 static void
1180 cd9660_sorting_nodes(cd9660node *node)
1181 {
1182 	cd9660node *cn;
1183 
1184 	TAILQ_FOREACH(cn, &node->cn_children, cn_next_child)
1185 		cd9660_sorting_nodes(cn);
1186 	cd9660_sort_nodes(node);
1187 }
1188 
1189 /* XXX Bubble sort. */
1190 static void
1191 cd9660_sort_nodes(cd9660node *node)
1192 {
1193 	cd9660node *cn, *next;
1194 
1195 	do {
1196 		TAILQ_FOREACH(cn, &node->cn_children, cn_next_child) {
1197 			if ((next = TAILQ_NEXT(cn, cn_next_child)) == NULL)
1198 				return;
1199 			else if (strcmp(next->isoDirRecord->name,
1200 				        cn->isoDirRecord->name) >= 0)
1201 				continue;
1202 			TAILQ_REMOVE(&node->cn_children, next, cn_next_child);
1203 			TAILQ_INSERT_BEFORE(cn, next, cn_next_child);
1204 			break;
1205 		}
1206 	} while (cn != NULL);
1207 }
1208 
1209 static int
1210 cd9660_count_collisions(cd9660node *copy)
1211 {
1212 	int count = 0;
1213 	cd9660node *iter, *next;
1214 
1215 	for (iter = copy;
1216 	     (next = TAILQ_NEXT(iter, cn_next_child)) != NULL;
1217 	     iter = next) {
1218 		if (cd9660_compare_filename(iter->isoDirRecord->name,
1219 			next->isoDirRecord->name) == 0)
1220 			count++;
1221 		else
1222 			return count;
1223 	}
1224 #if 0
1225 	if ((next = TAILQ_NEXT(iter, cn_next_child)) != NULL) {
1226 		printf("cd9660_recurse_on_collision: count is %i \n", count);
1227 		compare = cd9660_compare_filename(iter->isoDirRecord->name,
1228 			next->isoDirRecord->name);
1229 		if (compare == 0) {
1230 			count++;
1231 			return cd9660_recurse_on_collision(next, count);
1232 		} else
1233 			return count;
1234 	}
1235 #endif
1236 	return count;
1237 }
1238 
1239 static cd9660node *
1240 cd9660_rrip_move_directory(cd9660node *dir)
1241 {
1242 	char newname[9];
1243 	cd9660node *tfile;
1244 
1245 	/*
1246 	 * This function needs to:
1247 	 * 1) Create an empty virtual file in place of the old directory
1248 	 * 2) Point the virtual file to the new directory
1249 	 * 3) Point the relocated directory to its old parent
1250 	 * 4) Move the directory specified by dir into rr_moved_dir,
1251 	 * and rename it to "diskStructure.rock_ridge_move_count" (as a string)
1252 	 */
1253 
1254 	/* First see if the moved directory even exists */
1255 	if (diskStructure.rr_moved_dir == NULL) {
1256 		diskStructure.rr_moved_dir =
1257 			cd9660_create_directory(ISO_RRIP_DEFAULT_MOVE_DIR_NAME,
1258 				diskStructure.rootNode, dir);
1259 		if (diskStructure.rr_moved_dir == NULL)
1260 			return 0;
1261 	}
1262 
1263 	/* Create a file with the same ORIGINAL name */
1264 	tfile = cd9660_create_file(dir->node->name, dir->parent, dir);
1265 	if (tfile == NULL)
1266 		return NULL;
1267 
1268 	diskStructure.rock_ridge_move_count++;
1269 	snprintf(newname, sizeof(newname), "%08i",
1270 	    diskStructure.rock_ridge_move_count);
1271 
1272 	/* Point to old parent */
1273 	dir->rr_real_parent = dir->parent;
1274 
1275 	/* Place the placeholder file */
1276 	if (TAILQ_EMPTY(&dir->rr_real_parent->cn_children)) {
1277 		TAILQ_INSERT_HEAD(&dir->rr_real_parent->cn_children, tfile,
1278 		    cn_next_child);
1279 	} else {
1280 		cd9660_sorted_child_insert(dir->rr_real_parent, tfile);
1281 	}
1282 
1283 	/* Point to new parent */
1284 	dir->parent = diskStructure.rr_moved_dir;
1285 
1286 	/* Point the file to the moved directory */
1287 	tfile->rr_relocated = dir;
1288 
1289 	/* Actually move the directory */
1290 	cd9660_sorted_child_insert(diskStructure.rr_moved_dir, dir);
1291 
1292 	/* TODO: Inherit permissions / ownership (basically the entire inode) */
1293 
1294 	/* Set the new name */
1295 	memset(dir->isoDirRecord->name, 0, ISO_FILENAME_MAXLENGTH_WITH_PADDING);
1296 	strncpy(dir->isoDirRecord->name, newname, 8);
1297 	dir->isoDirRecord->length[0] = 34 + 8;
1298 	dir->isoDirRecord->name_len[0] = 8;
1299 
1300 	return dir;
1301 }
1302 
1303 static int
1304 cd9660_add_dot_records(cd9660node *root)
1305 {
1306 	struct cd9660_children_head *head = &root->cn_children;
1307 	cd9660node *cn;
1308 
1309 	TAILQ_FOREACH(cn, head, cn_next_child) {
1310 		if ((cn->type & CD9660_TYPE_DIR) == 0)
1311 			continue;
1312 		/* Recursion first */
1313 		cd9660_add_dot_records(cn);
1314 	}
1315 	cd9660_create_special_directory(CD9660_TYPE_DOT, root);
1316 	cd9660_create_special_directory(CD9660_TYPE_DOTDOT, root);
1317 	return 1;
1318 }
1319 
1320 /*
1321  * Convert node to cd9660 structure
1322  * This function is designed to be called recursively on the root node of
1323  * the filesystem
1324  * Lots of recursion going on here, want to make sure it is efficient
1325  * @param struct fsnode * The root node to be converted
1326  * @param struct cd9660* The parent node (should not be NULL)
1327  * @param int Current directory depth
1328  * @param int* Running count of the number of directories that are being created
1329  */
1330 static void
1331 cd9660_convert_structure(fsnode *root, cd9660node *parent_node, int level,
1332 			 int *numDirectories, int *error)
1333 {
1334 	fsnode *iterator = root;
1335 	cd9660node *this_node;
1336 	int working_level;
1337 	int add;
1338 	int flag = 0;
1339 	int counter = 0;
1340 
1341 	/*
1342 	 * Newer, more efficient method, reduces recursion depth
1343 	 */
1344 	if (root == NULL) {
1345 		warnx("%s: root is null\n", __func__);
1346 		return;
1347 	}
1348 
1349 	/* Test for an empty directory - makefs still gives us the . record */
1350 	if ((S_ISDIR(root->type)) && (root->name[0] == '.')
1351 		&& (root->name[1] == '\0')) {
1352 		root = root->next;
1353 		if (root == NULL)
1354 			return;
1355 	}
1356 	if ((this_node = cd9660_allocate_cd9660node()) == NULL) {
1357 		CD9660_MEM_ALLOC_ERROR(__func__);
1358 	}
1359 
1360 	/*
1361 	 * To reduce the number of recursive calls, we will iterate over
1362 	 * the next pointers to the right.
1363 	 */
1364 	while (iterator != NULL) {
1365 		add = 1;
1366 		/*
1367 		 * Increment the directory count if this is a directory
1368 		 * Ignore "." entries. We will generate them later
1369 		 */
1370 		if (!S_ISDIR(iterator->type) ||
1371 		    strcmp(iterator->name, ".") != 0) {
1372 
1373 			/* Translate the node, including its filename */
1374 			this_node->parent = parent_node;
1375 			cd9660_translate_node(iterator, this_node);
1376 			this_node->level = level;
1377 
1378 			if (S_ISDIR(iterator->type)) {
1379 				(*numDirectories)++;
1380 				this_node->type = CD9660_TYPE_DIR;
1381 				working_level = level + 1;
1382 
1383 				/*
1384 				 * If at level 8, directory would be at 8
1385 				 * and have children at 9 which is not
1386 				 * allowed as per ISO spec
1387 				 */
1388 				if (level == 8) {
1389 					if ((!diskStructure.allow_deep_trees) &&
1390 					  (!diskStructure.rock_ridge_enabled)) {
1391 						warnx("error: found entry "
1392 						     "with depth greater "
1393 						     "than 8.");
1394 						(*error) = 1;
1395 						return;
1396 					} else if (diskStructure.
1397 						   rock_ridge_enabled) {
1398 						working_level = 3;
1399 						/*
1400 						 * Moved directory is actually
1401 						 * at level 2.
1402 						 */
1403 						this_node->level =
1404 						    working_level - 1;
1405 						if (cd9660_rrip_move_directory(
1406 							this_node) == 0) {
1407 							warnx("Failure in "
1408 							      "cd9660_rrip_"
1409 							      "move_directory"
1410 							);
1411 							(*error) = 1;
1412 							return;
1413 						}
1414 						add = 0;
1415 					}
1416 				}
1417 
1418 				/* Do the recursive call on the children */
1419 				if (iterator->child != 0) {
1420 					cd9660_convert_structure(
1421 					    iterator->child, this_node,
1422 						working_level,
1423 						numDirectories, error);
1424 
1425 					if ((*error) == 1) {
1426 						warnx("%s: Error on recursive "
1427 						    "call", __func__);
1428 						return;
1429 					}
1430 				}
1431 
1432 			} else {
1433 				/* Only directories should have children */
1434 				assert(iterator->child == NULL);
1435 
1436 				this_node->type = CD9660_TYPE_FILE;
1437 			}
1438 
1439 			/*
1440 			 * Finally, do a sorted insert
1441 			 */
1442 			if (add) {
1443 				cd9660_sorted_child_insert(
1444 				    parent_node, this_node);
1445 			}
1446 
1447 			/*Allocate new temp_node */
1448 			if (iterator->next != 0) {
1449 				this_node = cd9660_allocate_cd9660node();
1450 				if (this_node == NULL)
1451 					CD9660_MEM_ALLOC_ERROR(__func__);
1452 			}
1453 		}
1454 		iterator = iterator->next;
1455 	}
1456 
1457 	/* cd9660_handle_collisions(first_node); */
1458 
1459 	/* TODO: need cleanup */
1460 	cd9660_copy_filenames(parent_node);
1461 
1462 	do {
1463 		flag = cd9660_handle_collisions(parent_node, counter);
1464 		counter++;
1465 		cd9660_sorting_nodes(parent_node);
1466 	} while ((flag == 1) && (counter < 100));
1467 }
1468 
1469 /*
1470  * Clean up the cd9660node tree
1471  * This is designed to be called recursively on the root node
1472  * @param struct cd9660node *root The node to free
1473  * @returns void
1474  */
1475 static void
1476 cd9660_free_structure(cd9660node *root)
1477 {
1478 	cd9660node *cn;
1479 
1480 	while ((cn = TAILQ_FIRST(&root->cn_children)) != NULL) {
1481 		TAILQ_REMOVE(&root->cn_children, cn, cn_next_child);
1482 		cd9660_free_structure(cn);
1483 	}
1484 	free(root);
1485 }
1486 
1487 /*
1488  * Be a little more memory conservative:
1489  * instead of having the TAILQ_ENTRY as part of the cd9660node,
1490  * just create a temporary structure
1491  */
1492 struct ptq_entry
1493 {
1494 	TAILQ_ENTRY(ptq_entry) ptq;
1495 	cd9660node *node;
1496 } *n;
1497 
1498 #define PTQUEUE_NEW(n,s,r,t){\
1499 	n = malloc(sizeof(struct s));	\
1500 	if (n == NULL)	\
1501 		return r; \
1502 	n->node = t;\
1503 }
1504 
1505 /*
1506  * Generate the path tables
1507  * The specific implementation of this function is left as an exercise to the
1508  * programmer. It could be done recursively. Make sure you read how the path
1509  * table has to be laid out, it has levels.
1510  * @param struct iso9660_disk *disk The disk image
1511  * @returns int The number of built path tables (between 1 and 4), 0 on failure
1512  */
1513 static int
1514 cd9660_generate_path_table(void)
1515 {
1516 	cd9660node *cn, *dirNode = diskStructure.rootNode;
1517 	cd9660node *last = dirNode;
1518 	int pathTableSize = 0;	/* computed as we go */
1519 	int counter = 1;	/* root gets a count of 0 */
1520 
1521 	TAILQ_HEAD(cd9660_pt_head, ptq_entry) pt_head;
1522 	TAILQ_INIT(&pt_head);
1523 
1524 	PTQUEUE_NEW(n, ptq_entry, -1, diskStructure.rootNode);
1525 
1526 	/* Push the root node */
1527 	TAILQ_INSERT_HEAD(&pt_head, n, ptq);
1528 
1529 	/* Breadth-first traversal of file structure */
1530 	while (pt_head.tqh_first != 0) {
1531 		n = pt_head.tqh_first;
1532 		dirNode = n->node;
1533 		TAILQ_REMOVE(&pt_head, pt_head.tqh_first, ptq);
1534 		free(n);
1535 
1536 		/* Update the size */
1537 		pathTableSize += ISO_PATHTABLE_ENTRY_BASESIZE
1538 		    + dirNode->isoDirRecord->name_len[0]+
1539 			(dirNode->isoDirRecord->name_len[0] % 2 == 0 ? 0 : 1);
1540 			/* includes the padding bit */
1541 
1542 		dirNode->ptnumber=counter;
1543 		if (dirNode != last) {
1544 			last->ptnext = dirNode;
1545 			dirNode->ptprev = last;
1546 		}
1547 		last = dirNode;
1548 
1549 		/* Push children onto queue */
1550 		TAILQ_FOREACH(cn, &dirNode->cn_children, cn_next_child) {
1551 			/*
1552 			 * Dont add the DOT and DOTDOT types to the path
1553 			 * table.
1554 			 */
1555 			if ((cn->type != CD9660_TYPE_DOT)
1556 				&& (cn->type != CD9660_TYPE_DOTDOT)) {
1557 
1558 				if (S_ISDIR(cn->node->type)) {
1559 					PTQUEUE_NEW(n, ptq_entry, -1, cn);
1560 					TAILQ_INSERT_TAIL(&pt_head, n, ptq);
1561 				}
1562 			}
1563 		}
1564 		counter++;
1565 	}
1566 	return pathTableSize;
1567 }
1568 
1569 void
1570 cd9660_compute_full_filename(cd9660node *node, char *buf)
1571 {
1572 	int len;
1573 
1574 	len = CD9660MAXPATH + 1;
1575 	len = snprintf(buf, len, "%s/%s/%s", node->node->root,
1576 	    node->node->path, node->node->name);
1577 	if (len > CD9660MAXPATH)
1578 		errx(1, "Pathname too long.");
1579 }
1580 
1581 /* NEW filename conversion method */
1582 typedef int(*cd9660_filename_conversion_functor)(const char *, char *, int);
1583 
1584 
1585 /*
1586  * TODO: These two functions are almost identical.
1587  * Some code cleanup is possible here
1588  *
1589  * XXX bounds checking!
1590  */
1591 static int
1592 cd9660_level1_convert_filename(const char *oldname, char *newname, int is_file)
1593 {
1594 	/*
1595 	 * ISO 9660 : 10.1
1596 	 * File Name shall not contain more than 8 d or d1 characters
1597 	 * File Name Extension shall not contain more than 3 d or d1 characters
1598 	 * Directory Identifier shall not contain more than 8 d or d1 characters
1599 	 */
1600 	int namelen = 0;
1601 	int extlen = 0;
1602 	int found_ext = 0;
1603 
1604 	while (*oldname != '\0' && extlen < 3) {
1605 		/* Handle period first, as it is special */
1606 		if (*oldname == '.') {
1607 			if (found_ext) {
1608 				*newname++ = '_';
1609 				extlen ++;
1610 			}
1611 			else {
1612 				*newname++ = '.';
1613 				found_ext = 1;
1614 			}
1615 		} else {
1616 			/* cut RISC OS file type off ISO name */
1617 			if (diskStructure.archimedes_enabled &&
1618 			    *oldname == ',' && strlen(oldname) == 4)
1619 				break;
1620 			/* Enforce 12.3 / 8 */
1621 			if (namelen == 8 && !found_ext)
1622 				break;
1623 
1624 			if (islower((unsigned char)*oldname))
1625 				*newname++ = toupper((unsigned char)*oldname);
1626 			else if (isupper((unsigned char)*oldname)
1627 				    || isdigit((unsigned char)*oldname))
1628 				*newname++ = *oldname;
1629 			else
1630 				*newname++ = '_';
1631 
1632 			if (found_ext)
1633 				extlen++;
1634 			else
1635 				namelen++;
1636 		}
1637 		oldname ++;
1638 	}
1639 	if (is_file) {
1640 		if (!found_ext && !diskStructure.omit_trailing_period)
1641 			*newname++ = '.';
1642 		/* Add version */
1643 		sprintf(newname, ";%i", 1);
1644 	}
1645 	return namelen + extlen + found_ext;
1646 }
1647 
1648 /* XXX bounds checking! */
1649 static int
1650 cd9660_level2_convert_filename(const char *oldname, char *newname, int is_file)
1651 {
1652 	/*
1653 	 * ISO 9660 : 7.5.1
1654 	 * File name : 0+ d or d1 characters
1655 	 * separator 1 (.)
1656 	 * File name extension : 0+ d or d1 characters
1657 	 * separator 2 (;)
1658 	 * File version number (5 characters, 1-32767)
1659 	 * 1 <= Sum of File name and File name extension <= 30
1660 	 */
1661 	int namelen = 0;
1662 	int extlen = 0;
1663 	int found_ext = 0;
1664 
1665 	while (*oldname != '\0' && namelen + extlen < 30) {
1666 		/* Handle period first, as it is special */
1667 		if (*oldname == '.') {
1668 			if (found_ext) {
1669 				if (diskStructure.allow_multidot) {
1670 					*newname++ = '.';
1671 				} else {
1672 					*newname++ = '_';
1673 				}
1674 				extlen ++;
1675 			}
1676 			else {
1677 				*newname++ = '.';
1678 				found_ext = 1;
1679 			}
1680 		} else {
1681 			/* cut RISC OS file type off ISO name */
1682 			if (diskStructure.archimedes_enabled &&
1683 			    *oldname == ',' && strlen(oldname) == 4)
1684 				break;
1685 
1686 			 if (islower((unsigned char)*oldname))
1687 				*newname++ = toupper((unsigned char)*oldname);
1688 			else if (isupper((unsigned char)*oldname) ||
1689 			    isdigit((unsigned char)*oldname))
1690 				*newname++ = *oldname;
1691 			else if (diskStructure.allow_multidot &&
1692 			    *oldname == '.') {
1693 			    	*newname++ = '.';
1694 			} else {
1695 				*newname++ = '_';
1696 			}
1697 
1698 			if (found_ext)
1699 				extlen++;
1700 			else
1701 				namelen++;
1702 		}
1703 		oldname ++;
1704 	}
1705 	if (is_file) {
1706 		if (!found_ext && !diskStructure.omit_trailing_period)
1707 			*newname++ = '.';
1708 		/* Add version */
1709 		sprintf(newname, ";%i", 1);
1710 	}
1711 	return namelen + extlen + found_ext;
1712 }
1713 
1714 #if 0
1715 static int
1716 cd9660_joliet_convert_filename(const char *oldname, char *newname, int is_file)
1717 {
1718 	/* TODO: implement later, move to cd9660_joliet.c ?? */
1719 }
1720 #endif
1721 
1722 
1723 /*
1724  * Convert a file name to ISO compliant file name
1725  * @param char * oldname The original filename
1726  * @param char ** newname The new file name, in the appropriate character
1727  *                        set and of appropriate length
1728  * @param int 1 if file, 0 if directory
1729  * @returns int The length of the new string
1730  */
1731 static int
1732 cd9660_convert_filename(const char *oldname, char *newname, int is_file)
1733 {
1734 	assert(1 <= diskStructure.isoLevel && diskStructure.isoLevel <= 2);
1735 	/* NEW */
1736 	cd9660_filename_conversion_functor conversion_function = 0;
1737 	if (diskStructure.isoLevel == 1)
1738 		conversion_function = &cd9660_level1_convert_filename;
1739 	else if (diskStructure.isoLevel == 2)
1740 		conversion_function = &cd9660_level2_convert_filename;
1741 	return (*conversion_function)(oldname, newname, is_file);
1742 }
1743 
1744 int
1745 cd9660_compute_record_size(cd9660node *node)
1746 {
1747 	int size = node->isoDirRecord->length[0];
1748 
1749 	if (diskStructure.rock_ridge_enabled)
1750 		size += node->susp_entry_size;
1751 	size += node->su_tail_size;
1752 	size += size & 1; /* Ensure length of record is even. */
1753 	assert(size <= 254);
1754 	return size;
1755 }
1756 
1757 static void
1758 cd9660_populate_dot_records(cd9660node *node)
1759 {
1760 	node->dot_record->fileDataSector = node->fileDataSector;
1761 	memcpy(node->dot_record->isoDirRecord,node->isoDirRecord, 34);
1762 	node->dot_record->isoDirRecord->name_len[0] = 1;
1763 	node->dot_record->isoDirRecord->name[0] = 0;
1764 	node->dot_record->isoDirRecord->name[1] = 0;
1765 	node->dot_record->isoDirRecord->length[0] = 34;
1766 	node->dot_record->fileRecordSize =
1767 	    cd9660_compute_record_size(node->dot_record);
1768 
1769 	if (node == diskStructure.rootNode) {
1770 		node->dot_dot_record->fileDataSector = node->fileDataSector;
1771 		memcpy(node->dot_dot_record->isoDirRecord,node->isoDirRecord,
1772 		    34);
1773 	} else {
1774 		node->dot_dot_record->fileDataSector =
1775 		    node->parent->fileDataSector;
1776 		memcpy(node->dot_dot_record->isoDirRecord,
1777 		    node->parent->isoDirRecord,34);
1778 	}
1779 	node->dot_dot_record->isoDirRecord->name_len[0] = 1;
1780 	node->dot_dot_record->isoDirRecord->name[0] = 1;
1781 	node->dot_dot_record->isoDirRecord->name[1] = 0;
1782 	node->dot_dot_record->isoDirRecord->length[0] = 34;
1783 	node->dot_dot_record->fileRecordSize =
1784 	    cd9660_compute_record_size(node->dot_dot_record);
1785 }
1786 
1787 /*
1788  * @param struct cd9660node *node The node
1789  * @param int The offset (in bytes) - SHOULD align to the beginning of a sector
1790  * @returns int The total size of files and directory entries (should be
1791  *              a multiple of sector size)
1792 */
1793 static int64_t
1794 cd9660_compute_offsets(cd9660node *node, int64_t startOffset)
1795 {
1796 	/*
1797 	 * This function needs to compute the size of directory records and
1798 	 * runs, file lengths, and set the appropriate variables both in
1799 	 * cd9660node and isoDirEntry
1800 	 */
1801 	int64_t used_bytes = 0;
1802 	int64_t current_sector_usage = 0;
1803 	cd9660node *child;
1804 	fsinode *inode;
1805 	int64_t r;
1806 
1807 	assert(node != NULL);
1808 
1809 
1810 	/*
1811 	 * NOTE : There needs to be some special case detection for
1812 	 * the "real root" node, since for it, node->node is undefined
1813 	 */
1814 
1815 	node->fileDataSector = -1;
1816 
1817 	if (node->type & CD9660_TYPE_DIR) {
1818 		node->fileRecordSize = cd9660_compute_record_size(node);
1819 		/*Set what sector this directory starts in*/
1820 		node->fileDataSector =
1821 		    CD9660_BLOCKS(diskStructure.sectorSize,startOffset);
1822 
1823 		cd9660_bothendian_dword(node->fileDataSector,
1824 		    node->isoDirRecord->extent);
1825 
1826 		/*
1827 		 * First loop over children, need to know the size of
1828 		 * their directory records
1829 		 */
1830 		node->fileSectorsUsed = 1;
1831 		TAILQ_FOREACH(child, &node->cn_children, cn_next_child) {
1832 			node->fileDataLength +=
1833 			    cd9660_compute_record_size(child);
1834 			if ((cd9660_compute_record_size(child) +
1835 			    current_sector_usage) >=
1836 		 	    diskStructure.sectorSize) {
1837 				current_sector_usage = 0;
1838 				node->fileSectorsUsed++;
1839 			}
1840 
1841 			current_sector_usage +=
1842 			    cd9660_compute_record_size(child);
1843 		}
1844 
1845 		cd9660_bothendian_dword(node->fileSectorsUsed *
1846 			diskStructure.sectorSize,node->isoDirRecord->size);
1847 
1848 		/*
1849 		 * This should point to the sector after the directory
1850 		 * record (or, the first byte in that sector)
1851 		 */
1852 		used_bytes += node->fileSectorsUsed * diskStructure.sectorSize;
1853 
1854 		for (child = TAILQ_NEXT(node->dot_dot_record, cn_next_child);
1855 		     child != NULL; child = TAILQ_NEXT(child, cn_next_child)) {
1856 			/* Directories need recursive call */
1857 			if (S_ISDIR(child->node->type)) {
1858 				r = cd9660_compute_offsets(child,
1859 				    used_bytes + startOffset);
1860 
1861 				if (r != -1)
1862 					used_bytes += r;
1863 				else
1864 					return -1;
1865 			}
1866 		}
1867 
1868 		/* Explicitly set the . and .. records */
1869 		cd9660_populate_dot_records(node);
1870 
1871 		/* Finally, do another iteration to write the file data*/
1872 		for (child = TAILQ_NEXT(node->dot_dot_record, cn_next_child);
1873 		     child != NULL;
1874 		     child = TAILQ_NEXT(child, cn_next_child)) {
1875 			/* Files need extent set */
1876 			if (S_ISDIR(child->node->type))
1877 				continue;
1878 			child->fileRecordSize =
1879 			    cd9660_compute_record_size(child);
1880 
1881 			child->fileSectorsUsed =
1882 			    CD9660_BLOCKS(diskStructure.sectorSize,
1883 				child->fileDataLength);
1884 
1885 			inode = child->node->inode;
1886 			if ((inode->flags & FI_ALLOCATED) == 0) {
1887 				inode->ino =
1888 				    CD9660_BLOCKS(diskStructure.sectorSize,
1889 				        used_bytes + startOffset);
1890 				inode->flags |= FI_ALLOCATED;
1891 				used_bytes += child->fileSectorsUsed *
1892 				    diskStructure.sectorSize;
1893 			} else {
1894 				INODE_WARNX(("%s: already allocated inode %d "
1895 				      "data sectors at %" PRIu32, __func__,
1896 				      (int)inode->st.st_ino, inode->ino));
1897 			}
1898 			child->fileDataSector = inode->ino;
1899 			cd9660_bothendian_dword(child->fileDataSector,
1900 				child->isoDirRecord->extent);
1901 		}
1902 	}
1903 
1904 	return used_bytes;
1905 }
1906 
1907 #if 0
1908 /* Might get rid of this func */
1909 static int
1910 cd9660_copy_stat_info(cd9660node *from, cd9660node *to, int file)
1911 {
1912 	to->node->inode->st.st_dev = 0;
1913 	to->node->inode->st.st_ino = 0;
1914 	to->node->inode->st.st_size = 0;
1915 	to->node->inode->st.st_blksize = from->node->inode->st.st_blksize;
1916 	to->node->inode->st.st_atime = from->node->inode->st.st_atime;
1917 	to->node->inode->st.st_mtime = from->node->inode->st.st_mtime;
1918 	to->node->inode->st.st_ctime = from->node->inode->st.st_ctime;
1919 	to->node->inode->st.st_uid = from->node->inode->st.st_uid;
1920 	to->node->inode->st.st_gid = from->node->inode->st.st_gid;
1921 	to->node->inode->st.st_mode = from->node->inode->st.st_mode;
1922 	/* Clear out type */
1923 	to->node->inode->st.st_mode = to->node->inode->st.st_mode & ~(S_IFMT);
1924 	if (file)
1925 		to->node->inode->st.st_mode |= S_IFREG;
1926 	else
1927 		to->node->inode->st.st_mode |= S_IFDIR;
1928 	return 1;
1929 }
1930 #endif
1931 
1932 static cd9660node *
1933 cd9660_create_virtual_entry(const char *name, cd9660node *parent, int file,
1934 			    int insert)
1935 {
1936 	cd9660node *temp;
1937 	fsnode * tfsnode;
1938 
1939 	assert(parent != NULL);
1940 
1941 	temp = cd9660_allocate_cd9660node();
1942 	if (temp == NULL)
1943 		return NULL;
1944 
1945 	if ((tfsnode = malloc(sizeof(fsnode))) == NULL) {
1946 		CD9660_MEM_ALLOC_ERROR("cd9660_create_virtual_entry");
1947 		return NULL;
1948 	}
1949 
1950 	/* Assume for now name is a valid length */
1951 	if ((tfsnode->name = malloc(strlen(name) + 1)) == NULL) {
1952 		CD9660_MEM_ALLOC_ERROR("cd9660_create_virtual_entry");
1953 		return NULL;
1954 	}
1955 
1956 	if ((temp->isoDirRecord =
1957 	    malloc(sizeof(iso_directory_record_cd9660))) == NULL) {
1958 		CD9660_MEM_ALLOC_ERROR("cd9660_create_virtual_entry");
1959 		return NULL;
1960 	}
1961 
1962 	strcpy(tfsnode->name, name);
1963 
1964 	cd9660_convert_filename(tfsnode->name, temp->isoDirRecord->name, file);
1965 
1966 	temp->node = tfsnode;
1967 	temp->parent = parent;
1968 
1969 	if (insert) {
1970 		if (temp->parent != NULL) {
1971 			temp->level = temp->parent->level + 1;
1972 			if (!TAILQ_EMPTY(&temp->parent->cn_children))
1973 				cd9660_sorted_child_insert(temp->parent, temp);
1974 			else
1975 				TAILQ_INSERT_HEAD(&temp->parent->cn_children,
1976 				    temp, cn_next_child);
1977 		}
1978 	}
1979 
1980 	if (parent->node != NULL) {
1981 		tfsnode->type = parent->node->type;
1982 	}
1983 
1984 	/* Clear out file type bits */
1985 	tfsnode->type &= ~(S_IFMT);
1986 	if (file)
1987 		tfsnode->type |= S_IFREG;
1988 	else
1989 		tfsnode->type |= S_IFDIR;
1990 
1991 	/* Indicate that there is no spec entry (inode) */
1992 	tfsnode->flags &= ~(FSNODE_F_HASSPEC);
1993 #if 0
1994 	cd9660_copy_stat_info(parent, temp, file);
1995 #endif
1996 	return temp;
1997 }
1998 
1999 static cd9660node *
2000 cd9660_create_file(const char * name, cd9660node *parent, cd9660node *me)
2001 {
2002 	cd9660node *temp;
2003 
2004 	temp = cd9660_create_virtual_entry(name,parent,1,1);
2005 	if (temp == NULL)
2006 		return NULL;
2007 
2008 	temp->fileDataLength = 0;
2009 
2010 	temp->type = CD9660_TYPE_FILE | CD9660_TYPE_VIRTUAL;
2011 
2012 	if ((temp->node->inode = calloc(1, sizeof(fsinode))) == NULL)
2013 		return NULL;
2014 	*temp->node->inode = *me->node->inode;
2015 
2016 	if (cd9660_translate_node_common(temp) == 0)
2017 		return NULL;
2018 	return temp;
2019 }
2020 
2021 /*
2022  * Create a new directory which does not exist on disk
2023  * @param const char * name The name to assign to the directory
2024  * @param const char * parent Pointer to the parent directory
2025  * @returns cd9660node * Pointer to the new directory
2026  */
2027 static cd9660node *
2028 cd9660_create_directory(const char *name, cd9660node *parent, cd9660node *me)
2029 {
2030 	cd9660node *temp;
2031 
2032 	temp = cd9660_create_virtual_entry(name,parent,0,1);
2033 	if (temp == NULL)
2034 		return NULL;
2035 	temp->node->type |= S_IFDIR;
2036 
2037 	temp->type = CD9660_TYPE_DIR | CD9660_TYPE_VIRTUAL;
2038 
2039 	if ((temp->node->inode = calloc(1, sizeof(fsinode))) == NULL)
2040 		return NULL;
2041 	*temp->node->inode = *me->node->inode;
2042 
2043 	if (cd9660_translate_node_common(temp) == 0)
2044 		return NULL;
2045 	return temp;
2046 }
2047 
2048 static cd9660node *
2049 cd9660_create_special_directory(u_char type, cd9660node *parent)
2050 {
2051 	cd9660node *temp, *first;
2052 	char na[2];
2053 
2054 	assert(parent != NULL);
2055 
2056 	if (type == CD9660_TYPE_DOT)
2057 		na[0] = 0;
2058 	else if (type == CD9660_TYPE_DOTDOT)
2059 		na[0] = 1;
2060 	else
2061 		return 0;
2062 
2063 	na[1] = 0;
2064 	if ((temp = cd9660_create_virtual_entry(na, parent, 0, 0)) == NULL)
2065 		return NULL;
2066 
2067 	temp->parent = parent;
2068 	temp->type = type;
2069 	temp->isoDirRecord->length[0] = 34;
2070 	/* Dot record is always first */
2071 	if (type == CD9660_TYPE_DOT) {
2072 		parent->dot_record = temp;
2073 		TAILQ_INSERT_HEAD(&parent->cn_children, temp, cn_next_child);
2074 	/* DotDot should be second */
2075 	} else if (type == CD9660_TYPE_DOTDOT) {
2076 		parent->dot_dot_record = temp;
2077 		/*
2078                  * If the first child is the dot record, insert
2079                  * this second.  Otherwise, insert it at the head.
2080 		 */
2081 		if ((first = TAILQ_FIRST(&parent->cn_children)) == NULL ||
2082 		    (first->type & CD9660_TYPE_DOT) == 0) {
2083 			TAILQ_INSERT_HEAD(&parent->cn_children, temp,
2084 			    cn_next_child);
2085 		} else {
2086 			TAILQ_INSERT_AFTER(&parent->cn_children, first, temp,
2087 			    cn_next_child);
2088 		}
2089 	}
2090 
2091 	return temp;
2092 }
2093 
2094 int
2095 cd9660_add_generic_bootimage(const char *bootimage)
2096 {
2097 	struct stat stbuf;
2098 
2099 	assert(bootimage != NULL);
2100 
2101 	if (*bootimage == '\0') {
2102 		warnx("Error: Boot image must be a filename");
2103 		return 0;
2104 	}
2105 
2106 	if ((diskStructure.generic_bootimage = strdup(bootimage)) == NULL) {
2107 		warn("%s: strdup", __func__);
2108 		return 0;
2109 	}
2110 
2111 	/* Get information about the file */
2112 	if (lstat(diskStructure.generic_bootimage, &stbuf) == -1)
2113 		err(EXIT_FAILURE, "%s: lstat(\"%s\")", __func__,
2114 		    diskStructure.generic_bootimage);
2115 
2116 	if (stbuf.st_size > 32768) {
2117 		warnx("Error: Boot image must be no greater than 32768 bytes");
2118 		return 0;
2119 	}
2120 
2121 	if (diskStructure.verbose_level > 0) {
2122 		printf("Generic boot image image has size %lld\n",
2123 		    (long long)stbuf.st_size);
2124 	}
2125 
2126 	diskStructure.has_generic_bootimage = 1;
2127 
2128 	return 1;
2129 }
2130