CVS log for src/usr.sbin/makefs/cd9660.c

Up to [cvs.NetBSD.org] / src / usr.sbin / makefs

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Use EXIT_SUCCESS and EXIT_FAILURE where appropriate per style guide.

Move date setting into cd9660_populate_iso_dir_record so there is no
path that leaves it unset.

From FreeBSD https://reviews.freebsd.org/D39258

s/filname/filename/

rock_ridge_move_count is only incremented and can never be negative so change
%08i to %08u.
This removes a warning when compiling with tools outside ./build.sh

Mostly merge changes from HEAD upto 20200411

 s/initalize/initialize/ in comment or printf message.

Sync with HEAD

Sync with HEAD

Change duplicate 'D' option to 'm'. From Ed Maste @ FreeBSD

makefs(8): add cd9660 eltorito-alt-boot option for EFI boot.

Sync with HEAD.  (Note that most of these changes are simply $NetBSD$
tag issues.)

PR/51652: Sevan Janiyan: makefs dies due to segmentation fault
Don't dereference NULL when running out of nodes during rename.

little size_t/ssize_t...

Fix some more MKREPRO issues in cdrom creation. Now amd64 passes MKREPRO.

Provide a -T option to set timestamps to a consistent value for MKREPRO

more error normalization

improve error messages (remove \n, use __func__, etc)

Rebase to HEAD as of a few days ago.

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

Now that tools/compat/compat_defs.h defones __USE, there's no
need to treat the tools build as a special case.

avoid using __USE() in the tools version of this.

fix unused variable warnings.

