View | Details | Raw Unified
Collapse All | Expand All

(-) cdrdao-1.2.2.orig/dao/main.cc (+2 lines)
 Lines 2027-2032   static int copyCd(CdrDriver *src, CdrDri Link Here  
  }
  }

        
  if (src == dst) {
  if (src == dst) {

            

              
              
    // unlock src to make swaping possible

            

            

              
              
    src->preventMediumRemoval(0);

            

        
    message(0, "Please insert a recordable medium and hit enter.");
    message(0, "Please insert a recordable medium and hit enter.");

        
    getc(stdin);
    getc(stdin);

        
  }
  }



(-) cdrdao-1.2.2.orig/scsilib/libscg/scsi-linux-sg.c
      (-3 / +24 lines)




  

    

    

       Lines 225-230
      LOCAL	long	sg_raisedma	__PR((SCSI *scgp, 
    
  Link Here 
    

  

        
#endif
#endif

        
LOCAL	void	sg_settimeout	__PR((int f, int timeout));
LOCAL	void	sg_settimeout	__PR((int f, int timeout));

        

            

              
              
int    sg_open_excl    __PR((char *device, int mode));

            

            

              
              

            

            

              
              
int

            

            

              
              
sg_open_excl(device, mode)

            

            

              
              
       char    *device;

            

            

              
              
       int     mode;

            

            

              
              
{

            

            

              
              
       int f;

            

            

              
              
       int i;

            

            

              
              
       f = open(device, mode|O_EXCL);

            

            

              
              
       for (i = 0; (i < 10) && (f == -1 && (errno == EACCES || errno == EBUSY)); i++) {

            

            

              
              
           fprintf(stderr, "Error trying to open %s exclusively (%s)... retrying in 1 second.\n", device, strerror(errno));

            

            

              
              
	   usleep(1000000 + 100000.0 * rand()/(RAND_MAX+1.0));

            

            

              
              
	   f = open(device, mode|O_EXCL);

            

            

              
              
       }

            

            

              
              
       if (f == -1 && errno != EACCES && errno != EBUSY) {

            

            

              
              
           f = open(device, mode);

            

            

              
              
       }

            

            

              
              
       return f;

            

            

              
              
}

            

            

              
              

            

        
/*
/*

        
 * Return version information for the low level SCSI transport code.
 * Return version information for the low level SCSI transport code.

        
 * This has been introduced to make it easier to trace down problems
 * This has been introduced to make it easier to trace down problems

  

    

    

       Lines 407-413
      scanopen: 
    
  Link Here 
    

  

        
		
		

        
		for (i = 0; globbuf.gl_pathv && globbuf.gl_pathv[i] != NULL ; i++) {
		for (i = 0; globbuf.gl_pathv && globbuf.gl_pathv[i] != NULL ; i++) {

        
			devname = globbuf.gl_pathv[i];
			devname = globbuf.gl_pathv[i];

            

              
			f = open(devname, O_RDWR | O_NONBLOCK);

              
			f = sg_open_excl(devname, O_RDWR | O_NONBLOCK);

            

        
			if (f < 0) {
			if (f < 0) {

        
				/*
				/*

        
				 * Set up error string but let us clear it later
				 * Set up error string but let us clear it later

  

    

    

       Lines 458-464
      scanopen: 
    
  Link Here 
    

  

        
		for (i = 0; globbuf.gl_pathv && globbuf.gl_pathv[i] != NULL ; i++) {
		for (i = 0; globbuf.gl_pathv && globbuf.gl_pathv[i] != NULL ; i++) {

        
			devname = globbuf.gl_pathv[i];
			devname = globbuf.gl_pathv[i];

        

            

              
			f = open(devname, O_RDWR | O_NONBLOCK);

              
			f = sg_open_excl(devname, O_RDWR | O_NONBLOCK);

            

        
			if (f < 0) {
			if (f < 0) {

        
				/*
				/*

        
				 * Set up error string but let us clear it later
				 * Set up error string but let us clear it later

  

    

    

       Lines 511-517
      openbydev: 
    
  Link Here 
    

  

        
			"Warning: Open by 'devname' is unintentional and not supported.\n");
			"Warning: Open by 'devname' is unintentional and not supported.\n");

        
		}
		}

        
					/* O_NONBLOCK is dangerous */
					/* O_NONBLOCK is dangerous */

            

              
		f = open(device, O_RDWR | O_NONBLOCK);

              
		f = sg_open_excl(device, O_RDWR | O_NONBLOCK);

            

        
/*		if (f < 0 && errno == ENOENT)*/
/*		if (f < 0 && errno == ENOENT)*/

        
/*			goto openpg;*/
/*			goto openpg;*/

        



(-) cdrdao-1.2.2.orig/scsilib/libscg/scsitransp.c
      (-3 / +4 lines)




  

    

    

       Lines 52-59
      static	char sccsid[] = 
    
  Link Here 
    

  

        
 *	Choose your name instead of "schily" and make clear that the version
 *	Choose your name instead of "schily" and make clear that the version

        
 *	string is related to a modified source.
 *	string is related to a modified source.

        
 */
 */

            

              
LOCAL	char	_scg_version[]		= "0.8";	/* The global libscg version	*/

              
LOCAL	char	_scg_version[]		= "0.8ubuntu1";	/* The global libscg version	*/

            

            

              
LOCAL	char	_scg_auth_schily[]	= "schily";	/* The author for this module	*/

              
LOCAL	char	_scg_auth_ubuntu[]	= "ubuntu";	/* The author for this module	*/

            

            

              

              

            

        

        
#define	DEFTIMEOUT	20	/* Default timeout for SCSI command transport */
#define	DEFTIMEOUT	20	/* Default timeout for SCSI command transport */

        

  

    

    

       Lines 137-143
      scg_version(scgp, what) 
    
  Link Here 
    

  

        
		 * return "schily" for the SCG_AUTHOR request.
		 * return "schily" for the SCG_AUTHOR request.

        
		 */
		 */

        
		case SCG_AUTHOR:
		case SCG_AUTHOR:

            

              
			return (_scg_auth_schily);

              
			return (_scg_auth_ubuntu);

            

        
		case SCG_SCCS_ID:
		case SCG_SCCS_ID:

        
			return (sccsid);
			return (sccsid);

        
		default:
		default: