diff --git a/include/cdio/rock.h b/include/cdio/rock.h index e2d8a710..8ad1b54b 100644 --- a/include/cdio/rock.h +++ b/include/cdio/rock.h @@ -1,5 +1,5 @@ /* - $Id: rock.h,v 1.3 2005/02/20 10:21:01 rocky Exp $ + $Id: rock.h,v 1.4 2005/02/20 16:21:06 rocky Exp $ Copyright (C) 2005 Rocky Bernstein @@ -62,6 +62,27 @@ extern enum cdio_rock_enums { ISO_ROCK_ISFIFO = 010000 /**< pipe or FIFO */ } cdio_rock_enums; +#define ISO_ROCK_IRUSR 000400 /** read permission (owner) */ +#define ISO_ROCK_IWUSR 000200 /** write permission (owner) */ +#define ISO_ROCK_IXUSR 000100 /** execute permission (owner) */ +#define ISO_ROCK_IRGRP 000040 /** read permission (group) */ +#define ISO_ROCK_IWGRP 000020 /** write permission (group) */ +#define ISO_ROCK_IXGRP 000010 /** execute permission (group) */ +#define ISO_ROCK_IROTH 000004 /** read permission (other) */ +#define ISO_ROCK_IWOTH 000002 /** write permission (other) */ +#define ISO_ROCK_IXOTH 000001 /** execute permission (other) */ + +#define ISO_ROCK_ISUID 004000 /** set user ID on execution */ +#define ISO_ROCK_ISGID 002000 /** set group ID on execution */ +#define ISO_ROCK_ISVTX 001000 /** save swapped text even after use */ + +#define ISO_ROCK_ISSOCK 0140000 /** socket */ +#define ISO_ROCK_ISLNK 0120000 /** symbolic link */ +#define ISO_ROCK_ISREG 0100000 /** regular */ +#define ISO_ROCK_ISBLK 060000 /** block special */ +#define ISO_ROCK_ISCHR 020000 /** character special */ +#define ISO_ROCK_ISDIR 040000 /** directory */ +#define ISO_ROCK_ISFIFO 010000 /** pipe or FIFO */ /** Enforced file locking (shared w/set group ID) */ #define ISO_ROCK_ENFMT ISO_ROCK_ISGID diff --git a/lib/iso9660/rock.c b/lib/iso9660/rock.c index 4be03374..04b28595 100644 --- a/lib/iso9660/rock.c +++ b/lib/iso9660/rock.c @@ -1,5 +1,5 @@ /* - $Id: rock.c,v 1.5 2005/02/20 10:21:01 rocky Exp $ + $Id: rock.c,v 1.6 2005/02/20 16:21:06 rocky Exp $ Copyright (C) 2005 Rocky Bernstein Adapted from GNU/Linux fs/isofs/rock.c (C) 1992, 1993 Eric Youngdale @@ -33,6 +33,10 @@ # include #endif +#ifdef HAVE_SYS_STAT_H +# include +#endif + #include #include #include @@ -452,17 +456,17 @@ iso9660_get_rock_attr_str(posix_mode_t st_mode) { char *result = _getbuf(); - if (st_mode & ISO_ROCK_ISBLK) + if (S_ISBLK(st_mode)) result[ 0] = 'b'; - else if (st_mode & ISO_ROCK_ISDIR) + else if (S_ISDIR(st_mode)) result[ 0] = 'd'; - else if (st_mode & ISO_ROCK_ISCHR) + else if (S_ISCHR(st_mode)) result[ 0] = 'c'; - else if (st_mode & ISO_ROCK_ISLNK) + else if (S_ISLNK(st_mode)) result[ 0] = 'l'; - else if (st_mode & ISO_ROCK_ISFIFO) + else if (S_ISFIFO(st_mode)) result[ 0] = 'p'; - else if (st_mode & ISO_ROCK_ISSOCK) + else if (S_ISSOCK(st_mode)) result[ 0] = 's'; /* May eventually fill in others.. */ else diff --git a/src/cd-info.c b/src/cd-info.c index 0bb3718f..93619907 100644 --- a/src/cd-info.c +++ b/src/cd-info.c @@ -1,5 +1,5 @@ /* - $Id: cd-info.c,v 1.116 2005/02/20 10:21:01 rocky Exp $ + $Id: cd-info.c,v 1.117 2005/02/20 16:21:06 rocky Exp $ Copyright (C) 2003, 2004, 2005 Rocky Bernstein Copyright (C) 1996, 1997, 1998 Gerd Knorr @@ -600,7 +600,7 @@ print_iso9660_recurse (CdIo_t *p_cdio, const char pathname[], char _fullname[4096] = { 0, }; char translated_name[MAX_ISONAME+1]; - if (yep != p_statbuf->b_rock) { + if (yep != p_statbuf->b_rock || 1 == opts.no_rock_ridge) { iso9660_name_translate_ext(psz_iso_name, translated_name, i_joliet_level); } @@ -616,8 +616,8 @@ print_iso9660_recurse (CdIo_t *p_cdio, const char pathname[], && strcmp (psz_iso_name, "..")) _cdio_list_append (p_dirlist, strdup (_fullname)); - print_fs_attrs(p_statbuf, opts.no_rock_ridge, fs & CDIO_FS_ANAL_XA, - translated_name, psz_iso_name); + print_fs_attrs(p_statbuf, 0 == opts.no_rock_ridge, fs & CDIO_FS_ANAL_XA, + psz_iso_name, translated_name); } _cdio_list_free (p_entlist, true); diff --git a/src/iso-info.c b/src/iso-info.c index 4d20fa19..05bfacb1 100644 --- a/src/iso-info.c +++ b/src/iso-info.c @@ -1,5 +1,5 @@ /* - $Id: iso-info.c,v 1.25 2005/02/20 10:21:01 rocky Exp $ + $Id: iso-info.c,v 1.26 2005/02/20 16:21:06 rocky Exp $ Copyright (C) 2004, 2005 Rocky Bernstein @@ -203,7 +203,7 @@ print_iso9660_recurse (iso9660_t *p_iso, const char pathname[]) char _fullname[4096] = { 0, }; char translated_name[MAX_ISONAME+1]; - if (yep != p_statbuf->b_rock) { + if (yep != p_statbuf->b_rock || 1 == opts.no_rock_ridge) { iso9660_name_translate_ext(iso_name, translated_name, i_joliet_level); snprintf (_fullname, sizeof (_fullname), "%s%s", pathname, translated_name); diff --git a/src/util.c b/src/util.c index b1c8e5b6..5e2cd3b8 100644 --- a/src/util.c +++ b/src/util.c @@ -1,5 +1,5 @@ /* - $Id: util.c,v 1.39 2005/02/20 10:34:45 rocky Exp $ + $Id: util.c,v 1.40 2005/02/20 16:21:06 rocky Exp $ Copyright (C) 2003, 2004, 2005 Rocky Bernstein @@ -460,10 +460,11 @@ print_fs_attrs(iso9660_stat_t *p_statbuf, bool b_rock, bool b_xa, char date_str[30]; if (yep == p_statbuf->b_rock && b_rock) { - report (stdout, " %s %d %d [LSN %6lu] %9u", - iso9660_get_rock_attr_str (p_statbuf->st_mode), - p_statbuf->st_uid, - p_statbuf->st_gid, + report (stdout, " %s %d %d %d [LSN %6lu] %9u", + iso9660_get_rock_attr_str (p_statbuf->st_mode), + p_statbuf->st_nlinks, + p_statbuf->st_uid, + p_statbuf->st_gid, (long unsigned int) p_statbuf->lsn, (unsigned int) p_statbuf->size); diff --git a/test/Makefile.am b/test/Makefile.am index 27fdf818..ecafbaf8 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.46 2005/02/08 04:38:05 rocky Exp $ +# $Id: Makefile.am,v 1.47 2005/02/20 16:21:06 rocky Exp $ # # Copyright (C) 2003, 2004, 2005 Rocky Bernstein # @@ -59,7 +59,8 @@ check_PROGRAMS = $(hack) check_DATA = vcd_demo.right vcd_demo_vcdinfo.right \ videocd.right videocd.nrg \ cdda.right cdda.toc cdda.cue cdda.bin \ - isofs-m1.right isofs-m1.toc isofs-m1.cue isofs-m1.bin \ + isofs-m1.right isofs-m1-no-rr.right \ + isofs-m1.toc isofs-m1.cue isofs-m1.bin \ check_opts0.right check_opts1.right check_opts2.right \ check_opts3.right check_opts4.right check_opts5.right \ check_opts6.right check_opts7.right \ diff --git a/test/check_cue.sh.in b/test/check_cue.sh.in index 0cec7dbe..28a4cc7f 100644 --- a/test/check_cue.sh.in +++ b/test/check_cue.sh.in @@ -1,5 +1,5 @@ #!/bin/sh -#$Id: check_cue.sh.in,v 1.25 2005/01/29 14:50:34 rocky Exp $ +#$Id: check_cue.sh.in,v 1.26 2005/02/20 16:21:06 rocky Exp $ # Tests to see that BIN/CUE and cdrdao TOC file iamge reading is correct # (via cd-info). @@ -43,7 +43,13 @@ if test -f ${srcdir}/${fname}.bin ; then opts="-q --no-device-info --no-disc-mode --cue-file ${srcdir}/${fname}.cue --iso9660" test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right RC=$? - check_result $RC "cd-info CUE test $testnum" "${CD_INFO} $opts" + check_result $RC "cd-info Rock-Ridge CUE test $testnum" "${CD_INFO} $opts" + + opts="-q --no-device-info --no-disc-mode --no-rock-ridge --cue-file ${srcdir}/${fname}.cue --iso9660" + test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}-no-rr.right + RC=$? + check_result $RC "cd-info no Rock-Ridge CUE test $testnum" "${CD_INFO} $opts" + else echo "Don't see CUE file ${srcdir}/${fname}.bin. Test $testnum skipped." fi diff --git a/test/isofs-m1-no-rr.right b/test/isofs-m1-no-rr.right new file mode 100644 index 00000000..45b75e14 --- /dev/null +++ b/test/isofs-m1-no-rr.right @@ -0,0 +1,32 @@ +This is free software; see the source for copying conditions. +There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. +__________________________________ + +CD-ROM Track List (1 - 1) + #: MSF LSN Type Green? Copy? + 1: 00:02:00 000000 data false no +170: 00:06:02 000302 leadout (693 KB raw, 604 KB formatted) +Media Catalog Number (MCN): not available +__________________________________ +CD Analysis Report +CD-ROM with ISO 9660 filesystem +ISO 9660: 64 blocks, label `CDROM ' +Application: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING +Preparer : +Publisher : +System : LINUX +Volume : CDROM +Volume Set : +ISO9660 filesystem +/: + d [LSN 23] 2048 Apr 20 2003 07:26 . + d [LSN 23] 2048 Apr 20 2003 07:26 .. + - [LSN 26] 17992 Jul 29 2002 08:39 copying + d [LSN 24] 2048 Apr 20 2003 12:18 doc + +/doc/: + d [LSN 24] 2048 Apr 20 2003 12:18 . + d [LSN 23] 2048 Apr 20 2003 07:26 .. + - [LSN 35] 648 Apr 20 2003 12:18 readme.txt + diff --git a/test/isofs-m1.right b/test/isofs-m1.right index 98505735..f492753f 100644 --- a/test/isofs-m1.right +++ b/test/isofs-m1.right @@ -20,13 +20,13 @@ Volume : CDROM Volume Set : ISO9660 filesystem /: - d [LSN 23] 2048 Apr 20 2003 07:26 . - d [LSN 23] 2048 Apr 20 2003 07:26 .. - - [LSN 26] 17992 Jul 29 2002 08:39 COPYING - d [LSN 24] 2048 Apr 20 2003 12:18 doc + drwxrwxr-x 3 715 715 [LSN 23] 2048 Apr 20 2003 07:26 . + drwxrwxr-x 3 715 715 [LSN 23] 2048 Apr 20 2003 07:26 .. + -rw-r--r-- 1 715 715 [LSN 26] 17992 Jul 29 2002 08:39 COPYING + drwxrwxr-x 2 715 715 [LSN 24] 2048 Apr 20 2003 12:18 doc /doc/: - d [LSN 24] 2048 Apr 20 2003 12:18 . - d [LSN 23] 2048 Apr 20 2003 07:26 .. - - [LSN 35] 648 Apr 20 2003 12:18 readme.txt + drwxrwxr-x 2 715 715 [LSN 24] 2048 Apr 20 2003 12:18 . + drwxrwxr-x 3 715 715 [LSN 23] 2048 Apr 20 2003 07:26 .. + -rw-rw-r-- 1 715 715 [LSN 35] 648 Apr 20 2003 12:18 readme.txt diff --git a/test/monvoisin.right b/test/monvoisin.right index 6c151c73..7d567476 100644 --- a/test/monvoisin.right +++ b/test/monvoisin.right @@ -24,31 +24,31 @@ ISO9660 filesystem /: d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Dec 31 1969 23:59 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Dec 31 1969 23:59 .. - d---1xrxrxr 0 0 [fn 00] [LSN 19] 2048 Feb 19 2001 16:37 CDI - d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Feb 19 2001 16:37 EXT - d---1xrxrxr 0 0 [fn 00] [LSN 21] 2048 Feb 19 2001 16:37 MPEGAV - d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Feb 19 2001 16:37 SEGMENT - d---1xrxrxr 0 0 [fn 00] [LSN 23] 2048 Feb 19 2001 16:37 VCD + d---1xrxrxr 0 0 [fn 00] [LSN 19] 2048 Feb 19 2001 16:37 cdi + d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Feb 19 2001 16:37 ext + d---1xrxrxr 0 0 [fn 00] [LSN 21] 2048 Feb 19 2001 16:37 mpegav + d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Feb 19 2001 16:37 segment + d---1xrxrxr 0 0 [fn 00] [LSN 23] 2048 Feb 19 2001 16:37 vcd /CDI/: d---1xrxrxr 0 0 [fn 00] [LSN 19] 2048 Dec 31 1969 23:59 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Dec 31 1969 23:59 .. - ---2-xrxrxr 0 0 [fn 01] [LSN 211] 1494332 ( 1315168) Feb 19 2001 16:37 CDI_IMAG.RTF;1 - ----1xrxrxr 0 0 [fn 01] [LSN 854] 13616 Feb 19 2001 16:37 CDI_TEXT.FNT;1 - ----1xrxrxr 0 0 [fn 01] [LSN 861] 102400 Feb 19 2001 16:37 CDI_VCD.APP;1 - ----1xrxrxr 0 0 [fn 01] [LSN 911] 279 Feb 19 2001 16:37 CDI_VCD.CFG;1 + ---2-xrxrxr 0 0 [fn 01] [LSN 211] 1494332 ( 1315168) Feb 19 2001 16:37 cdi_imag.rtf + ----1xrxrxr 0 0 [fn 01] [LSN 854] 13616 Feb 19 2001 16:37 cdi_text.fnt + ----1xrxrxr 0 0 [fn 01] [LSN 861] 102400 Feb 19 2001 16:37 cdi_vcd.app + ----1xrxrxr 0 0 [fn 01] [LSN 911] 279 Feb 19 2001 16:37 cdi_vcd.cfg /EXT/: d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Dec 31 1969 23:59 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Dec 31 1969 23:59 .. - ----1xrxrxr 0 0 [fn 01] [LSN 912] 65536 Feb 19 2001 16:37 LOT_X.VCD;1 - ----1xrxrxr 0 0 [fn 01] [LSN 944] 24 Feb 19 2001 16:37 PSD_X.VCD;1 - ----1xrxrxr 0 0 [fn 01] [LSN 945] 114 Feb 19 2001 16:37 SCANDATA.DAT;1 + ----1xrxrxr 0 0 [fn 01] [LSN 912] 65536 Feb 19 2001 16:37 lot_x.vcd + ----1xrxrxr 0 0 [fn 01] [LSN 944] 24 Feb 19 2001 16:37 psd_x.vcd + ----1xrxrxr 0 0 [fn 01] [LSN 945] 114 Feb 19 2001 16:37 scandata.dat /MPEGAV/: d---1xrxrxr 0 0 [fn 00] [LSN 21] 2048 Dec 31 1969 23:59 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Dec 31 1969 23:59 .. - ---2-xrxrxr 0 0 [fn 01] [LSN 1251] 3655652 ( 3221504) Feb 19 2001 16:37 AVSEQ01.DAT;1 + ---2-xrxrxr 0 0 [fn 01] [LSN 1251] 3655652 ( 3221504) Feb 19 2001 16:37 avseq01.dat /SEGMENT/: d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Dec 31 1969 23:59 . @@ -57,10 +57,10 @@ ISO9660 filesystem /VCD/: d---1xrxrxr 0 0 [fn 00] [LSN 23] 2048 Dec 31 1969 23:59 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Dec 31 1969 23:59 .. - ----1xrxrxr 0 0 [fn 00] [LSN 151] 2048 Feb 19 2001 16:37 ENTRIES.VCD;1 - ----1xrxrxr 0 0 [fn 00] [LSN 150] 2048 Feb 19 2001 16:37 INFO.VCD;1 - ----1xrxrxr 0 0 [fn 00] [LSN 152] 65536 Feb 19 2001 16:37 LOT.VCD;1 - ----1xrxrxr 0 0 [fn 00] [LSN 184] 24 Feb 19 2001 16:37 PSD.VCD;1 + ----1xrxrxr 0 0 [fn 00] [LSN 151] 2048 Feb 19 2001 16:37 entries.vcd + ----1xrxrxr 0 0 [fn 00] [LSN 150] 2048 Feb 19 2001 16:37 info.vcd + ----1xrxrxr 0 0 [fn 00] [LSN 152] 65536 Feb 19 2001 16:37 lot.vcd + ----1xrxrxr 0 0 [fn 00] [LSN 184] 24 Feb 19 2001 16:37 psd.vcd XA sectors Video CD session #2 starts at track 2, LSN: 1251, ISO 9660 blocks: 1101 diff --git a/test/svcd_ogt_test_ntsc.right b/test/svcd_ogt_test_ntsc.right index 15db4334..5da32c54 100644 --- a/test/svcd_ogt_test_ntsc.right +++ b/test/svcd_ogt_test_ntsc.right @@ -23,35 +23,35 @@ ISO9660 filesystem /: d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - d---1xrxrxr 0 0 [fn 00] [LSN 19] 2048 Jul 14 1978 00:00 EXT - d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Jul 14 1978 00:00 MPEG2 - d---1xrxrxr 0 0 [fn 00] [LSN 21] 2048 Jul 14 1978 00:00 SEGMENT - d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Jul 14 1978 00:00 SVCD + d---1xrxrxr 0 0 [fn 00] [LSN 19] 2048 Jul 14 1978 00:00 ext + d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Jul 14 1978 00:00 mpeg2 + d---1xrxrxr 0 0 [fn 00] [LSN 21] 2048 Jul 14 1978 00:00 segment + d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Jul 14 1978 00:00 svcd /EXT/: d---1xrxrxr 0 0 [fn 00] [LSN 19] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - ----1xrxrxr 0 0 [fn 00] [LSN 375] 201 Jul 14 1978 00:00 SCANDATA.DAT;1 + ----1xrxrxr 0 0 [fn 00] [LSN 375] 201 Jul 14 1978 00:00 scandata.dat /MPEG2/: d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - ---2-xrxrxr 0 0 [fn 00] [LSN 526] 7971320 ( 7024640) Jul 14 1978 00:00 AVSEQ01.MPG;1 + ---2-xrxrxr 0 0 [fn 00] [LSN 526] 7971320 ( 7024640) Jul 14 1978 00:00 avseq01.mpg /SEGMENT/: d---1xrxrxr 0 0 [fn 00] [LSN 21] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - ---2-xrxrxr 0 0 [fn 00] [LSN 225] 183596 ( 161792) Jul 14 1978 00:00 ITEM0001.MPG;1 + ---2-xrxrxr 0 0 [fn 00] [LSN 225] 183596 ( 161792) Jul 14 1978 00:00 item0001.mpg /SVCD/: d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - ----1xrxrxr 0 0 [fn 00] [LSN 151] 2048 Jul 14 1978 00:00 ENTRIES.SVD;1 - ----1xrxrxr 0 0 [fn 00] [LSN 150] 2048 Jul 14 1978 00:00 INFO.SVD;1 - ----1xrxrxr 0 0 [fn 00] [LSN 152] 65536 Jul 14 1978 00:00 LOT.SVD;1 - ----1xrxrxr 0 0 [fn 00] [LSN 184] 40 Jul 14 1978 00:00 PSD.SVD;1 - ----1xrxrxr 0 0 [fn 00] [LSN 186] 190 Jul 14 1978 00:00 SEARCH.DAT;1 - ----1xrxrxr 0 0 [fn 00] [LSN 185] 2048 Jul 14 1978 00:00 TRACKS.SVD;1 + ----1xrxrxr 0 0 [fn 00] [LSN 151] 2048 Jul 14 1978 00:00 entries.svd + ----1xrxrxr 0 0 [fn 00] [LSN 150] 2048 Jul 14 1978 00:00 info.svd + ----1xrxrxr 0 0 [fn 00] [LSN 152] 65536 Jul 14 1978 00:00 lot.svd + ----1xrxrxr 0 0 [fn 00] [LSN 184] 40 Jul 14 1978 00:00 psd.svd + ----1xrxrxr 0 0 [fn 00] [LSN 186] 190 Jul 14 1978 00:00 search.dat + ----1xrxrxr 0 0 [fn 00] [LSN 185] 2048 Jul 14 1978 00:00 tracks.svd XA sectors Super Video CD (SVCD) or Chaoji Video CD (CVD) session #2 starts at track 2, LSN: 526, ISO 9660 blocks: 376 diff --git a/test/svcdgs.right b/test/svcdgs.right index ac65eeee..4e3aef37 100644 --- a/test/svcdgs.right +++ b/test/svcdgs.right @@ -24,13 +24,13 @@ ISO9660 filesystem /: d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Jan 06 2001 21:29 . d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Jan 06 2001 21:29 .. - d---1xrxrxr 0 0 [fn 00] [LSN 21] 2048 Jan 06 2001 21:29 AUTORUN - d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Jan 06 2001 21:29 DATA - d---1xrxrxr 0 0 [fn 00] [LSN 23] 2048 Jan 06 2001 21:29 EXT - d---1xrxrxr 0 0 [fn 00] [LSN 24] 2048 Jan 06 2001 21:29 MPEGAV - d---1xrxrxr 0 0 [fn 00] [LSN 25] 2048 Jan 06 2001 21:29 SEGMENT - d---1xrxrxr 0 0 [fn 00] [LSN 26] 2048 Jan 06 2001 21:29 SVCD - d---1xrxrxr 0 0 [fn 00] [LSN 27] 2048 Jan 06 2001 21:29 VMP + d---1xrxrxr 0 0 [fn 00] [LSN 21] 2048 Jan 06 2001 21:29 autorun + d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Jan 06 2001 21:29 data + d---1xrxrxr 0 0 [fn 00] [LSN 23] 2048 Jan 06 2001 21:29 ext + d---1xrxrxr 0 0 [fn 00] [LSN 24] 2048 Jan 06 2001 21:29 mpegav + d---1xrxrxr 0 0 [fn 00] [LSN 25] 2048 Jan 06 2001 21:29 segment + d---1xrxrxr 0 0 [fn 00] [LSN 26] 2048 Jan 06 2001 21:29 svcd + d---1xrxrxr 0 0 [fn 00] [LSN 27] 2048 Jan 06 2001 21:29 vmp /AUTORUN/: d---1xrxrxr 0 0 [fn 00] [LSN 21] 2048 Jan 06 2001 21:29 . @@ -39,7 +39,7 @@ ISO9660 filesystem /DATA/: d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Jan 06 2001 21:29 . d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Jan 06 2001 21:29 .. - d---1xrxrxr 0 0 [fn 00] [LSN 300] 2048 Jan 06 2001 21:29 SVCDDATA + d---1xrxrxr 0 0 [fn 00] [LSN 300] 2048 Jan 06 2001 21:29 svcddata /DATA/SVCDDATA/: d---1xrxrxr 0 0 [fn 00] [LSN 300] 2048 Jan 06 2001 21:29 . @@ -52,7 +52,7 @@ ISO9660 filesystem /MPEGAV/: d---1xrxrxr 0 0 [fn 00] [LSN 24] 2048 Jan 06 2001 21:29 . d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Jan 06 2001 21:29 .. - ---2--r-r-r 0 0 [fn 01] [LSN 463] 13909140 ( 12257280) Jan 06 2001 21:29 AVSEQ01.MPG;1 + ---2--r-r-r 0 0 [fn 01] [LSN 463] 13909140 ( 12257280) Jan 06 2001 21:29 avseq01.mpg /SEGMENT/: d---1xrxrxr 0 0 [fn 00] [LSN 25] 2048 Jan 06 2001 21:29 . @@ -61,18 +61,18 @@ ISO9660 filesystem /SVCD/: d---1xrxrxr 0 0 [fn 00] [LSN 26] 2048 Jan 06 2001 21:29 . d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Jan 06 2001 21:29 .. - ----1xr-rxr 0 0 [fn 00] [LSN 151] 2048 Jan 06 2001 21:29 ENTRIES.SVD;1 - ----1xr-rxr 0 0 [fn 00] [LSN 150] 2048 Jan 06 2001 21:29 INFO.SVD;1 - ----1xr-rxr 0 0 [fn 00] [LSN 152] 65536 Jan 06 2001 21:29 LOT.SVD;1 - ----1xr-rxr 0 0 [fn 00] [LSN 184] 16 Jan 06 2001 21:29 PSD.SVD;1 - ----1xr-rxr 0 0 [fn 00] [LSN 188] 427 Jan 06 2001 21:29 SEARCH.DAT;1 - ----1xr-rxr 0 0 [fn 00] [LSN 186] 4096 Jan 06 2001 21:29 SPICONTX.SVD;1 - ----1xr-rxr 0 0 [fn 00] [LSN 185] 2048 Jan 06 2001 21:29 TRACKS.SVD;1 + ----1xr-rxr 0 0 [fn 00] [LSN 151] 2048 Jan 06 2001 21:29 entries.svd + ----1xr-rxr 0 0 [fn 00] [LSN 150] 2048 Jan 06 2001 21:29 info.svd + ----1xr-rxr 0 0 [fn 00] [LSN 152] 65536 Jan 06 2001 21:29 lot.svd + ----1xr-rxr 0 0 [fn 00] [LSN 184] 16 Jan 06 2001 21:29 psd.svd + ----1xr-rxr 0 0 [fn 00] [LSN 188] 427 Jan 06 2001 21:29 search.dat + ----1xr-rxr 0 0 [fn 00] [LSN 186] 4096 Jan 06 2001 21:29 spicontx.svd + ----1xr-rxr 0 0 [fn 00] [LSN 185] 2048 Jan 06 2001 21:29 tracks.svd /VMP/: d---1xrxrxr 0 0 [fn 00] [LSN 27] 2048 Jan 06 2001 21:29 . d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Jan 06 2001 21:29 .. - d---1xrxrxr 0 0 [fn 00] [LSN 28] 2048 Jan 06 2001 21:29 SVCDJ + d---1xrxrxr 0 0 [fn 00] [LSN 28] 2048 Jan 06 2001 21:29 svcdj /VMP/SVCDJ/: d---1xrxrxr 0 0 [fn 00] [LSN 28] 2048 Jan 06 2001 21:29 . diff --git a/test/vcd_demo.right b/test/vcd_demo.right index 37790ed2..b7310cc5 100644 --- a/test/vcd_demo.right +++ b/test/vcd_demo.right @@ -24,67 +24,67 @@ ISO9660 filesystem /: d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - d---1xrxrxr 0 0 [fn 00] [LSN 19] 2048 Jul 14 1978 00:00 EXT - d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Jul 14 1978 00:00 MPEGAV - d---1xrxrxr 0 0 [fn 00] [LSN 21] 2048 Jul 14 1978 00:00 SEGMENT - d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Jul 14 1978 00:00 Sources - d---1xrxrxr 0 0 [fn 00] [LSN 25] 2048 Jul 14 1978 00:00 VCD + d---1xrxrxr 0 0 [fn 00] [LSN 19] 2048 Jul 14 1978 00:00 ext + d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Jul 14 1978 00:00 mpegav + d---1xrxrxr 0 0 [fn 00] [LSN 21] 2048 Jul 14 1978 00:00 segment + d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Jul 14 1978 00:00 sources + d---1xrxrxr 0 0 [fn 00] [LSN 25] 2048 Jul 14 1978 00:00 vcd /EXT/: d---1xrxrxr 0 0 [fn 00] [LSN 19] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - ----1xrxrxr 0 0 [fn 01] [LSN 375] 65536 Jul 14 1978 00:00 LOT_X.VCD;1 - ----1xrxrxr 0 0 [fn 01] [LSN 407] 144 Jul 14 1978 00:00 PSD_X.VCD;1 + ----1xrxrxr 0 0 [fn 01] [LSN 375] 65536 Jul 14 1978 00:00 lot_x.vcd + ----1xrxrxr 0 0 [fn 01] [LSN 407] 144 Jul 14 1978 00:00 psd_x.vcd /MPEGAV/: d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - ---2-xrxrxr 0 0 [fn 01] [LSN 1182] 904036 ( 796672) Jul 14 1978 00:00 AVSEQ01.DAT;1 - ---2-xrxrxr 0 0 [fn 02] [LSN 1721] 904036 ( 796672) Jul 14 1978 00:00 AVSEQ02.DAT;1 + ---2-xrxrxr 0 0 [fn 01] [LSN 1182] 904036 ( 796672) Jul 14 1978 00:00 avseq01.dat + ---2-xrxrxr 0 0 [fn 02] [LSN 1721] 904036 ( 796672) Jul 14 1978 00:00 avseq02.dat /SEGMENT/: d---1xrxrxr 0 0 [fn 00] [LSN 21] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - ---2-xrxrxr 0 0 [fn 01] [LSN 225] 220780 ( 194560) Jul 14 1978 00:00 ITEM0001.DAT;1 + ---2-xrxrxr 0 0 [fn 01] [LSN 225] 220780 ( 194560) Jul 14 1978 00:00 item0001.dat /Sources/: d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - d---1xrxrxr 0 0 [fn 00] [LSN 23] 2048 Jul 14 1978 00:00 HTML - ----1xrxrxr 0 0 [fn 01] [LSN 434] 842 Dec 11 2002 10:33 index.htm;1 - ----1xrxrxr 0 0 [fn 01] [LSN 435] 1216557 Jan 07 2003 18:01 menu.ppm;1 - ----1xrxrxr 0 0 [fn 01] [LSN 1030] 2793 Jan 07 2003 18:08 source.xml;1 + d---1xrxrxr 0 0 [fn 00] [LSN 23] 2048 Jul 14 1978 00:00 html + ----1xrxrxr 0 0 [fn 01] [LSN 434] 842 Dec 11 2002 10:33 index.htm + ----1xrxrxr 0 0 [fn 01] [LSN 435] 1216557 Jan 07 2003 18:01 menu.ppm + ----1xrxrxr 0 0 [fn 01] [LSN 1030] 2793 Jan 07 2003 18:08 source.xml /Sources/HTML/: d---1xrxrxr 0 0 [fn 00] [LSN 23] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Jul 14 1978 00:00 .. - ----1xrxrxr 0 0 [fn 01] [LSN 425] 1067 Jan 07 2003 17:51 0.xml;1 - ----1xrxrxr 0 0 [fn 01] [LSN 426] 1067 Jan 07 2003 17:51 1.xml;1 + ----1xrxrxr 0 0 [fn 01] [LSN 425] 1067 Jan 07 2003 17:51 0.xml + ----1xrxrxr 0 0 [fn 01] [LSN 426] 1067 Jan 07 2003 17:51 1.xml d---1xrxrxr 0 0 [fn 00] [LSN 24] 2048 Jul 14 1978 00:00 img - ----1xrxrxr 0 0 [fn 01] [LSN 427] 1327 Jan 07 2003 17:51 movies.css;1 - ----1xrxrxr 0 0 [fn 01] [LSN 428] 12024 Jan 07 2003 17:51 toc.xsl;1 + ----1xrxrxr 0 0 [fn 01] [LSN 427] 1327 Jan 07 2003 17:51 movies.css + ----1xrxrxr 0 0 [fn 01] [LSN 428] 12024 Jan 07 2003 17:51 toc.xsl /Sources/HTML/img/: d---1xrxrxr 0 0 [fn 00] [LSN 24] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 23] 2048 Jul 14 1978 00:00 .. - ----1xrxrxr 0 0 [fn 01] [LSN 408] 1999 Nov 13 2002 07:27 AL.gif;1 - ----1xrxrxr 0 0 [fn 01] [LSN 409] 7626 Jan 07 2003 17:42 Loeki_Groep_01.gif;1 - ----1xrxrxr 0 0 [fn 01] [LSN 413] 9986 Jan 07 2003 17:42 Loeki_Groep_02.gif;1 - ----1xrxrxr 0 0 [fn 01] [LSN 418] 207 Nov 14 2002 19:33 a_left.gif;1 - ----1xrxrxr 0 0 [fn 01] [LSN 419] 207 Nov 14 2002 19:33 a_right.gif;1 - ----1xrxrxr 0 0 [fn 01] [LSN 420] 441 Nov 13 2002 10:54 animatie.gif;1 - ----1xrxrxr 0 0 [fn 01] [LSN 421] 250 Nov 14 2002 11:44 face_up2.gif;1 - ----1xrxrxr 0 0 [fn 01] [LSN 422] 259 Nov 13 2002 11:09 familie.gif;1 - ----1xrxrxr 0 0 [fn 01] [LSN 423] 1010 Nov 14 2002 11:52 goldstar2.gif;1 - ----1xrxrxr 0 0 [fn 01] [LSN 424] 1783 Nov 13 2002 07:15 vcd.gif;1 + ----1xrxrxr 0 0 [fn 01] [LSN 408] 1999 Nov 13 2002 07:27 al.gif + ----1xrxrxr 0 0 [fn 01] [LSN 409] 7626 Jan 07 2003 17:42 loeki_groep_01.gif + ----1xrxrxr 0 0 [fn 01] [LSN 413] 9986 Jan 07 2003 17:42 loeki_groep_02.gif + ----1xrxrxr 0 0 [fn 01] [LSN 418] 207 Nov 14 2002 19:33 a_left.gif + ----1xrxrxr 0 0 [fn 01] [LSN 419] 207 Nov 14 2002 19:33 a_right.gif + ----1xrxrxr 0 0 [fn 01] [LSN 420] 441 Nov 13 2002 10:54 animatie.gif + ----1xrxrxr 0 0 [fn 01] [LSN 421] 250 Nov 14 2002 11:44 face_up2.gif + ----1xrxrxr 0 0 [fn 01] [LSN 422] 259 Nov 13 2002 11:09 familie.gif + ----1xrxrxr 0 0 [fn 01] [LSN 423] 1010 Nov 14 2002 11:52 goldstar2.gif + ----1xrxrxr 0 0 [fn 01] [LSN 424] 1783 Nov 13 2002 07:15 vcd.gif /VCD/: d---1xrxrxr 0 0 [fn 00] [LSN 25] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - ----1xrxrxr 0 0 [fn 00] [LSN 151] 2048 Jul 14 1978 00:00 ENTRIES.VCD;1 - ----1xrxrxr 0 0 [fn 00] [LSN 150] 2048 Jul 14 1978 00:00 INFO.VCD;1 - ----1xrxrxr 0 0 [fn 00] [LSN 152] 65536 Jul 14 1978 00:00 LOT.VCD;1 - ----1xrxrxr 0 0 [fn 00] [LSN 184] 72 Jul 14 1978 00:00 PSD.VCD;1 + ----1xrxrxr 0 0 [fn 00] [LSN 151] 2048 Jul 14 1978 00:00 entries.vcd + ----1xrxrxr 0 0 [fn 00] [LSN 150] 2048 Jul 14 1978 00:00 info.vcd + ----1xrxrxr 0 0 [fn 00] [LSN 152] 65536 Jul 14 1978 00:00 lot.vcd + ----1xrxrxr 0 0 [fn 00] [LSN 184] 72 Jul 14 1978 00:00 psd.vcd XA sectors Video CD session #2 starts at track 2, LSN: 1182, ISO 9660 blocks: 1032 diff --git a/test/videocd.right b/test/videocd.right index 85d3b247..c0b640bf 100644 --- a/test/videocd.right +++ b/test/videocd.right @@ -27,40 +27,40 @@ ISO9660 filesystem /: d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - d---1xrxrxr 0 0 [fn 00] [LSN 19] 2048 Jul 14 1978 00:00 EXT - d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Jul 14 1978 00:00 MPEG2 - d---1xrxrxr 0 0 [fn 00] [LSN 21] 2048 Jul 14 1978 00:00 SEGMENT - d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Jul 14 1978 00:00 SVCD + d---1xrxrxr 0 0 [fn 00] [LSN 19] 2048 Jul 14 1978 00:00 ext + d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Jul 14 1978 00:00 mpeg2 + d---1xrxrxr 0 0 [fn 00] [LSN 21] 2048 Jul 14 1978 00:00 segment + d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Jul 14 1978 00:00 svcd /EXT/: d---1xrxrxr 0 0 [fn 00] [LSN 19] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - ----1xrxrxr 0 0 [fn 00] [LSN 675] 78 Jul 14 1978 00:00 SCANDATA.DAT;1 + ----1xrxrxr 0 0 [fn 00] [LSN 675] 78 Jul 14 1978 00:00 scandata.dat /MPEG2/: d---1xrxrxr 0 0 [fn 00] [LSN 20] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - ---2-xrxrxr 0 0 [fn 00] [LSN 826] 174300 ( 153600) Jul 14 1978 00:00 AVSEQ01.MPG;1 - ---2-xrxrxr 0 0 [fn 00] [LSN 1051] 174300 ( 153600) Jul 14 1978 00:00 AVSEQ02.MPG;1 - ---2-xrxrxr 0 0 [fn 00] [LSN 1276] 174300 ( 153600) Jul 14 1978 00:00 AVSEQ03.MPG;1 - ---2-xrxrxr 0 0 [fn 00] [LSN 1501] 174300 ( 153600) Jul 14 1978 00:00 AVSEQ04.MPG;1 + ---2-xrxrxr 0 0 [fn 00] [LSN 826] 174300 ( 153600) Jul 14 1978 00:00 avseq01.mpg + ---2-xrxrxr 0 0 [fn 00] [LSN 1051] 174300 ( 153600) Jul 14 1978 00:00 avseq02.mpg + ---2-xrxrxr 0 0 [fn 00] [LSN 1276] 174300 ( 153600) Jul 14 1978 00:00 avseq03.mpg + ---2-xrxrxr 0 0 [fn 00] [LSN 1501] 174300 ( 153600) Jul 14 1978 00:00 avseq04.mpg /SEGMENT/: d---1xrxrxr 0 0 [fn 00] [LSN 21] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - ---2-xrxrxr 0 0 [fn 00] [LSN 225] 65072 ( 57344) Jul 14 1978 00:00 ITEM0001.MPG;1 - ---2-xrxrxr 0 0 [fn 00] [LSN 375] 65072 ( 57344) Jul 14 1978 00:00 ITEM0002.MPG;1 - ---2-xrxrxr 0 0 [fn 00] [LSN 525] 65072 ( 57344) Jul 14 1978 00:00 ITEM0003.MPG;1 + ---2-xrxrxr 0 0 [fn 00] [LSN 225] 65072 ( 57344) Jul 14 1978 00:00 item0001.mpg + ---2-xrxrxr 0 0 [fn 00] [LSN 375] 65072 ( 57344) Jul 14 1978 00:00 item0002.mpg + ---2-xrxrxr 0 0 [fn 00] [LSN 525] 65072 ( 57344) Jul 14 1978 00:00 item0003.mpg /SVCD/: d---1xrxrxr 0 0 [fn 00] [LSN 22] 2048 Jul 14 1978 00:00 . d---1xrxrxr 0 0 [fn 00] [LSN 18] 2048 Jul 14 1978 00:00 .. - ----1xrxrxr 0 0 [fn 00] [LSN 151] 2048 Jul 14 1978 00:00 ENTRIES.SVD;1 - ----1xrxrxr 0 0 [fn 00] [LSN 150] 2048 Jul 14 1978 00:00 INFO.SVD;1 - ----1xrxrxr 0 0 [fn 00] [LSN 152] 65536 Jul 14 1978 00:00 LOT.SVD;1 - ----1xrxrxr 0 0 [fn 00] [LSN 184] 112 Jul 14 1978 00:00 PSD.SVD;1 - ----1xrxrxr 0 0 [fn 00] [LSN 186] 40 Jul 14 1978 00:00 SEARCH.DAT;1 - ----1xrxrxr 0 0 [fn 00] [LSN 185] 2048 Jul 14 1978 00:00 TRACKS.SVD;1 + ----1xrxrxr 0 0 [fn 00] [LSN 151] 2048 Jul 14 1978 00:00 entries.svd + ----1xrxrxr 0 0 [fn 00] [LSN 150] 2048 Jul 14 1978 00:00 info.svd + ----1xrxrxr 0 0 [fn 00] [LSN 152] 65536 Jul 14 1978 00:00 lot.svd + ----1xrxrxr 0 0 [fn 00] [LSN 184] 112 Jul 14 1978 00:00 psd.svd + ----1xrxrxr 0 0 [fn 00] [LSN 186] 40 Jul 14 1978 00:00 search.dat + ----1xrxrxr 0 0 [fn 00] [LSN 185] 2048 Jul 14 1978 00:00 tracks.svd XA sectors Super Video CD (SVCD) or Chaoji Video CD (CVD) session #2 starts at track 2, LSN: 826, ISO 9660 blocks: 676