I hate conflicted merges

.cvsignore

@@ -1,64 +0,0 @@
-.gdb_history
-ABOUT-NLS
-COPYING
-ChangeLog
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-codeset.m4
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.rpath
-config.status
-config.sub
-configure
-depcomp
-gettext.m4
-glibc21.m4
-iconv.m4
-install-sh
-intdiv0.m4
-intmax.m4
-inttypes-pri.m4
-inttypes.m4
-inttypes_h.m4
-isc-posix.m4
-lcmessage.m4
-lib-ld.m4
-lib-link.m4
-lib-prefix.m4
-libcdio*.tar.gz
-libcdio*.tar.bz2
-libcdio*.tar.gz.directive
-libcdio*.tar.gz.directive.asc
-libcdio*.tar.gz.sig
-libcdio++.pc
-libcdio.pc
-libcdio_cdda.pc
-libcdio_paranoia.pc
-libiso9660++.pc
-libiso9660.pc
-libtool
-libudf.pc
-longdouble.m4
-longlong.m4
-ltmain.sh
-missing
-mkinstalldirs
-nls.m4
-po.m4
-printf-posix.m4
-progtest.m4
-signed.m4
-size_max.m4
-stamp-h1
-stdint_h.m4
-uintmax_t.m4
-ulonglong.m4
-wchar_t.m4
-wint_t.m4
-xsize_t.m4

Makefile.am

@@ -130,7 +130,7 @@ if MAINTAINER_MODE
 
 .PHONY: ChangeLog
 ChangeLog:
-	( cd $(srcdir); $(CVS2CL) -W 450 --header cvs2cl_header --utc -w -I ChangeLog --usermap cvs2cl_usermap -P --stdout ) > ChangeLog
+	git log --pretty --numstat --summary | $(GIT2CL) >$@
 
 ACLOCAL_AMFLAGS=-I m4
 

NEWS

@@ -27,6 +27,8 @@ version 0.81
 
 - OSX fixes
 
+- Add NetBSD driver
+
 version 0.80
 2008-03-15
 

configure.ac

@@ -38,7 +38,7 @@ LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
 AC_SUBST(LIBCDIO_VERSION_NUM)
 
 AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
-AM_MISSING_PROG(CVS2CL, cvs2cl, $missing_dir)
+AM_MISSING_PROG(GIT2CL, git2cl, $missing_dir)
 AM_MAINTAINER_MODE
 
 AM_SANITY_CHECK

cvs2cl_header

@@ -1,4 +0,0 @@
-##
-## autogenerated ChangeLog -- don't edit
-##
-

cvs2cl_usermap

@@ -1,7 +0,0 @@
-edsdead:Robert William Fuller
-flameeyes:Diego 'Flameeyes' Petten<65>
-hvr:Herbert Valerio Riedel
-karl:Karl Berry
-nboullis:Nicolas Boullis
-rocky:Rocky Bernstein
-thesin:Justin F. Hallett

example/.cvsignore

@@ -1,30 +0,0 @@
-.cvsignore
-.deps
-.gdb_history
-.libs
-Makefile
-Makefile.in
-audio
-cdio-eject
-cdtext
-copying
-device
-drives
-eject
-isofile
-isofile2
-isolist
-isolsn
-isofuzzy
-mmc1
-mmc2
-mmc2a
-mmc3
-paranoia
-paranoia2
-sample?
-tracks
-udf1
-udf2
-cdchange
-udffile

example/.gitignore

@@ -1,6 +1,10 @@
 /*.o
 /.deps
 /.libs
+<<<<<<< HEAD:example/.gitignore
+=======
+/*~
+>>>>>>> 4f0228e99f37dedd16bc56df7b3982b589cf4122:example/.gitignore
 /Makefile
 /Makefile.in
 /audio

include/cdio/device.h

@@ -154,12 +154,12 @@ extern "C" {
     DRIVER_AIX,     /**< AIX driver */
     DRIVER_BSDI,    /**< BSDI driver */
     DRIVER_FREEBSD, /**< FreeBSD driver - includes CAM and ioctl access */
+    DRIVER_NETBSD,  /**< NetBSD Driver. */
     DRIVER_LINUX,   /**< GNU/Linux Driver */
     DRIVER_SOLARIS, /**< Sun Solaris Driver */
     DRIVER_OSX,     /**< Apple OSX Driver */
     DRIVER_WIN32,   /**< Microsoft Windows Driver. Includes ASPI and 
 		         ioctl access. */