`makefs -t cd9660' fix from FreeBSD:
Submitted by:   Thomas Schmitt via marius@freebsd.org
Obtained from:  FreeBSD r253707

- Correctly set the Expiration Time in the Primary Volume Descriptor;
  according to ISO 9660 8.4.26.1 unspecified date and time are denoted by the
  digit 0 in RBP 1 to 16 but the number 0 in RBP 17.

- Rock Ridge TF entries should use a length of 5, because after the 4 bytes of
  generic SUSP header there is one byte of flags. See typedef of ISO_RRIP_TF
  in iso9660_rrip.h.

resync with head

macroize to make it more type-safe.

the allow options are 8 bits wide.

make everything use the generic options parser.

handle some of the options by the generic parser.

- use emalloc and friends
- kill a bunch of global variables, more work to be done here
- homogenize option parsing. more work for cd9660
- use the new options parsing code to print an fs-specific usage

- Fix single letter option parsing.
- Instead of returning 1 << index and 0 on error,
  return just index and -1 on error for the set_option*() routines.

remove duplicated code, and try to cleanup parsing by using the shared code.
cd9660 needs a lot of work.

- add support for parsing different types; not just int.
- add beginning of msdos support.

sync with head

Patch from Jung-uk Kim (jkim at FreeBSD dot org) to allow contents of multiple
directories to be merged to the current image.

more fixes from martin

remove stray brace, minor knf

PR/45285: Martin Matuska: makefs does not properly convert ISO level 1 and 2
filenames (buffer overflow)

makefs does not properly verify the maximum filename length in the
special "." case for both ISO level 1 and ISO level 2 filename
conversion.  This creates broken images or causes a buffer overflow
(ISO level 2).

ISO level 1:
If a filename contains only dots or up to 8 characters followed by
dots the 8+3 limit check doesn't work.

ISO level 2:
If a filename contains a dot in the first 30 characters and a dot
on the 30th character, the length limit check doesn't work and the
buffer is overflowed.

$ mkdir level1
$ touch level1/12345............
$ makefs -t cd9660 -o isolevel=1 test.iso level1

$ mkdir level2
$ touch level2/1234567890.2345678901234567.....34567890123456789012345
$ makefs -t cd9660 -o isolevel=2 test.iso level2

PR/45217: Martin Matuska: Use proper lengths to space pad fields and don't
overwrite them according to the spec.

Pull up following revision(s) (requested by tsutsui in ticket #1638):
	usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.9
	usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.10
	usr.sbin/makefs/cd9660.c: revision 1.30
- remove unnecessary (pasto?) line on RRIP PL handling for moved dir
- RRIP RE length should be 4, not 0
Apply fixes for PR bin/44114 (makefs(8) -t cd9660 -o rockridge creates
corrupted cd9660fs):
 - makefs/cd9660.c:
  - cd9660_rrip_move_directory() should also update lenght[0] and
    name_len[0] in dir->isoDirRecord
 - makefs/cd9660/iso9660_rrip.c:
  - cd9660_rrip_finalize_node() should check rr_real_parent in node->parent,
    not in node itself in RRIP_PL case
  - cd9660_rrip_initialize_node() should update only node passed as arg
    so handle RRIP_PL in DOTDOT case
Fixes malformed dotdot entries in deep (more than 8 level) directories
moved into .rr_moved dir.
Should be pulled up to netbsd-5.
(no official ISO has such deep dirs, but cobalt restorecd is affected)

Apply fixes for PR bin/44114 (makefs(8) -t cd9660 -o rockridge creates
corrupted cd9660fs):
 - makefs/cd9660.c:
  - cd9660_rrip_move_directory() should also update lenght[0] and
    name_len[0] in dir->isoDirRecord
 - makefs/cd9660/iso9660_rrip.c:
  - cd9660_rrip_finalize_node() should check rr_real_parent in node->parent,
    not in node itself in RRIP_PL case
  - cd9660_rrip_initialize_node() should update only node passed as arg
    so handle RRIP_PL in DOTDOT case

Fixes malformed dotdot entries in deep (more than 8 level) directories
moved into .rr_moved dir.

Should be pulled up to netbsd-5.
(no official ISO has such deep dirs, but cobalt restorecd is affected)

From Nathan Whitehorn (nwhitehorn at freebsd dot org):
Add code to generate bootable ISOs on Powermac and CHRP systems.
Synthesize some partition maps (APM and MBR, respectively) pointing
to (a) the whole disk, and (b) relevant El Torito boot images that
have been added by other code. These partition maps are a little
bit funny looking, but they seem to work. FreeBSD has been using
this successfully in their release generation on powerpc, as well
as generating all non-SPARC install media. SPARC support could
probably be added as an extension of this patch.

cd9960 -> cd9660

Handle > 2GB images. Thanks to Greg Troxel for testing!

sync to netbsd-5

Pull up following revision(s) (requested by tsutsui in ticket #1198):
	usr.sbin/makefs/cd9660.c: revision 1.25 via patch
	usr.sbin/makefs/cd9660.h: revision 1.13 via patch
	usr.sbin/makefs/cd9660/cd9660_write.c: revision 1.10
	usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.8
	usr.sbin/makefs/cd9660/iso9660_rrip.h: revision 1.5
Add support for encoding RISC OS metadata into ISO 9660 filesystems.
This is done by adding the general ability to stuff non-SUSP data into
the end of the System Use field of a Directory Record, which required
some amount of rewriting of the SUSP support.  I think the result is
at least as good as what came before, and I've fixed at least one bug
along the way.  Tested against RISC OS 3.70 on my Risc PC.
Oh, why do we want it?  It should allow us to make acorn{26,32} CDs that
can be booted directly from RISC OS without mucking around copying the
bootloader to a native filing system.

Pull up following revision(s) (requested by tsutsui in ticket #1198):
	usr.sbin/makefs/cd9660.c: revision 1.25 via patch
	usr.sbin/makefs/cd9660.h: revision 1.13 via patch
	usr.sbin/makefs/cd9660/cd9660_write.c: revision 1.10
	usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.8
	usr.sbin/makefs/cd9660/iso9660_rrip.h: revision 1.5
Add support for encoding RISC OS metadata into ISO 9660 filesystems.
This is done by adding the general ability to stuff non-SUSP data into
the end of the System Use field of a Directory Record, which required
some amount of rewriting of the SUSP support.  I think the result is
at least as good as what came before, and I've fixed at least one bug
along the way.  Tested against RISC OS 3.70 on my Risc PC.
Oh, why do we want it?  It should allow us to make acorn{26,32} CDs that
can be booted directly from RISC OS without mucking around copying the
bootloader to a native filing system.

Pull up following revision(s) (requested by ad in ticket #347):
	usr.sbin/makefs/cd9660.c: revision 1.23
Make the allow-multidot option useful.

remove fsopts asserts - the parameter is unused, so we don't care here

Add support for encoding RISC OS metadata into ISO 9660 filesystems.
This is done by adding the general ability to stuff non-SUSP data into
the end of the System Use field of a Directory Record, which required
some amount of rewriting of the SUSP support.  I think the result is
at least as good as what came before, and I've fixed at least one bug
along the way.  Tested against RISC OS 3.70 on my Risc PC.

Oh, why do we want it?  It should allow us to make acorn{26,32} CDs that
can be booted directly from RISC OS without mucking around copying the
bootloader to a native filing system.

If the user specifies a cd9660-specific option that needs an integer value
without supplying a value, complain at them instead of segfaulting.
Or, to put it another way, check that the value is non-NULL before calling
set_option().

Make the allow-multidot option useful.

Import changes from the MirBSD Project:

Initialise memory before writing to only part of it,
making sure that the string is NUL-terminated

Allocate the maximum allowed length (including the
terminating NUL byte) for the temporary name string, make sure
the final output is NUL terminated, and copy back the NUL when
overwriting the previously created name (since maxlen is always
at least 1 less than ISO_FILENAME_MAXLENGTH_WITH_PADDING, this
is no problem)

Patches from Thorsten Glaser through freenode.net.

Sync with wrstuden-revivesa-base-2.

Fix typo in cd9660 functionname cd9660_setup_boot_volume_descritpor ->
cd9660_setup_boot_volume_descriptor.

Interestingly the same typo was used in 3 files!

Sync w/ -current. 34 merge conflicts to follow.

sync with head.

Add an option to load a generic boot image into the first 32K of the
cd9660 image.

Sync w/ NetBSD-4-RC_1

Pull up following revision(s) (requested by christos in ticket #757):
	usr.sbin/makefs/cd9660.c: revision 1.19
Fix deep directory move rock-ridge extension. Code was there, but it had
bit-rotted.

Fix deep directory move rock-ridge extension. Code was there, but it had
bit-rotted.

 * Don't include headers twice
 * Remove a few trailing whitespaces
 * Rearrange and join to one #if for some headers

Patch contributed by Slava Semushin <slava.semushin@gmail.com>
in private mail.

from Anon Ymous: compile with -Wextra

use c99 initializers

implement -x by pruning fsnodes tree before building filesystem rather
than by skipping nodes while building filesystem

make -t cd9660 obey -x option similarly to ffs

Fix fix for Coverity CID 2751:

Move an error check to the right place, and instead of blindly insisting on
an argument for all of "no-emul-boot", "no-boot", "hard-disk-boot" and
"boot-load-segment", only require it for the last one, which is the only
one that requires/uses it.

OK'd by Christos

Coverity CID 2751: Avoid NULL deref.

Fix a bug in cd9660_sort_nodes, which tried to insert `next' before
`node' on a tail-queue, when `node' wasn't on the tail-queue.
Sometimes this led to a segfault.  Insert before `cn', since that
is the intention.  Closes PR 32194. Thanks, Jeff Rizzo, for reporting
this bug.

Change cd9660's default verbosity level to 0, quieting it down
considerably.

Remove the cd9660_inode hashtable for hard-links support, and re-use
the fsinode for the same purpose, per Luke Mewburn's suggestion on
source-changes@.

Add hard-link support:  keep a hashtable that maps inodes for
regular files on the source filesystem to the offset of the first
data block on the target filesystem.  Don't allocate blocks for a
file a second time (i.e., if it is already present in the hashtable).
Avoid writing the blocks of a file twice (use the FS_WRITTEN flag
in fsinode->flags for this purpose).

Bug fix: record the actual number number of 512-byte "virtual"
sectors in the Sector Count field of the Initial/Default Entry in
the "El Torito" Boot Catalog, instead of blithely writing 1 (!!)
into the Sector Count field.  Ditto the Section Entries.

Remove last remnants of cd9660's unsupported boot-load-size option.

Really use cd9660's boot-load-segment argument.

Change the boot images list from a LIST to a TAILQ.

Re-implement CD9660_BLOCKS() with howmany().

Introduce ELTORITO_DPRINTF and some debug messages.

Zero memory malloc'd in the El Torito code.

Revise some debugging outputs.

Insert a new boot-image on the boot-images list after the last
boot-image for the same architecture.  It makes a (trivial) functional
difference.

Miscellaneous cosmetic changes.  Remove useless variable-assignment.

Remove invisible whitespace at ends of lines that disrupted my
speedy cursor-movement habits in vi.

Overhaul makefs -t cd9660.

Functional: Do not add a missing period or a version number to
            directories, since that doesn't fit the standard (thanks
            Daniel Watt).

            Add RRIP PX records (POSIX meta-information) to '.'
            and '..' entries.  Quiets kernel complaint, when we
            mount a cd9660 filesystem, that there is a missing PX
            entry.

Cosmetic: Reduce height of staircases.  Remove an unused member
          from struct _cd9660node.  Extract a subroutine.  KNF.

          Use a TAILQ macros for lists of both SUSP/RRIP attributes
          and directory entries.

XXX
XXX The new RRIP PX entries are not quite right.
XXX

Cosmetic: change to a standard idiom, *(x++) --> *x++.  Flag some
places needing bounds-checking with XXX.  Fix indendation.

By default, do not omit the trailing period from ISO9660 filenames
unless given the option '-o omit-trailing-period'.  Also, fix a
logic error so that makefs obeys option '-o omit-trailing-period'
when it is given.

Move local variable declaration to start of block (also start of function).
Fixes build problem for vax.

cd9660 support. Written by Daniel Watt, Walter Deignan, Ryan Gabrys,
Alan Perez-Rathke and Ram Vedam.

Prototyping, KNF, WARNS=3 by me.

Note that this is marked experimental for now. It works well enough to
make NetBSD/i386 bootable images, but does need more work.