configure.ac: Add --disable-joliet and disable joliet if iconv is not around

iso9660_fs.c: Setting string length on of UCBE wrong? test/*: add joliet regression test.
2004-10-28 11:13:40 +00:00
parent 9cdc89f3f3
commit 6869e97bb2
9 changed files with 316 additions and 55 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ define(RELEASE_NUM, 71)
 define(CDIO_VERSION_STR, 0.$1cvs)

 AC_PREREQ(2.52)
-AC_REVISION([$Id: configure.ac,v 1.101 2004/10/26 09:00:11 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.102 2004/10/28 11:13:40 rocky Exp $])dnl
 AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
 AC_CONFIG_SRCDIR(src/cd-info.c)
 AM_INIT_AUTOMAKE
@@ -48,6 +48,12 @@ AC_ARG_WITH(versioned_libs,
 [  --without-versioned-libs build versioned library symbols (enabled by default if you have GNU ld)],
 enable_versioned_libs="${withval}", enable_versioned_libs=yes)

+AC_ARG_WITH(cd_info,
+[  --without-cd-info	build program cd-info (enabled by default)],
+enable_cd_info="${withval}", enable_cd_info=yes)
+
+
+
 dnl Checks for programs.
 AC_PROG_CC

@@ -203,7 +209,7 @@ if test "x$enable_versioned_libs" = "xyes" ; then
    else 
      # Do we have GNU ld? We need that too.
      if test "$with_gnu_ld" != yes; then
-        AC_MSG_WARN(I don't see GNU ld. I'm going to assume --without-versioned-libs)
+        AC_MSG_WARN([I don't see GNU ld. I'm going to assume --without-versioned-libs])
 	enable_versioned_libs='no'
      fi
    fi
@@ -293,8 +299,8 @@ int has_timeout=sizeof(test.timeout);],
  	cd_drivers="${cd_drivers}, FreeBSD "
 	;;
     *)
-	AC_MSG_WARN(Don't have OS CD-reading support for ${host_os}...)
-	AC_MSG_WARN(Will use generic support.)
+	AC_MSG_WARN([Don't have OS CD-reading support for ${host_os}...])
+	AC_MSG_WARN([Will use generic support.])
 	;;
 esac
 AC_SUBST(LINUX_CDROM_TIMEOUT)
@@ -306,8 +312,6 @@ AC_SUBST(HAVE_LINUX_CDROM)
 AC_SUBST(HAVE_SOLARIS_CDROM)
 AC_SUBST(HAVE_WIN32_CDROM)

-AM_ICONV
-
 LIBCDIO_SOURCE_PATH="`pwd`"
 AC_DEFINE_UNQUOTED(LICDIO_SOURCE_PATH, "$LIBCDIO_SOURCE_PATH",
 	[Full path to libcdio top_sourcedir.])
@@ -321,6 +325,28 @@ AC_CHECK_MEMBER([struct tm.tm_gmtoff],
                 ,
                 [#include <time.h>])

+if test x$enable_joliet = x; then
+AC_ARG_ENABLE(joliet,
+	[  --disable-joliet          don't include Joliet extension support],
+		enable_joliet=no,
+		enable_joliet=yes)
+fi
+if test x$enable_joliet = xyes; then
+  AM_ICONV
+  AC_DEFINE(HAVE_JOLIET, [], 
+  [Define this if you want ISO-9660 Joliet extension support. 
+  You must have also libiconv installed to get Joliet extension support.])
+  if test "$am_cv_func_iconv" = yes ; then 
+     HAVE_JOLIET=yes
+  else
+     HAVE_JOLIET=no
+     AC_MSG_WARN([You must have iconv installed to get Joliet extension support.])
+  fi
+fi
+
+AC_SUBST(HAVE_JOLIET)
+
+
 if test x$enable_cddb = x; then
 AC_ARG_ENABLE(cddb,
 	[  --disable-cddb          don't include CDDB lookups in cd_info],
@@ -332,7 +358,7 @@ if test x$enable_cddb = xyes; then
    HAVE_CDDB=yes 
    AC_DEFINE(HAVE_CDDB, [], [Define this if you have libcddb installed])
    ],
-    [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled. Get libcddb from http://libcddb.sourceforge.net) 
+    [AC_MSG_WARN([new enough libcddb not found. CDDB access disabled. Get libcddb from http://libcddb.sourceforge.net])
    HAVE_CDDB=no])
    AC_CHECK_LIB(socket, connect)
    AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
--- a/lib/MSWindows/win32_ioctl.c
+++ b/lib/MSWindows/win32_ioctl.c
@@ -1,5 +1,5 @@
 /*
-    $Id: win32_ioctl.c,v 1.37 2004/08/29 02:31:34 rocky Exp $
+    $Id: win32_ioctl.c,v 1.38 2004/10/28 11:13:40 rocky Exp $

    Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>

@@ -26,26 +26,36 @@
 # include "config.h"
 #endif

-static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.37 2004/08/29 02:31:34 rocky Exp $";
-
-#include <cdio/cdio.h>
-#include <cdio/sector.h>
-#include "cdio_assert.h"
+static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.38 2004/10/28 11:13:40 rocky Exp $";

 #ifdef HAVE_WIN32_CDROM

+#ifdef WIN32
 #include <windows.h>
+#endif
+
+#if defined (_XBOX) || defined (WIN32)
+#include "inttypes.h"
+#include "NtScsi.h"
+#include "undocumented.h"
+#else
 #include <ddk/ntddstor.h>
 #include <ddk/ntddscsi.h>
 #include <ddk/scsi.h>
+#endif

 #include <stdio.h>
 #include <stddef.h>  /* offsetof() macro */
 #include <sys/stat.h>
 #include <errno.h>
 #include <sys/types.h>
