From ebbfe8935d1f8b6d0ca6b113257db92127805d79 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Thu, 31 Aug 2006 09:26:44 +0000
Subject: [PATCH] Outcommented "experimental:" messages of O_EXCL development

---
 trunk/cdrskin/cdrskin.c | 19 +++++++++++++++----
 trunk/libburn/sg.c      |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/trunk/cdrskin/cdrskin.c b/trunk/cdrskin/cdrskin.c
index b155e3cf..2f0b3063 100644
--- a/trunk/cdrskin/cdrskin.c
+++ b/trunk/cdrskin/cdrskin.c
@@ -837,7 +837,7 @@ int Cdrtrack_open_source_path(struct CdrtracK *track, int *fd, int flag)
      }
    }
  }
- if(track->fixed_size<Cdrtrack_minimum_sizE) {
+ if(track->fixed_size<Cdrtrack_minimum_sizE && *fd>=0) {
    fprintf(stderr,
            "cdrskin: NOTE : Enforcing minimum track size of %.f bytes\n",
            Cdrtrack_minimum_sizE);
@@ -1814,10 +1814,9 @@ struct CdrskiN {
  /** The list of tracks with their data sources and parameters */
  struct CdrtracK *tracklist[Cdrskin_track_maX];
  int track_counter;
- /* a guess about what track might be processing right now */
+ /** a guess about what track might be processing right now */
  int supposed_track_idx;
 
-
  int fifo_enabled;
  /** Optional fifo between input fd and libburn. It uses a pipe(2) to transfer
      data to libburn. This fifo may be actually the start of a chain of fifos
@@ -2039,6 +2038,9 @@ int Cdrskin_attach_fifo(struct CdrskiN *skin, int flag)
    if(i==0)
      skin->fifo= ff;
  }
+
+ /* >>> ticket 55: check all fifos for input */;
+
  return(1);
 }
 
@@ -2173,23 +2175,30 @@ int Cdrskin_grab_drive(struct CdrskiN *skin, int flag)
 
 
  if(flag&1) {
+/*
    fprintf(stderr,
       "cdrskin: experimental: Cdrskin_grab_drive() from shutdown libburn\n");
-
+*/
    ret= burn_drive_scan_and_grab(&(skin->drives),skin->preskin->device_adr,
                                  !(flag&2));
    if(ret<=0) {
+/*
      fprintf(stderr,"cdrskin: experimental: burn_drive_scan_and_grab ret=%d\n",
                    ret);
+*/
      goto unable;
    }
    skin->driveno= 0;
  } else {
+/*
    fprintf(stderr,
       "cdrskin: experimental: Cdrskin_grab_drive() on active libburn\n");
+*/
    if(strlen(skin->preskin->device_adr)<=0) {
+/*
      fprintf(stderr,
         "cdrskin: experimental: Cdrskin_grab_drive() restarting libburn\n");
+*/
      ret= Cdrskin_reinit_lib_with_adr(skin,1|(flag&2));
      goto ex; /* this calls Cdrskin_grab() with persistent address or fails */
    }
@@ -2684,8 +2693,10 @@ int Cdrskin_atip(struct CdrskiN *skin, int flag)
 
 #ifdef Cdrskin_new_api_tesT
 
+/*
  fprintf(stderr,
          "cdrskin: experimental: Cdrskin_atip() on Cdrskin_new_api_tesT\n");
+*/
 
  if(strlen(skin->preskin->device_adr)<=0)
    burn_drive_get_adr(&(skin->drives[skin->driveno]),
diff --git a/trunk/libburn/sg.c b/trunk/libburn/sg.c
index 488fac24..7cfd6e84 100644
--- a/trunk/libburn/sg.c
+++ b/trunk/libburn/sg.c
@@ -149,13 +149,13 @@ void sg_enumerate(void)
 	if(burn_sg_open_o_nonblock)
 		open_mode |= O_NONBLOCK;
 
+/* <<< debugging
 	fprintf(stderr,
 		"\nlibburn: experimental: o_excl= %d , o_nonblock= %d, abort_on_busy= %d\n",
 	burn_sg_open_o_excl,burn_sg_open_o_nonblock,burn_sg_open_abort_busy);
 	fprintf(stderr,
 		"libburn: experimental: O_EXCL= %d , O_NONBLOCK= %d\n",
 		!!(open_mode&O_EXCL),!!(open_mode&O_NONBLOCK));
-/* <<< debugging
           
 */