Module Name: src Committed By: snj Date: Sat Jan 2 06:41:03 UTC 2010
Modified Files: src/usr.sbin/makefs/cd9660 [netbsd-5]: iso9660_rrip.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1198): usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.5 When splitting a System Use Area between a System Use field and a Continuation Area, be sure to insert the "CE" record at the correct point in the chain of SUSP records. Without this, makefs emits an invalid image if any file needs a Continuation Area. The bug seems to have been introduced with the conversion to TAILQs. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.18.1 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.
Modified files: Index: src/usr.sbin/makefs/cd9660/iso9660_rrip.c diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4 src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.18.1 --- src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4 Mon Dec 18 21:03:29 2006 +++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c Sat Jan 2 06:41:03 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: iso9660_rrip.c,v 1.4 2006/12/18 21:03:29 christos Exp $ */ +/* $NetBSD: iso9660_rrip.c,v 1.4.18.1 2010/01/02 06:41:03 snj Exp $ */ /* * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan @@ -43,7 +43,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: iso9660_rrip.c,v 1.4 2006/12/18 21:03:29 christos Exp $"); +__RCSID("$NetBSD: iso9660_rrip.c,v 1.4.18.1 2010/01/02 06:41:03 snj Exp $"); #endif /* !__lint */ static void cd9660_rrip_initialize_inode(cd9660node *); @@ -228,7 +228,7 @@ SUSP_ENTRY_SUSP_CE, "CE", SUSP_LOC_ENTRY); cd9660_susp_ce(CE, node); /* This will automatically insert at the appropriate location */ - TAILQ_INSERT_TAIL(&node->head, CE, rr_ll); + TAILQ_INSERT_AFTER(&node->head, last, CE, rr_ll); susp_used += 28; /* Count how much CA data is necessary */