+
+#include <cdio/cdio.h>
+#include <cdio/sector.h>
+#include "cdio_assert.h"
 #include <cdio/scsi_mmc.h>
 #include "cdtext_private.h"
+#include "cdio/logging.h"

 /* Win32 DeviceIoControl specifics */
 /***** FIXME: #include ntddcdrm.h from Wine, but probably need to 
@@ -92,6 +102,28 @@ typedef struct _CDROM_TOC {
    TRACK_DATA TrackData[CDIO_CD_MAX_TRACKS+1];
 } CDROM_TOC, *PCDROM_TOC;

+typedef struct _TRACK_DATA_FULL {
+    UCHAR SessionNumber;
+    UCHAR Control : 4;
+    UCHAR Adr : 4;
+    UCHAR TNO;
+    UCHAR POINT;  /* Tracknumber (of session?) or lead-out/in (0xA0, 0xA1, 0xA2)  */ 
+    UCHAR Min;  /* Only valid if disctype is CDDA ? */
+    UCHAR Sec;  /* Only valid if disctype is CDDA ? */
+    UCHAR Frame;  /* Only valid if disctype is CDDA ? */
+    UCHAR Zero;  /* Always zero */
+    UCHAR PMIN;  /* start min, if POINT is a track; if lead-out/in 0xA0: First Track */
+    UCHAR PSEC;
+    UCHAR PFRAME;
+} TRACK_DATA_FULL, *PTRACK_DATA_FULL;
+
+typedef struct _CDROM_TOC_FULL {
+    UCHAR Length[2];
+    UCHAR FirstSession;
+    UCHAR LastSession;
+    TRACK_DATA_FULL TrackData[CDIO_CD_MAX_TRACKS+3];
+} CDROM_TOC_FULL, *PCDROM_TOC_FULL;
+
 typedef enum _TRACK_MODE_TYPE {
    YellowMode2,
    XAForm2,
@@ -182,9 +214,14 @@ run_scsi_cmd_win32ioctl( const void *p_user_data,
  if(! success) {
    char *psz_msg = NULL;
    long int i_err = GetLastError();
+#ifdef _XBOX
+	psz_msg=(char *)LocalAlloc(LMEM_ZEROINIT, 255);
+	sprintf(psz_msg, "run_scsi_cmd_win32ioctl: error %d\n", i_err);
+#else
    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, 
 		  NULL, i_err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
 		  (LPSTR) psz_msg, 0, NULL);
+#endif
    cdio_info("Error: %s", psz_msg);
    LocalFree(psz_msg);
    return 1;
@@ -290,7 +327,11 @@ get_discmode_win32ioctl (_img_private_t *p_env)
 const char *
 is_cdrom_win32ioctl(const char c_drive_letter) 
 {
-
+#ifdef _XBOX
+	char sz_win32_drive_full[] = "\\\\.\\X:";
+	sz_win32_drive_full[4] = c_drive_letter;
+	return strdup(sz_win32_drive_full);
+#else
    UINT uDriveType;
    char sz_win32_drive[4];
    
@@ -311,6 +352,7 @@ is_cdrom_win32ioctl(const char c_drive_letter)
        cdio_debug("Drive %c is not a CD-ROM", c_drive_letter);
        return NULL;
    }
+#endif
 }
  
 /*!
@@ -336,11 +378,14 @@ read_audio_sectors_win32ioctl (_img_private_t *env, void *data, lsn_t lsn,
 		       &dwBytesReturned, NULL ) == 0 ) {
    char *psz_msg = NULL;
    DWORD dw = GetLastError();
-
+#ifdef _XBOX
+	psz_msg=(char *)LocalAlloc(LMEM_ZEROINIT, 255);
+	sprintf(psz_msg, "read_audio_sectors_win32ioctl: error %d\n", dw);
+#else
    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, 
 		  NULL, dw, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
 		  (LPSTR) psz_msg, 0, NULL);
-
+#endif
    cdio_info("Error reading audio-mode %lu\n%s)", 
 	      (long unsigned int) lsn, psz_msg);
    LocalFree(psz_msg);
@@ -406,9 +451,9 @@ read_mode1_sector_win32ioctl (const _img_private_t *env, void *data,
  if ( 0 != ret) return ret;

  memcpy (data, 
-	  buf + CDIO_CD_SYNC_SIZE+CDIO_CD_HEADER_SIZE, 
-	  b_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
-  
+	  buf + CDIO_CD_SYNC_SIZE+CDIO_CD_HEADER_SIZE,
+	  b_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);  
+
  return 0;

 }
@@ -419,13 +464,25 @@ read_mode1_sector_win32ioctl (const _img_private_t *env, void *data,
 bool
 init_win32ioctl (_img_private_t *env)
 {
-  char psz_win32_drive[7];
-  unsigned int len=strlen(env->gen.source_name);
+#ifdef WIN32
  OSVERSIONINFO ov;
+#endif
+
+#ifdef _XBOX
+  ANSI_STRING filename;
+  OBJECT_ATTRIBUTES attributes;
+  IO_STATUS_BLOCK status;
+  HANDLE hDevice;
+  NTSTATUS error;
+#else
+  unsigned int len=strlen(env->gen.source_name);
+  char psz_win32_drive[7];
  DWORD dw_access_flags;
+#endif
  
  cdio_debug("using winNT/2K/XP ioctl layer");
-  
+
+#ifdef WIN32
  memset(&ov,0,sizeof(OSVERSIONINFO));
  ov.dwOSVersionInfoSize=sizeof(OSVERSIONINFO);
  GetVersionEx(&ov);
@@ -434,10 +491,34 @@ init_win32ioctl (_img_private_t *env)
     (ov.dwMajorVersion>4))
    dw_access_flags = GENERIC_READ|GENERIC_WRITE;  /* add gen write on W2k/XP */
  else dw_access_flags = GENERIC_READ;
-  
-  if (cdio_is_device_win32(env->gen.source_name)) {
-    sprintf( psz_win32_drive, "\\\\.\\%c:", env->gen.source_name[len-2] );
+#endif
+
+  if (cdio_is_device_win32(env->gen.source_name)) 
+  {
+#ifdef _XBOX
+    //	Use XBOX cdrom, no matter what drive letter is given.
+    RtlInitAnsiString(&filename,"\\Device\\Cdrom0");
+    InitializeObjectAttributes(&attributes, &filename, OBJ_CASE_INSENSITIVE,
+			       NULL);
+    error = NtCreateFile( &hDevice, 
+			  GENERIC_READ |SYNCHRONIZE | FILE_READ_ATTRIBUTES, 
+			  &attributes, 
+			  &status, 
+			  NULL, 
+			  0,
+			  FILE_SHARE_READ,
+			  FILE_OPEN,	
+			  FILE_NON_DIRECTORY_FILE 
+			  | FILE_SYNCHRONOUS_IO_NONALERT );
    
+    if (!NT_SUCCESS(error))
+    {
+	  return false;
+    }
+	env->h_device_handle = hDevice;
+#else
+    sprintf( psz_win32_drive, "\\\\.\\%c:", env->gen.source_name[len-2] );
+
    env->h_device_handle = CreateFile( psz_win32_drive, 
 				       dw_access_flags,
 				       FILE_SHARE_READ | FILE_SHARE_WRITE, 
@@ -445,19 +526,22 @@ init_win32ioctl (_img_private_t *env)
 				       OPEN_EXISTING,
 				       FILE_ATTRIBUTE_NORMAL, 
 				       NULL );
+
    if( env->h_device_handle == INVALID_HANDLE_VALUE )
-      {
-	/* No good. try toggle write. */
-	dw_access_flags ^= GENERIC_WRITE;  
-	env->h_device_handle = CreateFile( psz_win32_drive, 
-					   dw_access_flags, 
-					   FILE_SHARE_READ,  
-					   NULL, 
-					   OPEN_EXISTING, 
-					   FILE_ATTRIBUTE_NORMAL, 
-					   NULL );
-	return (env->h_device_handle == NULL) ? false : true;
-      }
+    {
+	  /* No good. try toggle write. */
+	  dw_access_flags ^= GENERIC_WRITE;  
+	  env->h_device_handle = CreateFile( psz_win32_drive, 
+					     dw_access_flags, 
+					     FILE_SHARE_READ,  
+					     NULL, 
+					     OPEN_EXISTING, 
+					     FILE_ATTRIBUTE_NORMAL, 
+					     NULL );
+	  if (env->h_device_handle == NULL)
+		return false;
+    }
+#endif
    env->b_ioctl_init = true;
    return true;
  }
@@ -471,20 +555,106 @@ init_win32ioctl (_img_private_t *env)
 bool
 read_toc_win32ioctl (_img_private_t *p_env) 
 {
+  scsi_mmc_cdb_t  cdb = {{0, }};
+  CDROM_TOC_FULL  cdrom_toc_full;
+  CDROM_TOC       cdrom_toc;
+  DWORD           dwBytesReturned;
+  int             i_status, i, i_track_format, test;
+
+  if ( ! p_env )
+    return false;
+
+  /* Read full TOC, (not supported on DVD media) */
+
+  /* Operation code */
+  CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_READ_TOC);
+
+  cdb.field[1] = 0x00;
+
+  /* Format */
+  cdb.field[2] = CDIO_MMC_READTOC_FMT_FULTOC;
+
+  memset(&cdrom_toc_full, 0, sizeof(cdrom_toc_full));
+
+  /* Setup to read header, to get length of data */
+  CDIO_MMC_SET_READ_LENGTH16(cdb.field, sizeof(cdrom_toc_full));
+
+  i_status = run_scsi_cmd_win32ioctl (p_env, 1000*60*3,
+				scsi_mmc_get_cmd_len(cdb.field[0]), 
+				&cdb, SCSI_MMC_DATA_READ, 
+				sizeof(cdrom_toc_full), &cdrom_toc_full);
+
+  if (i_status == 0) {
+    cdio_info ("READTOC failed\n");  
+    return false;
+  } else {
+    test=0;
+    for( i = 0 ; i <= CDIO_CD_MAX_TRACKS+3; i++ ) {
+
+      if (cdrom_toc_full.TrackData[i].POINT == 0xA0) { /* First track number */
+        p_env->gen.i_first_track = cdrom_toc_full.TrackData[i].PMIN;
+        i_track_format = cdrom_toc_full.TrackData[i].PSEC;
+        test|=0x01;
+      }
+
+      if (cdrom_toc_full.TrackData[i].POINT == 0xA1) { /* Last track number */
+        p_env->gen.i_tracks  = cdrom_toc_full.TrackData[i].PMIN - p_env->gen.i_first_track + 1;
+        test|=0x02;
+      }
+
+      if (cdrom_toc_full.TrackData[i].POINT == 0xA2) { /* Start position of the lead out */
+        p_env->tocent[ p_env->gen.i_tracks ].start_lsn = cdio_msf3_to_lba(
+					        cdrom_toc_full.TrackData[i].PMIN,
+					        cdrom_toc_full.TrackData[i].PSEC,
+					        cdrom_toc_full.TrackData[i].PFRAME );
+        p_env->tocent[ p_env->gen.i_tracks ].Control   = cdrom_toc_full.TrackData[i].Control;
+        p_env->tocent[ p_env->gen.i_tracks ].Format    = i_track_format;
+        test|=0x04;
+      }
+
+      if (cdrom_toc_full.TrackData[i].POINT > 0 && cdrom_toc_full.TrackData[i].POINT <= p_env->gen.i_tracks) {
+        p_env->tocent[ cdrom_toc_full.TrackData[i].POINT - 1 ].start_lsn = cdio_msf3_to_lba(
+					        cdrom_toc_full.TrackData[i].PMIN,
+					        cdrom_toc_full.TrackData[i].PSEC,
+					        cdrom_toc_full.TrackData[i].PFRAME );
+        p_env->tocent[ cdrom_toc_full.TrackData[i].POINT - 1 ].Control   = cdrom_toc_full.TrackData[i].Control;
+        p_env->tocent[ cdrom_toc_full.TrackData[i].POINT - 1 ].Format    = i_track_format;
+
+        cdio_debug("p_sectors: %i, %lu", i, 
+	          (unsigned long int) (p_env->tocent[i].start_lsn));
+
+        if (cdrom_toc_full.TrackData[i].POINT == p_env->gen.i_tracks)
+          test|=0x08;
+      }
+
+      if (test == 0x0F)
+        break;
+
+    }
+    if (test == 0x0F)
+    {
+      p_env->gen.toc_init = true; 
+      return true;
+    }
+  }
+
+  /* No full TOC available */
+  /* read the normal TOC as fallback */

-  DWORD dwBytesReturned;
-  CDROM_TOC cdrom_toc;
-  int i;
-  
  if( DeviceIoControl( p_env->h_device_handle,
 		       IOCTL_CDROM_READ_TOC,
 		       NULL, 0, &cdrom_toc, sizeof(CDROM_TOC),
 		       &dwBytesReturned, NULL ) == 0 ) {
    char *psz_msg = NULL;
    long int i_err = GetLastError();
+#ifdef _XBOX
+	psz_msg=(char *)LocalAlloc(LMEM_ZEROINIT, 255);
+	sprintf(psz_msg, "read_toc_win32ioctl: error %d\n", i_err);
+#else
    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, 
 		  NULL, i_err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
 		  (LPSTR) psz_msg, 0, NULL);
+#endif
    if (psz_msg) {
      cdio_warn("could not read TOC (%ld): %s", i_err, psz_msg);
      LocalFree(psz_msg);
@@ -509,6 +679,7 @@ read_toc_win32ioctl (_img_private_t *p_env)
  }
  p_env->gen.toc_init = true;
  return true;
+
 }

 /*!
@@ -551,6 +722,7 @@ get_track_format_win32ioctl(const _img_private_t *env, track_t i_track)
  /* This is pretty much copied from the "badly broken" cdrom_count_tracks
     in linux/cdrom.c.
  */
+
  if (env->tocent[i_track - env->gen.i_first_track].Control & 0x04) {
    if (env->tocent[i_track - env->gen.i_first_track].Format == 0x10)
      return TRACK_FORMAT_CDI;
--- a/lib/iso9660_fs.c
+++ b/lib/iso9660_fs.c
@@ -1,5 +1,5 @@
 /*
-    $Id: iso9660_fs.c,v 1.35 2004/10/26 10:00:27 rocky Exp $
+    $Id: iso9660_fs.c,v 1.36 2004/10/28 11:13:40 rocky Exp $

    Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -49,7 +49,7 @@

 #include <stdio.h>

-static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.35 2004/10/26 10:00:27 rocky Exp $";
+static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.36 2004/10/28 11:13:40 rocky Exp $";

 /* Implementation of iso9660_t type */
 struct _iso9660 {
@@ -140,14 +140,15 @@ check_pvd (const iso9660_pvd_t *p_pvd)
 }

 static bool
-ucs2be_to_locale(char *psz_ucs2be,  size_t i_inlen, 
+ucs2be_to_locale(ICONV_CONST char *psz_ucs2be,  size_t i_inlen, 
 		 char **p_psz_out,  size_t i_outlen)
 {
  iconv_t ic = iconv_open(nl_langinfo(CODESET), "UCS-2BE");
  int rc;
  char *psz_buf = NULL;
  char *psz_buf2;
-  int i_outlen_save = i_outlen;
+  int i_outlen_max = i_outlen;
+  int i_outlen_actual;

  if (-1 == (size_t) ic) {
    cdio_info("Failed to get conversion table for locale, trying ASCII");
@@ -170,9 +171,10 @@ ucs2be_to_locale(char *psz_ucs2be,  size_t i_inlen,
    /* conversion failed */
    goto error;
  }
-  *p_psz_out = malloc(i_outlen_save + 1);
-  memcpy(*p_psz_out, psz_buf, i_outlen_save);
-  *(*p_psz_out + i_outlen_save) = '\0';
+  i_outlen_actual = i_outlen_max - i_outlen;
+  *p_psz_out = malloc(i_outlen_actual + 1);
+  memcpy(*p_psz_out, psz_buf, i_outlen_actual);
+  *(*p_psz_out + i_outlen_actual) = '\0';
  free(psz_buf);
  return true;
 error:
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.31 2004/10/26 08:32:29 rocky Exp $
+#   $Id: Makefile.am,v 1.32 2004/10/28 11:13:40 rocky Exp $
 #
 #    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 #
@@ -59,7 +59,7 @@ check_DATA = vcd_demo.right \
 	     bad-mode1.toc bad-msf-1.toc bad-msf-2.toc bad-msf-3.toc \
 	     bad-cat1.cue bad-cat2.cue bad-cat3.cue \
 	     bad-cat1.toc bad-cat2.toc bad-cat3.toc \
-	     copying.iso copying.right
+	     copying.iso copying.right joliet.iso

 EXTRA_DIST = $(check_SCRIPTS) $(check_DATA) \
 	check_common_fn check_cue.sh.in check_nrg.sh.in check_iso.sh.in
--- a/test/check_common_fn.in
+++ b/test/check_common_fn.in
@@ -1,4 +1,4 @@
-# $Id: check_common_fn.in,v 1.8 2004/05/06 12:05:49 rocky Exp $
+# $Id: check_common_fn.in,v 1.9 2004/10/28 11:13:40 rocky Exp $
 #
 #    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 #
@@ -94,7 +94,8 @@ test_iso_info() {
    return 1
  fi

-  if ${ISO_INFO} --no-header ${opts} >${outfile} 2>&1 ; then 
+  cmdline="${ISO_INFO} --no-header ${opts}"
+  if $cmdline  >${outfile} 2>&1 ; then 
    if test "/usr/bin/diff" != no; then
      if @DIFF@ @DIFF_OPTS@ ${outfile} ${rightfile} ; then
 	rm -f $outfile
@@ -108,7 +109,7 @@ test_iso_info() {
      return 77
    fi
  else
-    echo "$0 failed running: ${ISO_INFO} ${opts}"
+    echo "$0 failed running: $cmdline"
    return 2
  fi

--- a/test/check_iso.sh.in
+++ b/test/check_iso.sh.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: check_iso.sh.in,v 1.3 2004/05/07 02:15:52 rocky Exp $
+#$Id: check_iso.sh.in,v 1.4 2004/10/28 11:13:40 rocky Exp $

 if test -z $srcdir ; then
  srcdir=`pwd`
@@ -17,13 +17,27 @@ fname=copying
 opts="--quiet ${srcdir}/${fname}.iso --iso9660 "
 test_iso_info  "$opts" ${fname}.dump ${srcdir}/${fname}.right
 RC=$?
-check_result $RC 'iso-info test 1' "iso-info $opts"
+check_result $RC 'iso-info basic test' "iso-info $opts"

 opts="--image ${srcdir}/${fname}.iso --extract $fname "
 test_iso_read  "$opts" ${fname} ${srcdir}/../COPYING
 RC=$?
 check_result $RC 'iso-read test 1' "iso-read $opts"

+if test -n "@HAVE_JOLIET@" ; then
+  BASE=`basename $0 .sh`
+  fname=joliet
+  opts="--quiet ${srcdir}/${fname}.iso --iso9660 "
+  test_iso_info  "$opts" ${fname}-nojoliet.dump ${srcdir}/${fname}.right
+  RC=$?
+  check_result $RC 'iso-info Joliet test' "$cmdline"
+  opts="--quiet ${srcdir}/${fname}.iso --iso9660 --no-joliet "
+  test_iso_info  "$opts" ${fname}-nojoliet.dump \
+                 ${srcdir}/${fname}-nojoliet.right
+  RC=$?
+  check_result $RC 'iso-info --no-joliet test' "$cmdline"
+fi
+
 exit $RC

 #;;; Local Variables: ***
--- a/test/joliet-nojoliet.right
+++ b/test/joliet-nojoliet.right
@@ -0,0 +1,23 @@
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+__________________________________
+ISO-9660 Information
+/:
+ Oct 22 2004 18:44  .
+ Oct 22 2004 18:44  ..
+ Oct 22 2004 18:44  libcdio
+
+/LIBCDIO/:
+ Oct 22 2004 18:44  .
+ Oct 22 2004 18:44  ..
+ Mar 12 2004 02:18  copying
+ Jun 26 2004 06:01  readme
+ Aug 12 2004 05:22  readme.libcdio
+ Oct 22 2004 18:44  test
+
+/LIBCDIO/TEST/:
+ Oct 22 2004 18:44  .
+ Oct 22 2004 18:44  ..
+ Jul 25 2004 05:52  isofs_m1.cue
+
--- a/test/joliet.iso
+++ b/test/joliet.iso
--- a/test/joliet.right
+++ b/test/joliet.right
@@ -0,0 +1,23 @@
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+__________________________________
+ISO-9660 Information
+/:
+ Oct 22 2004 18:44  .
+ Oct 22 2004 18:44  ..
+ Oct 22 2004 18:44  libcdio
+
+/libcdio/:
+ Oct 22 2004 18:44  .
+ Oct 22 2004 18:44  ..
+ Mar 12 2004 02:18  COPYING
+ Jun 26 2004 06:01  README
+ Aug 12 2004 05:22  README.libcdio
+ Oct 22 2004 18:44  test
+
+/libcdio/test/:
+ Oct 22 2004 18:44  .
+ Oct 22 2004 18:44  ..
+ Jul 25 2004 05:52  isofs-m1.cue
+