The NetBSD Project

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

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

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.60 / (download) - annotate - [select for diffs], Thu Dec 28 12:13:55 2023 UTC (3 months, 2 weeks ago) by tsutsui
Branch: MAIN
CVS Tags: HEAD
Changes since 1.59: +3 -3 lines
Diff to previous 1.59 (colored)

Use EXIT_SUCCESS and EXIT_FAILURE where appropriate per style guide.

Revision 1.59 / (download) - annotate - [select for diffs], Tue Apr 18 23:05:51 2023 UTC (11 months, 4 weeks ago) by christos
Branch: MAIN
Changes since 1.58: +5 -9 lines
Diff to previous 1.58 (colored)

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

Revision 1.58 / (download) - annotate - [select for diffs], Tue Dec 21 21:28:31 2021 UTC (2 years, 3 months ago) by andvar
Branch: MAIN
CVS Tags: netbsd-10-base, netbsd-10-0-RELEASE, netbsd-10-0-RC6, netbsd-10-0-RC5, netbsd-10-0-RC4, netbsd-10-0-RC3, netbsd-10-0-RC2, netbsd-10-0-RC1, netbsd-10
Changes since 1.57: +3 -3 lines
Diff to previous 1.57 (colored)

s/filname/filename/

Revision 1.57 / (download) - annotate - [select for diffs], Tue Nov 10 20:48:29 2020 UTC (3 years, 5 months ago) by reinoud
Branch: MAIN
CVS Tags: cjep_sun2x-base1, cjep_sun2x-base, cjep_sun2x, cjep_staticlib_x-base1, cjep_staticlib_x-base, cjep_staticlib_x
Changes since 1.56: +3 -3 lines
Diff to previous 1.56 (colored)

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

Revision 1.55.12.1 / (download) - annotate - [select for diffs], Mon Apr 13 08:05:54 2020 UTC (4 years ago) by martin
Branch: phil-wifi
Changes since 1.55: +3 -3 lines
Diff to previous 1.55 (colored) next main 1.56 (colored)

Mostly merge changes from HEAD upto 20200411

Revision 1.56 / (download) - annotate - [select for diffs], Fri Oct 18 04:09:02 2019 UTC (4 years, 5 months ago) by msaitoh
Branch: MAIN
CVS Tags: phil-wifi-20200421, phil-wifi-20200411, phil-wifi-20200406, phil-wifi-20191119, is-mlppp-base, is-mlppp
Changes since 1.55: +3 -3 lines
Diff to previous 1.55 (colored)

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

Revision 1.53.2.1 / (download) - annotate - [select for diffs], Fri Apr 21 16:54:17 2017 UTC (6 years, 11 months ago) by bouyer
Branch: bouyer-socketcan
Changes since 1.53: +6 -4 lines
Diff to previous 1.53 (colored) next main 1.54 (colored)

Sync with HEAD

Revision 1.52.2.2 / (download) - annotate - [select for diffs], Mon Mar 20 06:58:07 2017 UTC (7 years ago) by pgoyette
Branch: pgoyette-localcount
Changes since 1.52.2.1: +6 -4 lines
Diff to previous 1.52.2.1 (colored) to branchpoint 1.52 (colored) next main 1.53 (colored)

Sync with HEAD

