Re: [VCDImager Bugs/Devel] vcdimager on BSD/OS 4.3

[Steven M. Schultz]

> From: Herbert Valerio Riedel <address@hidden>
> 
> btw, it's in cvs now... please try to get it build if you have time to do
> so... :-)

        I had time tonight ;)

        The diffs are below.  

        VERY good job of coding "blind" for a strange/unknown system!  There
        were only a couple things that needed to be fixed.

        I have successfully run 'vcdimager', 'vcddebug' and 'vcdxrip'
        against both ATAPI and SCSI drives, burned a VCD and read it back.

        Looking very good!

        Steven

--- ./libvcd/vcd_image_bsdicd.c.dist    Thu Aug 30 13:18:23 2001
+++ ./libvcd/vcd_image_bsdicd.c Thu Aug 30 21:05:31 2001
@@ -35,8 +35,8 @@
 #if defined(__bsdi__)
 /* && defined(SCSIRAWCDB) */
 
-#include <dev/scsi/scsi.h>
-#include <dev/scsi/scsi_ioctl.h>
+#include </sys/dev/scsi/scsi.h>
+#include </sys/dev/scsi/scsi_ioctl.h>
 
 #include <sys/stat.h>
 #include <sys/ioctl.h>
@@ -49,8 +49,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <linux/cdrom.h>
-
 /* reader */
 
 typedef struct {
@@ -128,7 +126,7 @@
   suc.suc_cdb[4] = 12;
   suc.suc_cdblen = 6;;
 
-  suc.suc_data = &mh;
+  suc.suc_data = (u_char *)&mh;
   suc.suc_datalen = sizeof (mh);
 
   suc.suc_timeout = 500;
@@ -147,9 +145,6 @@
             bool _workaround)
 {
   struct  scsi_user_cdb suc; 
-  uint8_t buf[12] = { 0, };
-
-  uint32_t retval;
 
   memset (&suc, 0, sizeof (struct  scsi_user_cdb));
 
@@ -180,7 +175,7 @@
   suc.suc_timeout = 500;
   suc.suc_flags = SUC_READ;
 
-  if (ioctl (_obj->fd, SCSIRAWCDB, &suc))
+  if (ioctl (fd, SCSIRAWCDB, &suc))
     {
       vcd_error ("ioctl (SCSIRAWCDB): %s", strerror (errno));
       return 0;
@@ -268,14 +263,13 @@
 _stat_size (void *user_data)
 {
   _img_bsdicd_src_t *_obj = user_data;
-
   struct  scsi_user_cdb suc; 
   uint8_t buf[12] = { 0, };
-
   uint32_t retval;
 
-  memset (&suc, 0, sizeof (struct  scsi_user_cdb));
+  _source_init(_obj);
 
+  memset (&suc, 0, sizeof (struct  scsi_user_cdb));
   suc.suc_cdb[0] = 0x43; /* CMD_READ_TOC_PMA_ATIP */
   suc.suc_cdb[1] = 0; /* lba; msf: 0x2 */
   suc.suc_cdb[6] = 0xaa; /* CDROM_LEADOUT */
@@ -358,5 +352,3 @@
   return NULL;
 #endif
 }
-
-
--- ./libvcd/vcd_image_cd.h.dist        Thu Aug 30 13:18:23 2001
+++ ./libvcd/vcd_image_cd.h     Thu Aug 30 16:38:33 2001
@@ -31,7 +31,7 @@
 #if defined(__linux__)
   return vcd_image_source_new_linuxcd ();
 #elif defined(__bsdi__)
-  return vcd_image_source_new_bsdcd ();
+  return vcd_image_source_new_bsdicd ();
 #else
   vcd_error ("no CD-ROM image driver available for this architecture (%s)",
             HOST_ARCH);
--- ./docs/vcdimager.texi.dist  Wed Aug 29 06:21:50 2001
+++ ./docs/vcdimager.texi       Thu Aug 30 16:41:26 2001
@@ -8,8 +8,6 @@
 
 @afourpaper
 
address@hidden version.texi
-
 @ifinfo
 This file documents GNU VCDImager, The GNU Video CD Authoring Tools.