CVS commit: [netbsd-5] src/usr.sbin/makefs

["Jeff Rizzo" <riz%netbsd.org@localhost>]

Module Name:    src
Committed By:   riz
Date:           Fri Jul 15 22:39:02 UTC 2011

Modified Files:
        src/usr.sbin/makefs [netbsd-5]: cd9660.c
        src/usr.sbin/makefs/cd9660 [netbsd-5]: iso9660_rrip.c

Log Message:
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)


To generate a diff of this commit:
cvs rdiff -u -r1.22.2.2 -r1.22.2.3 src/usr.sbin/makefs/cd9660.c
cvs rdiff -u -r1.4.18.4 -r1.4.18.5 src/usr.sbin/makefs/cd9660/iso9660_rrip.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.