History log of /freebsd-current/usr.sbin/makefs/cd9660.h
Revision Date Author Comments
# 84696cf1 29-Mar-2023 Ed Maste <emaste@FreeBSD.org>

makefs: remove ISO9660 Archimedes extension support

We have no need to create ISO images with RISC OS specific metadata.

Reviewed by: imp
Relnotes: yes
Obtained from: OpenBSD a435da44c07f
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D39344


# b3e76948 16-Aug-2023 Warner Losh <imp@FreeBSD.org>

Remove $FreeBSD$: two-line .h pattern

Remove /^\s*\*\n \*\s+\$FreeBSD\$$\n/


# b61a5730 10-May-2023 Warner Losh <imp@FreeBSD.org>

spdx: The BSD-2-Clause-NetBSD identifier is obsolete, drop -NetBSD

The SPDX folks have obsoleted the BSD-2-Clause-NetBSD identifier. Catch
up to that fact and revert to their recommended match of BSD-2-Clause.

Discussed with: pfg
MFC After: 3 days
Sponsored by: Netflix


# 10854bf5 10-Apr-2023 Ed Maste <emaste@FreeBSD.org>

makefs: use unsigned and %u for rock_ridge_move_count

For diff reduction against NetBSD's makefs. Based on NetBSD git mirror
commit 00991aee8248.

With this change our makefs cd9660 support should be in sync up to
NetBSD commit bdae6c9dc792 ("makefs(8): Nix trailing whitespace.").

Sponsored by: The FreeBSD Foundation


# c753f49f 31-Mar-2023 Ed Maste <emaste@FreeBSD.org>

makefs: remove unused cd9660 options

Makefs defined "follow-symlinks" and "help" options, but they did
nothing. Remove them.

Obtained from: OpenBSD a8f1645688c2
Sponsored by: The FreeBSD Foundation


# 1d1ffa2e 29-Mar-2023 Ed Maste <emaste@FreeBSD.org>

makefs: use size_t or ssize_t where appropriate

Obtained from: NetBSD af7bc97830ac


# d73acb32 30-Mar-2023 Ed Maste <emaste@FreeBSD.org>

makefs: remove some unused cd9660 types and defines

Obtained from: OpenBSD
Sponsored by: The FreeBSD Foundation


# 2f11df63 30-Mar-2023 Ed Maste <emaste@FreeBSD.org>

makefs: remove CD9660MAXPATH #define

It was used only in constructing the host path that contains file
content, which is not related to anything CD9660-specific. PATH_MAX is
the appropriate limit. See OpenBSD commit 299d8950f319.

Obtained from: OpenBSD
Sponsored by: The FreeBSD Foundation


# 06a400d7 20-Sep-2022 Ed Maste <emaste@FreeBSD.org>

makefs: whitespace cleanup (remove space before tab)

MFC after: 1 week


# fe41c64b 06-Jan-2021 Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>

Fix -Wpointer-sign warnings in makefs and mkimg

Reviewed By: emaste
Differential Revision: https://reviews.freebsd.org/D27175


# 1de7b4b8 27-Nov-2017 Pedro F. Giffuni <pfg@FreeBSD.org>

various: general adoption of SPDX licensing ID tags.

Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.

The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.

No functional change intended.


# cfa62825 29-Mar-2017 Ed Maste <emaste@FreeBSD.org>

makefs: sync with NetBSD

This is a collection of minor changes as diff reduction against NetBSD.

NetBSD revs:
cd9660.c 1.39
cd9660.h 1.19
makefs.c 1.34

Obtained from: NetBSD
Sponsored by: The FreeBSD Foundation


# 776c6824 15-Mar-2017 Ed Maste <emaste@FreeBSD.org>

makefs: sync option parsing with NetBSD

- add support for parsing different types; not just int
- homogenize option parsing
- fix single letter parsing
- remove duplicated code

NetBSD revisions:
cd9660.c 1.36 1.37 1.38 1.41 1.42 1.43
ffs.c 1.50 1.51 1.52 1.53 1.56 1.57
makefs.c 1.36 1.37 1.38 1.39 1.40 1.42 1.43 1.44 1.46
makefs.h 1.28 1.29 1.31 1.32

Obtained from: NetBSD
Sponsored by: The FreeBSD Foundation


# 1631d42a 22-Feb-2017 Ed Maste <emaste@FreeBSD.org>

makefs: eliminate global cd9660 structure

For diff reduction with NetBSD

NetBSD file versions:
cd9660.c 1.39
cd9660.h 1.19
cd9660/cd9660_debug.c 1.12
cd9660/cd9660_eltorito.c 1.20
cd9660/cd9660_write.c 1.16
cd9660/iso9660_rrip.c 1.12
cd9660/iso9660_rrip.h 1.6

Reviewed by: ngie
Obtained from: NetBSD
MFC after: 1 month
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D9627


# 688aaa09 30-Jan-2012 Jung-uk Kim <jkim@FreeBSD.org>

Allow contents of multiple directories to be merged to the current image.
Note this patch was submitted to NetBSD and they already adopted it.

http://mail-index.netbsd.org/source-changes/2012/01/28/msg031078.html

MFC after: 1 week


# 852f933d 10-Aug-2011 Marius Strobl <marius@FreeBSD.org>

Sync makefs(8) ISO 9660 support with NetBSD:
o cd9960 -> cd9660
o Move inclusion of sys/endian.h from cd9660_eltorito.c to cd9660.h
since actual user is not cd9660_eltorito.c but iso.h and
cd9660_eltorito.h.

Actually, include order/place of sys/endian.h doesn't matter on
netbsd since it is always included by sys/types.h but it's not
true on other system. This should fix cross build breakage on
freebsd introduced by rev. 1.16 of cd9660_eltorito.c.
Problem reported and fix suggested on twitter.
o Fix fd leaks in error cases. Found by cppcheck.
o RRIP RE length should be 4, not 0
o Apply fixes for PR bin/44114 (makefs(8) -t cd9660 -o rockridge creates
corrupted cd9660fs), iso9660_rrip.c part:
- 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)

Reviewed by: mm
Approved by: re (kib)
Obtained from: NetBSD
MFC after: 3 days


# df73c41a 22-May-2011 Nathan Whitehorn <nwhitehorn@FreeBSD.org>

Add analogs to the -chrp-boot and -prep-boot options to mkisofs.


# 01a0f853 07-Nov-2010 Olivier Houchard <cognet@FreeBSD.org>

Sync with the latest version from NetBSD. It notably addds ISO9660 support.

Submitted by: bapt