Revision 1.55 / (download) - annotate - [select for diffs], Wed Mar 15 15:33:54 2017 UTC (7 years, 1 month ago) by christos
Branch: MAIN
CVS Tags: prg-localcount2-base3, prg-localcount2-base2, prg-localcount2-base1, prg-localcount2-base, prg-localcount2, phil-wifi-base, phil-wifi-20190609, pgoyette-localcount-20170426, pgoyette-localcount-20170320, pgoyette-compat-merge-20190127, pgoyette-compat-base, pgoyette-compat-20190127, pgoyette-compat-20190118, pgoyette-compat-1226, pgoyette-compat-1126, pgoyette-compat-1020, pgoyette-compat-0930, pgoyette-compat-0906, pgoyette-compat-0728, pgoyette-compat-0625, pgoyette-compat-0521, pgoyette-compat-0502, pgoyette-compat-0422, pgoyette-compat-0415, pgoyette-compat-0407, pgoyette-compat-0330, pgoyette-compat-0322, pgoyette-compat-0315, pgoyette-compat, perseant-stdc-iso10646-base, perseant-stdc-iso10646, netbsd-9-base, netbsd-9-3-RELEASE, netbsd-9-2-RELEASE, netbsd-9-1-RELEASE, netbsd-9-0-RELEASE, netbsd-9-0-RC2, netbsd-9-0-RC1, netbsd-9, netbsd-8-base, netbsd-8-2-RELEASE, netbsd-8-1-RELEASE, netbsd-8-1-RC1, netbsd-8-0-RELEASE, netbsd-8-0-RC2, netbsd-8-0-RC1, netbsd-8, matt-nb8-mediatek-base, matt-nb8-mediatek, bouyer-socketcan-base1
Branch point for: phil-wifi
Changes since 1.54: +3 -3 lines
Diff to previous 1.54 (colored)

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

Revision 1.54 / (download) - annotate - [select for diffs], Tue Jan 24 11:22:43 2017 UTC (7 years, 2 months ago) by nonaka
Branch: MAIN
Changes since 1.53: +5 -3 lines
Diff to previous 1.53 (colored)

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

Revision 1.52.2.1 / (download) - annotate - [select for diffs], Sat Jan 7 08:56:59 2017 UTC (7 years, 3 months ago) by pgoyette
Branch: pgoyette-localcount
Changes since 1.52: +3 -3 lines
Diff to previous 1.52 (colored)

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

Revision 1.53 / (download) - annotate - [select for diffs], Fri Nov 25 23:02:44 2016 UTC (7 years, 4 months ago) by christos
Branch: MAIN
CVS Tags: pgoyette-localcount-20170107, bouyer-socketcan-base
Branch point for: bouyer-socketcan
Changes since 1.52: +3 -3 lines
Diff to previous 1.52 (colored)

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

Revision 1.52 / (download) - annotate - [select for diffs], Thu Dec 24 15:52:37 2015 UTC (8 years, 3 months ago) by christos
Branch: MAIN
CVS Tags: pgoyette-localcount-base, pgoyette-localcount-20161104, pgoyette-localcount-20160806, pgoyette-localcount-20160726, localcount-20160914
Branch point for: pgoyette-localcount
Changes since 1.51: +7 -6 lines
Diff to previous 1.51 (colored)

little size_t/ssize_t...

Revision 1.51 / (download) - annotate - [select for diffs], Mon Dec 21 03:19:17 2015 UTC (8 years, 3 months ago) by christos
Branch: MAIN
Changes since 1.50: +15 -15 lines
Diff to previous 1.50 (colored)

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

Revision 1.50 / (download) - annotate - [select for diffs], Wed Nov 25 00:48:49 2015 UTC (8 years, 4 months ago) by christos
Branch: MAIN
Changes since 1.49: +4 -2 lines
Diff to previous 1.49 (colored)

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

Revision 1.49 / (download) - annotate - [select for diffs], Wed Jun 17 01:05:41 2015 UTC (8 years, 10 months ago) by christos
Branch: MAIN
Changes since 1.48: +8 -8 lines
Diff to previous 1.48 (colored)

more error normalization

Revision 1.48 / (download) - annotate - [select for diffs], Tue Jun 16 23:04:14 2015 UTC (8 years, 10 months ago) by christos
Branch: MAIN
Changes since 1.47: +27 -26 lines
Diff to previous 1.47 (colored)

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

