claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

First working all-libcdio cd-paranoia (modulo various omissions and

Browse Source 
memory leaks).
This commit is contained in:
rocky
2005-01-06 01:15:51 +00:00
parent bb16399e6a
commit f939e73e52
8 changed files with 220 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cdda_interface/cooked_interface.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cooked_interface.c,v 1.3 2005/01/05 04:16:11 rocky Exp $
$Id: cooked_interface.c,v 1.4 2005/01/06 01:15:51 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Original interface.c Copyright (C) 1994-1997

14
lib/driver/cdio.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cdio.c,v 1.5 2005/01/04 04:33:36 rocky Exp $
$Id: cdio.c,v 1.6 2005/01/06 01:15:51 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -39,7 +39,7 @@
#include <cdio/logging.h>
#include "cdio_private.h"
static const char _rcsid[] = "$Id: cdio.c,v 1.5 2005/01/04 04:33:36 rocky Exp $";
static const char _rcsid[] = "$Id: cdio.c,v 1.6 2005/01/06 01:15:51 rocky Exp $";
const char *track_format2str[6] =
@@ -643,14 +643,14 @@ cdio_new (generic_img_private_t *p_env, cdio_funcs *p_funcs)
Free any resources associated with cdio.
*/
void
cdio_destroy (CdIo_t *cdio)
cdio_destroy (CdIo_t *p_cdio)
{
CdIo_last_driver = CDIO_DRIVER_UNINIT;
if (cdio == NULL) return;
if (p_cdio == NULL) return;
if (cdio->op.free != NULL)
cdio->op.free (cdio->env);
free (cdio);
if (p_cdio->op.free != NULL)
p_cdio->op.free (p_cdio->env);
free (p_cdio);
}
/*!

2
lib/paranoia/paranoia.c
View File

@@ -1,5 +1,5 @@
/*
$Id: paranoia.c,v 1.3 2005/01/05 04:16:11 rocky Exp $
$Id: paranoia.c,v 1.4 2005/01/06 01:15:51 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu

214
src/cd-paranoia/cd-paranoia.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
* Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
* (C) 1998 Monty <xiphmont@mit.edu>
*
* This program is free software; you can redistribute it and/or modify
@@ -58,7 +58,9 @@
#include <sys/time.h>
#include <sys/stat.h>
#include <cdio/cdda_interface.h>
#include <cdio/cdio.h>
#include <cdio/cd_types.h>
#include <cdio/cdda.h>
#include <cdio/paranoia.h>
#include <cdio/bytesex.h>
#include "utils.h"
@@ -73,7 +75,8 @@ extern int quiet;
/* I wonder how many alignment issues this is gonna trip in the
future... it shouldn't trip any... I guess we'll find out :) */
static int bigendianp(void)
static int
bigendianp(void)
{
int test=1;
char *hack=(char *)(&test);
@@ -81,16 +84,19 @@ static int bigendianp(void)
return(1);
}
static long parse_offset(cdrom_drive_t *d, char *offset, int begin){
long track=-1;
static long
parse_offset(cdrom_drive_t *d, char *offset, int begin)
{
track_t i_track= CDIO_INVALID_TRACK;
long hours = -1;
long minutes = -1;
long seconds = -1;
long sectors = -1;
char *time=NULL,*temp=NULL;
char *time = NULL;
char *temp = NULL;
long ret;
if(offset==NULL)return(-1);
if (!offset) return -1;
/* seperate track from time offset */
temp=strchr(offset,']');
@@ -110,10 +116,12 @@ static long parse_offset(cdrom_drive_t *d, char *offset, int begin){
int chars=strspn(offset,"0123456789");
if(chars>0){
offset[chars]='\0';
track=atoi(offset);
if(track<0 || track>d->tracks){ /*take track 0 as pre-gap of 1st track*/
i_track=atoi(offset);
if ( i_track > d->tracks ) {
/*take track i_first_track-1 as pre-gap of 1st track*/
char buffer[256];
sprintf(buffer,"Track #%ld does not exist.",track);
snprintf(buffer, sizeof(buffer),
"Track #%d does not exist.", i_track);
report(buffer);
exit(1);
}
@@ -160,22 +168,23 @@ static long parse_offset(cdrom_drive_t *d, char *offset, int begin){
*sec='\0';
}
if(track==-1){
if(seconds==-1 && sectors==-1)return(-1);
if(begin==-1)
if (i_track == CDIO_INVALID_TRACK) {
if (seconds==-1 && sectors==-1) return -1;
if (begin==-1) {
ret=cdda_disc_firstsector(d);
else
} else
ret = begin;
} else {
if ( seconds==-1 && sectors==-1 ) {
if(begin==-1){ /* first half of a span */
return(cdda_track_firstsector(d,track));
if (begin==-1){
/* first half of a span */
return(cdda_track_firstsector(d, i_track));
}else{
return(cdda_track_lastsector(d,track));
return(cdda_track_lastsector(d, i_track));
}
} else {
/* relative offset into a track */
ret=cdda_track_firstsector(d,track);
ret=cdda_track_firstsector(d, i_track);
}
}
@@ -187,8 +196,8 @@ static long parse_offset(cdrom_drive_t *d, char *offset, int begin){
if (hours != -1) ret += hours *60*CDIO_CD_FRAMES_PER_MIN;
/* We don't want to outside of the track; if it's relative, that's OK... */
if(track!=-1){
if(cdda_sector_gettrack(d,ret)!=track){
if( i_track != CDIO_INVALID_TRACK ){
if (cdda_sector_gettrack(d,ret) != i_track) {
report("Time/sector offset goes beyond end of specified track.");
exit(1);
}
@@ -204,9 +213,12 @@ static long parse_offset(cdrom_drive_t *d, char *offset, int begin){
return(ret);
}
static void display_toc(cdrom_drive_t *d){
static void
display_toc(cdrom_drive_t *d)
{
long audiolen=0;
track_t i;
report("\nTable of contents (audio tracks only):\n"
"track length begin copy pre ch\n"
"===========================================================");
@@ -215,17 +227,17 @@ static void display_toc(cdrom_drive_t *d){
if ( cdda_track_audiop(d,i) ) {
char buffer[256];
long sec=cdda_track_firstsector(d,i);
long off=cdda_track_lastsector(d,i)-sec+1;
lsn_t sec=cdda_track_firstsector(d,i);
lsn_t off=cdda_track_lastsector(d,i)-sec+1;
sprintf(buffer,
"%3d. %7ld [%02d:%02d.%02d] %7ld [%02d:%02d.%02d] %s %s %s",
i,
off,
(long int) off,
(int) (off/(CDIO_CD_FRAMES_PER_MIN)),
(int) ((off/CDIO_CD_FRAMES_PER_SEC) % CDIO_CD_SECS_PER_MIN),
(int) (off % CDIO_CD_FRAMES_PER_SEC),
sec,
(long int) sec,
(int) (sec/(CDIO_CD_FRAMES_PER_MIN)),
(int) ((sec/CDIO_CD_FRAMES_PER_SEC) % CDIO_CD_SECS_PER_MIN),
(int) (sec % CDIO_CD_FRAMES_PER_SEC),
@@ -654,10 +666,22 @@ struct option options [] = {
static cdrom_drive_t *d = NULL;
static cdrom_paranoia_t *p = NULL;
static char *span = NULL;
static char *force_cdrom_device = NULL;
static char *force_generic_device = NULL;
static void cleanup(void){
#define free_and_null(p) \
if (p) free(p); \
p=NULL;
static void
cleanup (void)
{
if (p) paranoia_free(p);
if (d) cdda_close(d);
free_and_null(span);
free_and_null(force_cdrom_device);
free_and_null(force_generic_device);
}
int
@@ -669,16 +693,12 @@ main(int argc,char *argv[])
int force_cdrom_endian = -1;
int force_cdrom_sectors = -1;
int force_cdrom_overlap = -1;
char *force_cdrom_device = NULL;
char *force_generic_device = NULL;
int force_cdrom_speed = -1;
int max_retries = 20;
char *span = NULL;
int output_type = 1; /* 0=raw, 1=wav, 2=aifc */
int output_endian = 0; /* -1=host, 0=little, 1=big */
int query_only = 0;
int batch = 0;
int i;
/* full paranoia, but allow skipping */
int paranoia_mode=PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP;
@@ -710,11 +730,11 @@ main(int argc,char *argv[])
break;
case 'd':
if(force_cdrom_device)free(force_cdrom_device);
force_cdrom_device=strdup(optarg);
force_cdrom_device=copystring(optarg);
break;
case 'g':
if(force_generic_device)free(force_generic_device);
force_generic_device=strdup(optarg);
force_generic_device=copystring(optarg);
break;
case 'S':
force_cdrom_speed=atoi(optarg);
@@ -797,7 +817,7 @@ main(int argc,char *argv[])
break;
case 'i':
if(info_file)free(info_file);
info_file=strdup(info_file);
info_file=copystring(info_file);
break;
case 'T':
toc_bias=-1;
@@ -823,41 +843,27 @@ main(int argc,char *argv[])
exit(1);
}
}else
span=strdup(argv[optind]);
span=copystring(argv[optind]);
report(VERSION);
/* Query the cdrom/disc; we may need to override some settings */
if (force_generic_device)
d=cdda_identify_scsi(force_generic_device,force_cdrom_device,verbose,NULL);
d = cdda_identify (force_generic_device, verbose, NULL);
else
if(force_cdrom_device)
d=cdda_identify(force_cdrom_device,verbose,NULL);
else
if(search)
d=cdda_find_a_cdrom(verbose,NULL);
else {
/* does the /dev/cdrom link exist? */
struct stat s;
if(lstat("/dev/cdrom",&s)){
/* no link. Search anyway */
d=cdda_find_a_cdrom(verbose,NULL);
}else{
d=cdda_identify("/dev/cdrom",verbose,NULL);
if(d==NULL && !verbose){
verbose=1;
report("\n/dev/cdrom exists but isn't accessible. By default,\n"
"cdparanoia stops searching for an accessible drive here.\n"
"Consider using -sv to force a more complete autosense\n"
"of the machine.\n\nMore information about /dev/cdrom:");
d=cdda_identify("/dev/cdrom",CDDA_MESSAGE_PRINTIT,NULL);
report("\n");
exit(1);
}else
report("");
}
driver_id_t driver_id;
char **ppsz_cd_drives = cdio_get_devices_with_cap_ret(NULL,
CDIO_FS_AUDIO,
false,
&driver_id);
if (NULL != ppsz_cd_drives)
d=cdda_identify(*ppsz_cd_drives,verbose, NULL);
cdio_free_device_list(ppsz_cd_drives);
free(ppsz_cd_drives);
}
if(!d){
@@ -930,6 +936,7 @@ main(int argc,char *argv[])
/* Dump the TOC */
if (query_only || verbose ) display_toc(d);
if (query_only) exit(0);
/* bias the disc. A hack. Of course. */
@@ -948,13 +955,19 @@ main(int argc,char *argv[])
if (toc_bias) {
toc_offset = -cdda_track_firstsector(d,1);
}
{
int i;
for( i=0; i < d->tracks+1; i++ )
d->disc_toc[i].dwStartSector+=toc_offset;
}
#ifdef SPEED_FINISHED
if (force_cdrom_speed != -1) {
cdda_speed_set(d,force_cdrom_speed);
}
#endif
if (d->nsectors==1) {
report("WARNING: The autosensed/selected sectors per read value is\n"
@@ -966,8 +979,8 @@ main(int argc,char *argv[])
/* parse the span, set up begin and end sectors */
{
long first_sector;
long last_sector;
long i_first_lsn;
long i_last_lsn;
long batch_first;
long batch_last;
int batch_track;
@@ -977,9 +990,6 @@ main(int argc,char *argv[])
char *span2=strchr(span,'-');
if(strrchr(span,'-')!=span2){
report("Error parsing span argument");
free(span);
cdda_close(d);
d=NULL;
exit(1);
}
@@ -988,42 +998,42 @@ main(int argc,char *argv[])
span2++;
}
first_sector=parse_offset(d,span,-1);
if(first_sector==-1)
last_sector=parse_offset(d,span2,cdda_disc_firstsector(d));
else
last_sector=parse_offset(d,span2,first_sector);
i_first_lsn=parse_offset(d, span, -1);
if(first_sector==-1){
if(last_sector==-1){
if(i_first_lsn==-1)
i_last_lsn=parse_offset(d, span2, cdda_disc_firstsector(d));
else
i_last_lsn=parse_offset(d, span2, i_first_lsn);
if (i_first_lsn == -1) {
if (i_last_lsn == -1) {
report("Error parsing span argument");
cdda_close(d);
d=NULL;
exit(1);
} else {
first_sector=cdda_disc_firstsector(d);
i_first_lsn=cdda_disc_firstsector(d);
}
} else {
if(last_sector==-1){
if (i_last_lsn==-1) {
if (span2) { /* There was a hyphen */
last_sector=cdda_disc_lastsector(d);
i_last_lsn=cdda_disc_lastsector(d);
} else {
last_sector=
cdda_track_lastsector(d,cdda_sector_gettrack(d,first_sector));
i_last_lsn=
cdda_track_lastsector(d,cdda_sector_gettrack(d, i_first_lsn));
}
}
}
} else {
first_sector=cdda_disc_firstsector(d);
last_sector=cdda_disc_lastsector(d);
i_first_lsn = cdda_disc_firstsector(d);
i_last_lsn = cdda_disc_lastsector(d);
}
{
char buffer[250];
int track1=cdda_sector_gettrack(d,first_sector);
int track2=cdda_sector_gettrack(d,last_sector);
long off1=first_sector-cdda_track_firstsector(d,track1);
long off2=last_sector-cdda_track_firstsector(d,track2);
int track1 = cdda_sector_gettrack(d, i_first_lsn);
int track2 = cdda_sector_gettrack(d, i_last_lsn);
long off1 = i_first_lsn - cdda_track_firstsector(d, track1);
long off2 = i_last_lsn - cdda_track_firstsector(d, track2);
int i;
for( i=track1; i<=track2; i++ )
@@ -1034,12 +1044,12 @@ main(int argc,char *argv[])
sprintf(buffer, "Ripping from sector %7ld (track %2d [%d:%02d.%02d])\n"
"\t to sector %7ld (track %2d [%d:%02d.%02d])\n",
first_sector,
i_first_lsn,
track1,
(int) (off1/(CDIO_CD_FRAMES_PER_MIN)),
(int) ((off1/CDIO_CD_FRAMES_PER_SEC) % CDIO_CD_SECS_PER_MIN),
(int) (off1 % CDIO_CD_FRAMES_PER_SEC),
last_sector,
i_last_lsn,
track2,
(int) (off2/(CDIO_CD_FRAMES_PER_MIN)),
(int) ((off2/CDIO_CD_FRAMES_PER_SEC) % CDIO_CD_SECS_PER_MIN),
@@ -1063,7 +1073,7 @@ main(int argc,char *argv[])
else
cdda_verbose_set(d,CDDA_MESSAGE_FORGETIT,CDDA_MESSAGE_FORGETIT);
paranoia_seek(p,cursor=first_sector,SEEK_SET);
paranoia_seek(p,cursor=i_first_lsn,SEEK_SET);
/* this is probably a good idea in general */
seteuid(getuid());
@@ -1077,17 +1087,16 @@ main(int argc,char *argv[])
if(sample_offset)
d->disc_toc[d->tracks].dwStartSector++;
while(cursor<=last_sector){
while(cursor<=i_last_lsn){
char outfile_name[256];
if ( batch ){
batch_first = cursor;
batch_last=
cdda_track_lastsector(d,batch_track=
cdda_sector_gettrack(d,cursor));
if(batch_last>last_sector)batch_last=last_sector;
batch_track = cdda_sector_gettrack(d,cursor);
batch_last = cdda_track_lastsector(d, batch_track);
if (batch_last>i_last_lsn) batch_last=i_last_lsn;
} else {
batch_first=first_sector;
batch_last=last_sector;
batch_first = i_first_lsn;
batch_last = i_last_lsn;
batch_track = -1;
}
@@ -1099,7 +1108,8 @@ main(int argc,char *argv[])
if (optind+1<argc) {
if (!strcmp(argv[optind+1],"-") ){
out = dup(fileno(stdout));
if(batch)report("Are you sure you wanted 'batch' "
if(batch)
report("Are you sure you wanted 'batch' "
"(-B) output with stdout?");
report("outputting to stdout\n");
outfile_name[0]='\0';
@@ -1116,7 +1126,8 @@ main(int argc,char *argv[])
strncat(path,argv[optind+1],pos>256?256:pos);
if(batch)
snprintf(outfile_name,246,"%strack%02d.%s",path,batch_track,file);
snprintf(outfile_name, 246, " %strack%02d.%s", path,
batch_track, file);
else
snprintf(outfile_name, 246, "%s%s", path, file);
@@ -1139,10 +1150,8 @@ main(int argc,char *argv[])
out=open(outfile_name,O_RDWR|O_CREAT|O_TRUNC,0666);
if(out==-1){
report3("Cannot open specified output file %s: %s",outfile_name,
strerror(errno));
cdda_close(d);
d=NULL;
report3("Cannot open specified output file %s: %s",
outfile_name, strerror(errno));
exit(1);
}
report2("outputting to %s\n", outfile_name);
@@ -1173,8 +1182,6 @@ main(int argc,char *argv[])
if(out==-1){
report3("Cannot open default output file %s: %s", outfile_name,
strerror(errno));
cdda_close(d);
d=NULL;
exit(1);
}
report2("outputting to %s\n", outfile_name);
@@ -1320,10 +1327,5 @@ main(int argc,char *argv[])
report("Done.\n\n");
cdda_close(d);
if (span) free(span);
if (force_cdrom_device) free(force_cdrom_device);
if (force_generic_device) free(force_generic_device);
d=NULL;
return 0;
}

4
src/cd-paranoia/report.c
View File

@@ -1,5 +1,5 @@
/*
$Id: report.c,v 1.1 2004/12/18 17:29:32 rocky Exp $
$Id: report.c,v 1.2 2005/01/06 01:15:51 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -26,7 +26,7 @@
#include <stdio.h>
#include "config.h"
#include <cdio/cdda_interface.h>
#include <cdio/cdda.h>
#include "report.h"
int quiet=0;

6
src/cd-paranoia/utils.h
View File

@@ -1,7 +1,7 @@
/*
$Id: utils.h,v 1.3 2004/12/19 01:43:38 rocky Exp $
$Id: utils.h,v 1.4 2005/01/06 01:15:51 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu
This program is free software; you can redistribute it and/or modify
@@ -23,6 +23,8 @@
#include <stdio.h>
#include <string.h>
#define copystring(s) (s) ? s : NULL;
static inline char *
catstring(char *buff, const char *s)
{

6
src/cd-paranoia/version.h
View File

@@ -1,7 +1,7 @@
/*
$Id: version.h,v 1.1 2004/12/18 17:29:32 rocky Exp $
$Id: version.h,v 1.2 2005/01/06 01:15:51 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001 Monty xiphmont@mit.edu
This program is free software; you can redistribute it and/or modify
@@ -25,5 +25,5 @@
#define VERSION "cdparanoia III release 9.8 libcdio\n"\
"(C) 2001 Monty <monty@xiph.org> and Xiphophorus\n"\
"(C) 2004 Rocky Bernstein <rocky@panix.com>\n\n"\
"(C) 2004, 2005 Rocky Bernstein <rocky@panix.com>\n\n"\
"Report bugs to bug-libcdio@gnu.org\n"