-    DRIVER_NETBSD,  /**< NetBSD Driver. */
     DRIVER_CDRDAO,  /**< cdrdao format CD image. This is listed
 		         before BIN/CUE, to make the code prefer cdrdao
 		         over BIN/CUE when both exist. */
@@ -185,7 +185,7 @@ extern "C" {
 #define CDIO_MIN_DRIVER        DRIVER_AIX
 #define CDIO_MIN_DEVICE_DRIVER CDIO_MIN_DRIVER
 #define CDIO_MAX_DRIVER        DRIVER_NRG
-#define CDIO_MAX_DEVICE_DRIVER DRIVER_NETBSD
+#define CDIO_MAX_DEVICE_DRIVER DRIVER_WIN32
 
   /** The following are status codes for completion of a given cdio
      operation. By design 0 is successful completion and -1 is error

lib/.cvsignore

@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-

lib/driver/.gitignore

@@ -2,6 +2,10 @@
 /*.o
 /.deps
 /.libs
+<<<<<<< HEAD:lib/driver/.gitignore
+=======
+/*.c~
+>>>>>>> 4f0228e99f37dedd16bc56df7b3982b589cf4122:lib/driver/.gitignore
 /Makefile
 /Makefile.in
 /libcdio.la

lib/driver/device.c

@@ -109,7 +109,7 @@ CdIo_driver_t CdIo_all_drivers[CDIO_MAX_DRIVER+1] = {
    NULL
   },
 
-  {DRIVER_BSDI, 
+  {DRIVER_AIX, 
    CDIO_SRC_IS_DEVICE_MASK|CDIO_SRC_IS_NATIVE_MASK|CDIO_SRC_IS_SCSI_MASK,
    "AIX",
    "AIX SCSI driver",
@@ -857,6 +857,9 @@ cdio_have_atapi(CdIo_t *p_cdio)
 bool
 cdio_have_driver(driver_id_t driver_id)
 {
+  if (driver_id < CDIO_MIN_DRIVER || 
+      driver_id > CDIO_MAX_DRIVER) 
+    return false;
   return (*CdIo_all_drivers[driver_id].have_driver)();
 }
 

parse/.cvsignore

@@ -1,9 +0,0 @@
-cue.tab.c
-cue.tab.h
-cuelexer
-cueparser
-toc.tab.c
-toc.tab.h
-tocparser
-lex.cuelex.c
-lex.cue.c

parse/.gitignore

@@ -0,0 +1,9 @@
+/cue.tab.c
+/cue.tab.h
+/cuelexer
+/cueparser
+/toc.tab.c
+/toc.tab.h
+/tocparser
+/lex.cuelex.c
+/lex.cue.c

src/cd-paranoia/.cvsignore

@@ -1,8 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.o
-cd-paranoia
-usage.h
-usage.txt

src/cd-paranoia/doc/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

src/cd-paranoia/doc/en/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-cd-paranoia.1
-

src/cd-paranoia/doc/ja/.cvsignore

@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-cd-paranoia.1

test/.cvsignore

@@ -1,37 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-cdda.raw
-cdda-orig.wav
-cdda-try.wav
-cdda-1.raw
-cdda-2.raw
-cdda-good.raw
-cdda-jitter.raw
-cdda-underrun.raw
-check_cue.sh
-check_paranoia.sh
-check_common_fn
-check_iso.sh
-check_nrg.sh
-check_sizeof
-testassert
-testbincue
-testbincue.c
-testdefault
-testischar
-testiso9660
-testisocd
-testisocd2
-testisocd2.c
-testnrg
-testnrg.c
-testparanoia
-testpregap
-testpregap.c
-testtoc
-*.dump
-*.cue
-*.bin
-*.nrg

test/.gitignore

@@ -1,4 +1,8 @@
 /*.o
+<<<<<<< HEAD:test/.gitignore
+=======
+/*~
+>>>>>>> 4f0228e99f37dedd16bc56df7b3982b589cf4122:test/.gitignore
 /.deps
 /.libs
 /Makefile
@@ -17,6 +21,11 @@
 /testassert
 /testbincue
 /testbincue.c
+<<<<<<< HEAD:test/.gitignore
+=======
+/testdefault
+/testgetdevices
+>>>>>>> 4f0228e99f37dedd16bc56df7b3982b589cf4122:test/.gitignore
 /testischar
 /testiso9660
 /testisocd

test/Makefile.am

@@ -28,7 +28,7 @@ testparanoia=testparanoia
 testparanoia_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
 endif
 
-hack = check_sizeof testassert  testbincue testischar \
+hack = check_sizeof testassert testbincue testgetdevices testischar \
        testisocd testisocd2 testiso9660 \
        testnrg $(testparanoia) testtoc testpregap
 
@@ -39,6 +39,7 @@ INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS)
 check_sizeof_LDADD  = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
 testassert_LDADD    = $(LIBCDIO_LIBS) $(LTLIBICONV)
 testdefault_LDADD   = $(LIBCDIO_LIBS) $(LTLIBICONV)
+testgetdevices_LDADD= $(LIBCDIO_LIBS) $(LTLIBICONV)
 testischar_LDADD    = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
 testiso9660_LDADD   = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
 

test/testdefault.c

@@ -80,6 +80,13 @@ main(int argc, const char *argv[])
   
   cdio_log_set_handler (log_handler);
 
+  if (cdio_have_driver(-1) != false) 
+    {
+      printf("Bogus driver number -1 should be regexted\n");
+      return 5;
+    }
+  
+
   if (! (cdio_have_driver(DRIVER_NRG) && cdio_have_driver(DRIVER_BINCUE)) )  {
     printf("You don't have enough drivers for this test\n");
     exit(77);
@@ -189,12 +196,8 @@ main(int argc, const char *argv[])
   }
     
   cdio_free_device_list(nrg_images);
-  free(nrg_images);
   cdio_free_device_list(bincue_images);
-  free(bincue_images);
   cdio_free_device_list(imgs);
-  free(imgs);
-
   return 0;
   
 }

test/testgetdevices.c

@@ -0,0 +1,124 @@
+/*
+  Copyright (C) 2008 Rocky Bernstein <rocky@gnu.org>
+  
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* 
+   Regression test for cdio_get_devices, cdio_get_devices_with_cap(),
+   and cdio_free_device_list()
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <cdio/cdio.h>
+#include <cdio/cd_types.h>
+#include <cdio/logging.h>
+
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <string.h>
+
+static void 
+log_handler (cdio_log_level_t level, const char message[])
+{
+  switch(level) {
+  case CDIO_LOG_DEBUG:
+  case CDIO_LOG_INFO:
+    return;
+  default:
+    printf("cdio %d message: %s\n", level, message);
+  }
+}
+
+static bool 
+is_in(char **file_list, const char *file) 
+{
+  char **p;
+  for (p = file_list; p != NULL && *p != NULL; p++) {
+    if (strcmp(*p, file) == 0) {
+      printf("File %s found as expected\n", file);
+      return true;
+    }
+  }
+  printf("Can't find file %s in list\n", file);
+  return false;
+}
+
+int
+main(int argc, const char *argv[])
+{
+  char **nrg_images=NULL;
+  char **bincue_images=NULL;
+  char **imgs;
+  unsigned int i;
+  int ret=0;
+
+  const char *cue_files[2] = {"cdda.cue", "isofs-m1.cue"};
+  const char *nrg_files[1] = {"videocd.nrg"};
+  
+  cdio_log_set_handler (log_handler);
+
+  if (cdio_have_driver(-1) != false) 
+    {
+      printf("Bogus driver number -1 should be regexted\n");
+      return 5;
+    }
+  
+
+  if (! (cdio_have_driver(DRIVER_NRG) && cdio_have_driver(DRIVER_BINCUE)) )  {
+    printf("You don't have enough drivers for this test\n");
+    exit(77);
+  }
+
+  nrg_images = cdio_get_devices(DRIVER_NRG);
+
+  for (imgs=nrg_images; *imgs != NULL; imgs++) {
+    printf("NRG image %s\n", *imgs);
+  }
+
+  if (!is_in(nrg_images, nrg_files[0])) {
+    cdio_free_device_list(nrg_images);
+    return 10;
+  }
+      
+  bincue_images = cdio_get_devices(DRIVER_BINCUE);
+  
+  for (imgs=bincue_images; *imgs != NULL; imgs++) {
+    printf("bincue image %s\n", *imgs);
+  }
+  
+  for (i=0; i<2; i++) {
+    if (is_in(bincue_images, cue_files[i])) {
+      printf("%s parses as a CDRWIN BIN/CUE csheet.\n", cue_files[i]);
+    } else {
+      printf("%s doesn't parse as a CDRWIN BIN/CUE csheet.\n", cue_files[i]);
+      ret = i+1;
+    }
+  }
+
+  if (ret != 0) return ret;
+
+  cdio_free_device_list(nrg_images);
+  cdio_free_device_list(bincue_images);
+  return 0;
+  
+}