Revision 1.35.6.2 / (download) - annotate - [select for diffs], Wed Aug 20 00:05:09 2014 UTC (9 years, 7 months ago) by tls
Branch: tls-maxphys
Changes since 1.35.6.1: +12 -17 lines
Diff to previous 1.35.6.1 (colored) to branchpoint 1.35 (colored) next main 1.36 (colored)

Rebase to HEAD as of a few days ago.

Revision 1.34.2.2 / (download) - annotate - [select for diffs], Thu May 22 11:43:05 2014 UTC (9 years, 10 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.34.2.1: +472 -476 lines
Diff to previous 1.34.2.1 (colored) to branchpoint 1.34 (colored) next main 1.35 (colored)

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")

Revision 1.47 / (download) - annotate - [select for diffs], Thu Oct 24 14:01:01 2013 UTC (10 years, 5 months ago) by apb
Branch: MAIN
CVS Tags: yamt-pagecache-base9, tls-maxphys-base, tls-earlyentropy-base, tls-earlyentropy, riastradh-xf86-video-intel-2-7-1-pre-2-21-15, riastradh-drm2-base3, netbsd-7-nhusb-base-20170116, netbsd-7-nhusb-base, netbsd-7-nhusb, netbsd-7-base, netbsd-7-2-RELEASE, netbsd-7-1-RELEASE, netbsd-7-1-RC2, netbsd-7-1-RC1, netbsd-7-1-2-RELEASE, netbsd-7-1-1-RELEASE, netbsd-7-1, netbsd-7-0-RELEASE, netbsd-7-0-RC3, netbsd-7-0-RC2, netbsd-7-0-RC1, netbsd-7-0-2-RELEASE, netbsd-7-0-1-RELEASE, netbsd-7-0, netbsd-7
Changes since 1.46: +3 -3 lines
Diff to previous 1.46 (colored)

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

Revision 1.46 / (download) - annotate - [select for diffs], Sat Oct 19 20:49:22 2013 UTC (10 years, 5 months ago) by mrg
Branch: MAIN
Changes since 1.45: +3 -3 lines
Diff to previous 1.45 (colored)

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

Revision 1.45 / (download) - annotate - [select for diffs], Sat Oct 19 17:16:37 2013 UTC (10 years, 5 months ago) by christos
Branch: MAIN
Changes since 1.44: +10 -16 lines
Diff to previous 1.44 (colored)

fix unused variable warnings.

Revision 1.44 / (download) - annotate - [select for diffs], Tue Jul 30 16:02:23 2013 UTC (10 years, 8 months ago) by reinoud
Branch: MAIN
Changes since 1.43: +4 -3 lines
Diff to previous 1.43 (colored)

`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.

Revision 1.35.6.1 / (download) - annotate - [select for diffs], Mon Feb 25 00:30:44 2013 UTC (11 years, 1 month ago) by tls
Branch: tls-maxphys
Changes since 1.35: +465 -464 lines
Diff to previous 1.35 (colored)

resync with head

Revision 1.43 / (download) - annotate - [select for diffs], Thu Jan 31 15:15:15 2013 UTC (11 years, 2 months ago) by christos
Branch: MAIN
CVS Tags: riastradh-drm2-base2, riastradh-drm2-base1, riastradh-drm2-base, riastradh-drm2, agc-symver-base, agc-symver
Changes since 1.42: +60 -61 lines
Diff to previous 1.42 (colored)

macroize to make it more type-safe.

Revision 1.42 / (download) - annotate - [select for diffs], Thu Jan 31 14:56:32 2013 UTC (11 years, 2 months ago) by christos
Branch: MAIN
Changes since 1.41: +8 -8 lines
Diff to previous 1.41 (colored)

the allow options are 8 bits wide.

Revision 1.41 / (download) - annotate - [select for diffs], Tue Jan 29 15:52:25 2013 UTC (11 years, 2 months ago) by christos
Branch: MAIN
Changes since 1.40: +131 -98 lines
Diff to previous 1.40 (colored)

make everything use the generic options parser.

Revision 1.40 / (download) - annotate - [select for diffs], Tue Jan 29 01:05:57 2013 UTC (11 years, 2 months ago) by christos
Branch: MAIN
Changes since 1.39: +24 -22 lines
Diff to previous 1.39 (colored)

handle some of the options by the generic parser.

Revision 1.39 / (download) - annotate - [select for diffs], Mon Jan 28 21:03:26 2013 UTC (11 years, 2 months ago) by christos
Branch: MAIN
Changes since 1.38: +357 -381 lines
Diff to previous 1.38 (colored)

- 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

Revision 1.38 / (download) - annotate - [select for diffs], Thu Jan 24 01:10:47 2013 UTC (11 years, 2 months ago) by christos
Branch: MAIN
Changes since 1.37: +3 -3 lines
Diff to previous 1.37 (colored)

- 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.

Revision 1.37 / (download) - annotate - [select for diffs], Wed Jan 23 21:32:32 2013 UTC (11 years, 2 months ago) by christos
Branch: MAIN
Changes since 1.36: +3 -3 lines
Diff to previous 1.36 (colored)

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

Revision 1.36 / (download) - annotate - [select for diffs], Wed Jan 23 20:46:39 2013 UTC (11 years, 2 months ago) by christos
Branch: MAIN
Changes since 1.35: +10 -19 lines
Diff to previous 1.35 (colored)

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

Revision 1.34.2.1 / (download) - annotate - [select for diffs], Tue Apr 17 00:09:49 2012 UTC (12 years ago) by yamt
Branch: yamt-pagecache
CVS Tags: yamt-pagecache-tag8
Changes since 1.34: +9 -20 lines
Diff to previous 1.34 (colored)

sync with head

Revision 1.35 / (download) - annotate - [select for diffs], Sat Jan 28 02:35:46 2012 UTC (12 years, 2 months ago) by christos
Branch: MAIN
CVS Tags: yamt-pagecache-base8, yamt-pagecache-base7, yamt-pagecache-base6, yamt-pagecache-base5, yamt-pagecache-base4, netbsd-6-base, netbsd-6-1-RELEASE, netbsd-6-1-RC4, netbsd-6-1-RC3, netbsd-6-1-RC2, netbsd-6-1-RC1, netbsd-6-1-5-RELEASE, netbsd-6-1-4-RELEASE, netbsd-6-1-3-RELEASE, netbsd-6-1-2-RELEASE, netbsd-6-1-1-RELEASE, netbsd-6-1, netbsd-6-0-RELEASE, netbsd-6-0-RC2, netbsd-6-0-RC1, netbsd-6-0-6-RELEASE, netbsd-6-0-5-RELEASE, netbsd-6-0-4-RELEASE, netbsd-6-0-3-RELEASE, netbsd-6-0-2-RELEASE, netbsd-6-0-1-RELEASE, netbsd-6-0, netbsd-6, matt-nb6-plus-nbase, matt-nb6-plus-base, matt-nb6-plus
Branch point for: tls-maxphys
Changes since 1.34: +9 -20 lines
Diff to previous 1.34 (colored)

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

Revision 1.34 / (download) - annotate - [select for diffs], Tue Aug 23 19:57:24 2011 UTC (12 years, 7 months ago) by christos
Branch: MAIN
CVS Tags: yamt-pagecache-base3, yamt-pagecache-base2, yamt-pagecache-base
Branch point for: yamt-pagecache
Changes since 1.33: +4 -4 lines
Diff to previous 1.33 (colored)

more fixes from martin

Revision 1.33 / (download) - annotate - [select for diffs], Tue Aug 23 19:17:07 2011 UTC (12 years, 7 months ago) by christos
Branch: MAIN
Changes since 1.32: +5 -5 lines
Diff to previous 1.32 (colored)

remove stray brace, minor knf

Revision 1.32 / (download) - annotate - [select for diffs], Tue Aug 23 17:09:11 2011 UTC (12 years, 7 months ago) by christos
Branch: MAIN
Changes since 1.31: +5 -8 lines
Diff to previous 1.31 (colored)

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

Revision 1.31 / (download) - annotate - [select for diffs], Sat Aug 6 23:25:19 2011 UTC (12 years, 8 months ago) by christos
Branch: MAIN
Changes since 1.30: +8 -9 lines
Diff to previous 1.30 (colored)

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

Revision 1.22.2.3 / (download) - annotate - [select for diffs], Fri Jul 15 22:39:02 2011 UTC (12 years, 9 months ago) by riz
Branch: netbsd-5
CVS Tags: netbsd-5-2-RELEASE, netbsd-5-2-RC1, netbsd-5-2-3-RELEASE, netbsd-5-2-2-RELEASE, netbsd-5-2-1-RELEASE, netbsd-5-2
Changes since 1.22.2.2: +4 -2 lines
Diff to previous 1.22.2.2 (colored) to branchpoint 1.22 (colored) next main 1.23 (colored)

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)

Revision 1.30 / (download) - annotate - [select for diffs], Sun May 29 17:07:57 2011 UTC (12 years, 10 months ago) by tsutsui
Branch: MAIN
CVS Tags: cherry-xenmp-base, cherry-xenmp
Changes since 1.29: +4 -2 lines
Diff to previous 1.29 (colored)

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)

Revision 1.29 / (download) - annotate - [select for diffs], Sun May 22 21:51:39 2011 UTC (12 years, 10 months ago) by christos
Branch: MAIN
Changes since 1.28: +5 -2 lines
Diff to previous 1.28 (colored)

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.

Revision 1.28 / (download) - annotate - [select for diffs], Fri Nov 19 15:47:32 2010 UTC (13 years, 4 months ago) by tsutsui
Branch: MAIN
CVS Tags: matt-mips64-premerge-20101231, bouyer-quota2-nbase, bouyer-quota2-base, bouyer-quota2
Changes since 1.27: +8 -8 lines
Diff to previous 1.27 (colored)

cd9960 -> cd9660

Revision 1.27 / (download) - annotate - [select for diffs], Wed Oct 27 18:51:34 2010 UTC (13 years, 5 months ago) by christos
Branch: MAIN
Changes since 1.26: +19 -18 lines
Diff to previous 1.26 (colored)

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

Revision 1.22.2.1.4.1 / (download) - annotate - [select for diffs], Wed Apr 21 05:27:21 2010 UTC (13 years, 11 months ago) by matt
Branch: matt-nb5-mips64
CVS Tags: matt-nb5-mips64-premerge-20101231, matt-nb5-mips64-k15
Changes since 1.22.2.1: +6 -2 lines
Diff to previous 1.22.2.1 (colored) next main 1.22.2.2 (colored)

sync to netbsd-5

Revision 1.22.2.2 / (download) - annotate - [select for diffs], Sat Jan 2 06:45:03 2010 UTC (14 years, 3 months ago) by snj
Branch: netbsd-5
CVS Tags: netbsd-5-1-RELEASE, netbsd-5-1-RC4, netbsd-5-1-RC3, netbsd-5-1-RC2, netbsd-5-1-RC1, netbsd-5-1-5-RELEASE, netbsd-5-1-4-RELEASE, netbsd-5-1-3-RELEASE, netbsd-5-1-2-RELEASE, netbsd-5-1-1-RELEASE, netbsd-5-1, matt-nb5-pq3-base, matt-nb5-pq3
Changes since 1.22.2.1: +6 -2 lines
Diff to previous 1.22.2.1 (colored) to branchpoint 1.22 (colored)

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.

Revision 1.22.2.1.2.1 / (download) - annotate - [select for diffs], Sat Jan 2 06:34:15 2010 UTC (14 years, 3 months ago) by snj
Branch: netbsd-5-0
CVS Tags: netbsd-5-0-2-RELEASE
Changes since 1.22.2.1: +6 -2 lines
Diff to previous 1.22.2.1 (colored) next main 1.22.2.2 (colored)

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.

Revision 1.22.2.1 / (download) - annotate - [select for diffs], Mon Feb 2 03:32:34 2009 UTC (15 years, 2 months ago) by snj
Branch: netbsd-5
CVS Tags: netbsd-5-0-RELEASE, netbsd-5-0-RC4, netbsd-5-0-RC3, netbsd-5-0-RC2, netbsd-5-0-1-RELEASE, matt-nb5-mips64-u2-k2-k4-k7-k8-k9, matt-nb5-mips64-u1-k1-k5, matt-nb5-mips64-premerge-20091211, matt-nb4-mips64-k7-u2a-k9b
Branch point for: netbsd-5-0, matt-nb5-mips64
Changes since 1.22: +15 -4 lines
Diff to previous 1.22 (colored)

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.

Revision 1.26 / (download) - annotate - [select for diffs], Fri Jan 16 18:02:24 2009 UTC (15 years, 3 months ago) by pooka
Branch: MAIN
CVS Tags: matt-premerge-20091211, jym-xensuspend-nbase, jym-xensuspend-base, jym-xensuspend
Changes since 1.25: +2 -4 lines
Diff to previous 1.25 (colored)

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

Revision 1.25 / (download) - annotate - [select for diffs], Sat Jan 10 22:06:29 2009 UTC (15 years, 3 months ago) by bjh21
Branch: MAIN
Changes since 1.24: +23 -2 lines
Diff to previous 1.24 (colored)

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.

Revision 1.24 / (download) - annotate - [select for diffs], Thu Jan 8 22:26:19 2009 UTC (15 years, 3 months ago) by bjh21
Branch: MAIN
Changes since 1.23: +9 -4 lines
Diff to previous 1.23 (colored)

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().

Revision 1.23 / (download) - annotate - [select for diffs], Fri Nov 21 10:02:12 2008 UTC (15 years, 4 months ago) by ad
Branch: MAIN
Changes since 1.22: +15 -4 lines
Diff to previous 1.22 (colored)

Make the allow-multidot option useful.

Revision 1.22 / (download) - annotate - [select for diffs], Thu Oct 30 18:43:13 2008 UTC (15 years, 5 months ago) by ahoka
Branch: MAIN
CVS Tags: netbsd-5-base, netbsd-5-0-RC1
Branch point for: netbsd-5
Changes since 1.21: +6 -4 lines
Diff to previous 1.21 (colored)

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.

Revision 1.19.12.2 / (download) - annotate - [select for diffs], Thu Sep 18 04:30:07 2008 UTC (15 years, 7 months ago) by wrstuden
Branch: wrstuden-revivesa
Changes since 1.19.12.1: +3 -3 lines
Diff to previous 1.19.12.1 (colored) to branchpoint 1.19 (colored) next main 1.20 (colored)

Sync with wrstuden-revivesa-base-2.

Revision 1.21 / (download) - annotate - [select for diffs], Sun Jul 27 10:29:32 2008 UTC (15 years, 8 months ago) by reinoud
Branch: MAIN
CVS Tags: wrstuden-revivesa-base-3, wrstuden-revivesa-base-2, matt-mips64-base2
Changes since 1.20: +3 -3 lines
Diff to previous 1.20 (colored)

Fix typo in cd9660 functionname cd9660_setup_boot_volume_descritpor ->
cd9660_setup_boot_volume_descriptor.

Interestingly the same typo was used in 3 files!

Revision 1.19.12.1 / (download) - annotate - [select for diffs], Mon Jun 23 04:32:13 2008 UTC (15 years, 9 months ago) by wrstuden
Branch: wrstuden-revivesa
Changes since 1.19: +46 -2 lines
Diff to previous 1.19 (colored)

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

Revision 1.19.10.1 / (download) - annotate - [select for diffs], Sun May 18 12:36:20 2008 UTC (15 years, 11 months ago) by yamt
Branch: yamt-pf42
Changes since 1.19: +46 -2 lines
Diff to previous 1.19 (colored) next main 1.20 (colored)

sync with head.

Revision 1.20 / (download) - annotate - [select for diffs], Sat May 10 19:00:07 2008 UTC (15 years, 11 months ago) by skrll
Branch: MAIN
CVS Tags: yamt-pf42-base4, yamt-pf42-base3, yamt-pf42-base2, wrstuden-revivesa-base-1, wrstuden-revivesa-base, hpcarm-cleanup-nbase
Changes since 1.19: +46 -2 lines
Diff to previous 1.19 (colored)

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

Revision 1.16.4.1 / (download) - annotate - [select for diffs], Mon Sep 3 07:05:37 2007 UTC (16 years, 7 months ago) by wrstuden
Branch: wrstuden-fixsa
Changes since 1.16: +21 -17 lines
Diff to previous 1.16 (colored) next main 1.17 (colored)

Sync w/ NetBSD-4-RC_1

Revision 1.16.2.1 / (download) - annotate - [select for diffs], Fri Aug 31 23:03:01 2007 UTC (16 years, 7 months ago) by pavel
Branch: netbsd-4
CVS Tags: wrstuden-fixsa-newbase, wrstuden-fixsa-base-1, wrstuden-fixsa-base, netbsd-4-0-RELEASE, netbsd-4-0-RC5, netbsd-4-0-RC4, netbsd-4-0-RC3, netbsd-4-0-RC2, netbsd-4-0-RC1, netbsd-4-0-1-RELEASE, netbsd-4-0
Changes since 1.16: +21 -17 lines
Diff to previous 1.16 (colored) next main 1.17 (colored)

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.

Revision 1.19 / (download) - annotate - [select for diffs], Sat Apr 7 17:14:58 2007 UTC (17 years ago) by christos
Branch: MAIN
CVS Tags: yamt-pf42-baseX, yamt-pf42-base, matt-mips64-base, matt-mips64, matt-armv6-prevmlocking, matt-armv6-nbase, matt-armv6-base, matt-armv6, keiichi-mipv6-nbase, keiichi-mipv6-base, keiichi-mipv6, hpcarm-cleanup-base, hpcarm-cleanup, cube-autoconf-base, cube-autoconf
Branch point for: yamt-pf42, wrstuden-revivesa
Changes since 1.18: +21 -17 lines
Diff to previous 1.18 (colored)

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

Revision 1.18 / (download) - annotate - [select for diffs], Tue Jan 16 17:32:05 2007 UTC (17 years, 3 months ago) by hubertf
Branch: MAIN
Changes since 1.17: +4 -7 lines
Diff to previous 1.17 (colored)

 * 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.

Revision 1.17 / (download) - annotate - [select for diffs], Mon Dec 18 21:03:29 2006 UTC (17 years, 4 months ago) by christos
Branch: MAIN
Changes since 1.16: +4 -4 lines
Diff to previous 1.16 (colored)

from Anon Ymous: compile with -Wextra

Revision 1.16 / (download) - annotate - [select for diffs], Sun Oct 22 21:11:56 2006 UTC (17 years, 5 months ago) by christos
Branch: MAIN
CVS Tags: netbsd-4-base
Branch point for: wrstuden-fixsa, netbsd-4
Changes since 1.15: +3 -3 lines
Diff to previous 1.15 (colored)

use c99 initializers

Revision 1.15 / (download) - annotate - [select for diffs], Tue Oct 10 01:55:45 2006 UTC (17 years, 6 months ago) by dbj
Branch: MAIN
Changes since 1.14: +6 -14 lines
Diff to previous 1.14 (colored)

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

Revision 1.14 / (download) - annotate - [select for diffs], Sun Oct 8 16:25:18 2006 UTC (17 years, 6 months ago) by dbj
Branch: MAIN
Changes since 1.13: +14 -6 lines
Diff to previous 1.13 (colored)

make -t cd9660 obey -x option similarly to ffs

Revision 1.13 / (download) - annotate - [select for diffs], Thu Jun 1 21:06:37 2006 UTC (17 years, 10 months ago) by hubertf
Branch: MAIN
CVS Tags: abandoned-netbsd-4-base, abandoned-netbsd-4
Changes since 1.12: +14 -11 lines
Diff to previous 1.12 (colored)

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

Revision 1.12 / (download) - annotate - [select for diffs], Thu May 25 00:25:00 2006 UTC (17 years, 10 months ago) by christos
Branch: MAIN
Changes since 1.11: +6 -7 lines
Diff to previous 1.11 (colored)

Coverity CID 2751: Avoid NULL deref.

Revision 1.11 / (download) - annotate - [select for diffs], Wed Nov 30 00:26:11 2005 UTC (18 years, 4 months ago) by dyoung
Branch: MAIN
Changes since 1.10: +3 -3 lines
Diff to previous 1.10 (colored)

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.

Revision 1.10 / (download) - annotate - [select for diffs], Mon Oct 31 23:19:06 2005 UTC (18 years, 5 months ago) by dyoung
Branch: MAIN
Changes since 1.9: +3 -3 lines
Diff to previous 1.9 (colored)

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

Revision 1.9 / (download) - annotate - [select for diffs], Mon Oct 31 08:29:19 2005 UTC (18 years, 5 months ago) by dyoung
Branch: MAIN
Changes since 1.8: +12 -57 lines
Diff to previous 1.8 (colored)

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@.

Revision 1.8 / (download) - annotate - [select for diffs], Sun Oct 30 09:27:49 2005 UTC (18 years, 5 months ago) by dyoung
Branch: MAIN
Changes since 1.7: +64 -15 lines
Diff to previous 1.7 (colored)

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).

Revision 1.7 / (download) - annotate - [select for diffs], Sun Oct 30 06:45:46 2005 UTC (18 years, 5 months ago) by dyoung
Branch: MAIN
Changes since 1.6: +4 -4 lines
Diff to previous 1.6 (colored)

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.

Revision 1.6 / (download) - annotate - [select for diffs], Sun Oct 30 03:10:28 2005 UTC (18 years, 5 months ago) by dyoung
Branch: MAIN
Changes since 1.5: +107 -107 lines
Diff to previous 1.5 (colored)

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

Revision 1.5 / (download) - annotate - [select for diffs], Tue Oct 25 02:22:04 2005 UTC (18 years, 5 months ago) by dyoung
Branch: MAIN
Changes since 1.4: +233 -346 lines
Diff to previous 1.4 (colored)

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

Revision 1.4 / (download) - annotate - [select for diffs], Sun Sep 11 22:03:48 2005 UTC (18 years, 7 months ago) by dyoung
Branch: MAIN
Changes since 1.3: +25 -22 lines
Diff to previous 1.3 (colored)

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

Revision 1.3 / (download) - annotate - [select for diffs], Sun Sep 11 22:01:44 2005 UTC (18 years, 7 months ago) by dyoung
Branch: MAIN
Changes since 1.2: +7 -4 lines
Diff to previous 1.2 (colored)

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.

Revision 1.2 / (download) - annotate - [select for diffs], Mon Aug 15 06:41:06 2005 UTC (18 years, 8 months ago) by he
Branch: MAIN
Changes since 1.1: +6 -7 lines
Diff to previous 1.1 (colored)

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

Revision 1.1 / (download) - annotate - [select for diffs], Sat Aug 13 01:53:01 2005 UTC (18 years, 8 months ago) by fvdl
Branch: MAIN

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.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.




CVSweb <webmaster@jp.NetBSD.org>