This commit is contained in:
parent
134f61a3b7
commit
4267fba873
@ -1 +1,2 @@
|
||||
cdparanoia
|
||||
libcdda_interface0
|
||||
libcdda_paranoia0
|
356
cdparanoia-III-01-typos-and-spelling.dpatch
Normal file
356
cdparanoia-III-01-typos-and-spelling.dpatch
Normal file
@ -0,0 +1,356 @@
|
||||
#!/bin/sh /usr/share/dpatch/dpatch-run
|
||||
## 01-typos-and-spelling.dpatch by A Costa <agcosta@gis.net>
|
||||
##
|
||||
## DP: Fixes some typos and spelling mistakes.
|
||||
|
||||
@DPATCH@
|
||||
|
||||
================================================================================
|
||||
--- cdparanoia-III-10.2/cdparanoia.1
|
||||
+++ cdparanoia-III-10.2/cdparanoia.1
|
||||
@@ -1,16 +1,17 @@
|
||||
.TH CDPARANOIA 1 "11 Sep 2008"
|
||||
.SH NAME
|
||||
-cdparanoia 10.2 (Paranoia release III) \- an audio CD reading utility which includes extra data verification features
|
||||
+cdparanoia \- an audio CD reading utility which includes extra data verification features
|
||||
.SH SYNOPSIS
|
||||
.B cdparanoia
|
||||
.RB [ options ]
|
||||
.B span
|
||||
.RB [ outfile ]
|
||||
+.RB | \-B
|
||||
.SH DESCRIPTION
|
||||
.B cdparanoia
|
||||
-retrieves audio tracks from CDDA capable CDROM drives. The data can
|
||||
+retrieves audio tracks from CDDA-capable CDROM drives. The data can
|
||||
be saved to a file or directed to standard output in WAV, AIFF, AIFF-C
|
||||
-or raw format. Most ATAPI, SCSI and several proprietary CDROM drive
|
||||
+or raw format. Most ATAPI and SCSI and several proprietary CDROM drive
|
||||
makes are supported;
|
||||
.B cdparanoia
|
||||
can determine if the target drive is CDDA capable.
|
||||
@@ -69,7 +70,7 @@
|
||||
|
||||
.TP
|
||||
.B \-p --output-raw
|
||||
-Output headerless data as raw 16 bit PCM data with interleaved samples in host byte order. To force little or big endian byte order, use
|
||||
+Output headerless data as raw 16-bit PCM data with interleaved samples in host byte order. To force little or big endian byte order, use
|
||||
.B \-r
|
||||
or
|
||||
.B \-R
|
||||
@@ -77,40 +78,46 @@
|
||||
|
||||
.TP
|
||||
.B \-r --output-raw-little-endian
|
||||
-Output headerless data as raw 16 bit PCM data with interleaved samples in LSB first byte order.
|
||||
+Output headerless data as raw 16-bit PCM data with interleaved samples in LSB first byte order.
|
||||
|
||||
.TP
|
||||
.B \-R --output-raw-big-endian
|
||||
-Output headerless data as raw 16 bit PCM data with interleaved samples in MSB first byte order.
|
||||
+Output headerless data as raw 16-bit PCM data with interleaved samples in MSB first byte order.
|
||||
|
||||
.TP
|
||||
.B \-w --output-wav
|
||||
Output data in Micro$oft RIFF WAV format (note that WAV data is always
|
||||
-LSB first byte order).
|
||||
+LSB-first byte order).
|
||||
|
||||
.TP
|
||||
.B \-f --output-aiff
|
||||
Output data in Apple AIFF format (note that AIFC data is
|
||||
-always in MSB first byte order).
|
||||
+always in MSB-first byte order).
|
||||
|
||||
.TP
|
||||
.B \-a --output-aifc
|
||||
Output data in uncompressed Apple AIFF-C format (note that AIFF-C data is
|
||||
-always in MSB first byte order).
|
||||
+always in MSB-first byte order).
|
||||
|
||||
.TP
|
||||
.BI "\-B --batch "
|
||||
|
||||
-Cdda2wav-style batch output flag; cdparanoia will split the output
|
||||
+Cdda2wav-style batch output flag;
|
||||
+.B cdparanoia
|
||||
+will split the output
|
||||
into multiple files at track boundaries. Output file names are
|
||||
prepended with 'track#.'
|
||||
|
||||
.TP
|
||||
.B \-c --force-cdrom-little-endian
|
||||
Some CDROM drives misreport their endianness (or do not report it at
|
||||
-all); it's possible that cdparanoia will guess wrong. Use
|
||||
+all); it's possible that
|
||||
+.B cdparanoia
|
||||
+will guess wrong. Use
|
||||
.B \-c
|
||||
-to force cdparanoia to treat the drive as a little endian device.
|
||||
+to force
|
||||
+.B cdparanoia
|
||||
+to treat the drive as a little endian device.
|
||||
|
||||
.TP
|
||||
.B \-C --force-cdrom-big-endian
|
||||
@@ -122,7 +129,7 @@
|
||||
.B n
|
||||
sectors per read. This number can be misleading; the kernel will often
|
||||
split read requests into multiple atomic reads (the automated Paranoia
|
||||
-code is aware of this) or allow reads only wihin a restricted size
|
||||
+code is aware of this) or allow reads only within a restricted size
|
||||
range.
|
||||
.B This option should generally not be used.
|
||||
|
||||
@@ -131,7 +138,7 @@
|
||||
Force the interface backend to read from
|
||||
.B device
|
||||
rather than the first readable CDROM drive it finds. This can be used
|
||||
-to specify devices of any valid interface type (ATAPI, SCSI or
|
||||
+to specify devices of any valid interface type (ATAPI, SCSI, or
|
||||
proprietary).
|
||||
|
||||
.TP
|
||||
@@ -158,13 +165,13 @@
|
||||
may be used with
|
||||
.B \-d
|
||||
to explicitly set both the SCSI cdrom and
|
||||
-generic (sg) devices seperately. This option is only useful on
|
||||
+generic (sg) devices separately. This option is only useful on
|
||||
obsolete SCSI setups and when using the generic scsi (sg) driver.
|
||||
|
||||
.TP
|
||||
.BI "\-S --force-read-speed " number
|
||||
Use this option explicitly to set the read rate of the CD drive (where
|
||||
-supported). This can reduce underruns on machines with slow disks, or
|
||||
+supported). This can reduce underruns on machines which have slow disks, or
|
||||
which are low on memory.
|
||||
|
||||
.TP
|
||||
@@ -184,16 +191,19 @@
|
||||
and catching a bit of the next track).
|
||||
.B \-T
|
||||
accounts for this behavior. Note that this option will cause
|
||||
-cdparanoia to attempt to read sectors before or past the known user
|
||||
+.B cdparanoia
|
||||
+to attempt to read sectors before or past the known user
|
||||
data area of the disc, resulting in read errors at disc edges on most
|
||||
drives and possibly even hard lockups on some buggy hardware.
|
||||
|
||||
.TP
|
||||
.BI "\-O --sample-offset " number
|
||||
Use this option to force the entire disc to shift sample position
|
||||
-output by the given amount; This can be used to shift track boundaries
|
||||
+output by the given amount; this can be used to shift track boundaries
|
||||
for the whole disc manually on sample granularity. Note that this will
|
||||
-cause cdparanoia to attempt to read partial sectors before or past the
|
||||
+cause
|
||||
+.B cdparanoia
|
||||
+to attempt to read partial sectors before or past the
|
||||
known user data area of the disc, probably causing read errors on most
|
||||
drives and possibly even hard lockups on some buggy hardware.
|
||||
|
||||
@@ -202,8 +212,11 @@
|
||||
.B \-Z --disable-paranoia
|
||||
Disable
|
||||
.B all
|
||||
-data verification and correction features. When using -Z, cdparanoia
|
||||
-reads data exactly as would cdda2wav with an overlap setting of zero.
|
||||
+data verification and correction features. When using -Z,
|
||||
+.B cdparanoia
|
||||
+reads data exactly as would
|
||||
+.BR cdda2wav (1)
|
||||
+with an overlap setting of zero.
|
||||
This option implies that
|
||||
.B \-Y
|
||||
is active.
|
||||
@@ -211,7 +224,9 @@
|
||||
.TP
|
||||
.B \-z --never-skip[=max_retries]
|
||||
Do not accept any skips; retry forever if needed. An optional maximum
|
||||
-number of retries can be specified; for comparison, default without -z is
|
||||
+number of retries can be specified; for comparison, default without
|
||||
+.B -z
|
||||
+is
|
||||
currently 20.
|
||||
|
||||
.TP
|
||||
@@ -221,7 +236,7 @@
|
||||
|
||||
.TP
|
||||
.B \-X --abort-on-skip
|
||||
-If the read skips due to imperfect data, a scratch, whatever, abort reading this track. If output is to a file, delete the partially completed file.
|
||||
+If the read skips due to imperfect data, a scratch, or whatever, abort reading this track. If output is to a file, delete the partially completed file.
|
||||
|
||||
.SH OUTPUT SMILIES
|
||||
.TP
|
||||
@@ -282,7 +297,9 @@
|
||||
.B
|
||||
!
|
||||
Errors found after stage 1 correction; the drive is making the
|
||||
-same error through multiple re-reads, and cdparanoia is having trouble
|
||||
+same error through multiple re-reads, and
|
||||
+.B cdparanoia
|
||||
+is having trouble
|
||||
detecting them.
|
||||
.TP
|
||||
.B
|
||||
@@ -295,8 +312,9 @@
|
||||
|
||||
.SH SPAN ARGUMENT
|
||||
|
||||
-The span argument specifies which track, tracks or subsections of
|
||||
-tracks to read. This argument is required.
|
||||
+The span argument specifies which track, tracks, or subsections of
|
||||
+tracks to read. This argument is required,
|
||||
+unless batch-mode is used (in bach-mode, cdparanoia will rip all traks if no span is given).
|
||||
.B NOTE:
|
||||
Unless the span is a simple number, it's generally a good idea to
|
||||
quote the span argument to protect it from the shell.
|
||||
@@ -307,7 +325,7 @@
|
||||
1[ww:xx:yy.zz]-2[aa:bb:cc.dd]
|
||||
.P
|
||||
Here, 1 and 2 are track numbers; the numbers in brackets provide a
|
||||
-finer grained offset within a particular track. [aa:bb:cc.dd] is in
|
||||
+finer-grained offset within a particular track. [aa:bb:cc.dd] is in
|
||||
hours/minutes/seconds/sectors format. Zero fields need not be
|
||||
specified: [::20], [:20], [20], [20.], etc, would be interpreted as
|
||||
twenty seconds, [10:] would be ten minutes, [.30] would be thirty
|
||||
@@ -315,7 +333,7 @@
|
||||
.P
|
||||
When only a single offset is supplied, it is interpreted as a starting
|
||||
offset and ripping will continue to the end of the track. If a single
|
||||
-offset is preceeded or followed by a hyphen, the implicit missing
|
||||
+offset is preceded or followed by a hyphen, the implicit missing
|
||||
offset is taken to be the start or end of the disc, respectively. Thus:
|
||||
|
||||
.TP
|
||||
@@ -335,7 +353,7 @@
|
||||
.B 2-4
|
||||
Specifies ripping from the beginning of track 2 to the end of track 4.
|
||||
.P
|
||||
-Again, don't forget to protect square brackets and preceeding hyphens from
|
||||
+Again, don't forget to protect square brackets from
|
||||
the shell.
|
||||
|
||||
.SH EXAMPLES
|
||||
@@ -346,7 +364,7 @@
|
||||
.P
|
||||
cdparanoia -vsQ
|
||||
.TP
|
||||
-Extract an entire disc, putting each track in a seperate file:
|
||||
+Extract an entire disc, putting each track in a separate file:
|
||||
.P
|
||||
cdparanoia -B
|
||||
.TP
|
||||
@@ -354,26 +372,30 @@
|
||||
.P
|
||||
cdparanoia "1[:30.12]-1[1:10]"
|
||||
.TP
|
||||
-Extract from the beginning of the disc up to track 3:
|
||||
+Extract from the beginning of the disc up through track 3:
|
||||
.P
|
||||
- cdparanoia -- "-3"
|
||||
+ cdparanoia -- -3
|
||||
.TP
|
||||
The "--" above is to distinguish "-3" from an option flag.
|
||||
.SH OUTPUT
|
||||
|
||||
The output file argument is optional; if it is not specified,
|
||||
-cdparanoia will output samples to one of
|
||||
+.B cdparanoia
|
||||
+will output samples to one of
|
||||
.BR cdda.wav ", " cdda.aifc ", or " cdda.raw
|
||||
depending on whether
|
||||
-.BR \-w ", " \-a ", " \-r " or " \-R " is used (" \-w
|
||||
+.BR \-w ", " \-a ", " \-r " or, " \-R " is used (" \-w
|
||||
is the implicit default). The output file argument of
|
||||
.B \-
|
||||
specifies standard output; all data formats may be piped.
|
||||
|
||||
.SH ACKNOWLEDGEMENTS
|
||||
-Cdparanoia sprang from and once drew heavily from the interface of
|
||||
+.B cdparanoia
|
||||
+sprang from and once drew heavily from the interface of
|
||||
Heiko Eissfeldt's (heiko@colossus.escape.de) 'cdda2wav'
|
||||
-package. Cdparanoia would not have happened without it.
|
||||
+package.
|
||||
+.B cdparanoia
|
||||
+would not have happened without it.
|
||||
.P
|
||||
Joerg Schilling has also contributed SCSI expertise through his
|
||||
generic SCSI transport library.
|
||||
@@ -381,5 +403,6 @@
|
||||
.SH AUTHOR
|
||||
Monty <monty@xiph.org>
|
||||
.P
|
||||
-Cdparanoia's homepage may be found at:
|
||||
+.B cdparanoia's
|
||||
+homepage may be found at:
|
||||
http://www.xiph.org/paranoia/
|
||||
--- cdparanoia-III-10.2/main.c
|
||||
+++ cdparanoia-III-10.2/main.c
|
||||
@@ -51,7 +51,7 @@
|
||||
|
||||
if(offset==NULL)return(-1);
|
||||
|
||||
- /* seperate track from time offset */
|
||||
+ /* separate track from time offset */
|
||||
temp=strchr(offset,']');
|
||||
if(temp){
|
||||
*temp='\0';
|
||||
@@ -221,14 +221,14 @@
|
||||
" -V --version : print version info and quit\n"
|
||||
" -Q --query : autosense drive, query disc and quit\n"
|
||||
" -B --batch : 'batch' mode (saves each track to a\n"
|
||||
-" seperate file.\n"
|
||||
+" separate file.\n"
|
||||
" -s --search-for-drive : do an exhaustive search for drive\n"
|
||||
" -h --help : print help\n\n"
|
||||
|
||||
-" -p --output-raw : output raw 16 bit PCM in host byte \n"
|
||||
+" -p --output-raw : output raw 16-bit PCM in host byte \n"
|
||||
" order\n"
|
||||
-" -r --output-raw-little-endian : output raw 16 bit little-endian PCM\n"
|
||||
-" -R --output-raw-big-endian : output raw 16 bit big-endian PCM\n"
|
||||
+" -r --output-raw-little-endian : output raw 16-bit little-endian PCM\n"
|
||||
+" -R --output-raw-big-endian : output raw 16-bit big-endian PCM\n"
|
||||
" -w --output-wav : output as WAV file (default)\n"
|
||||
" -f --output-aiff : output as AIFF file\n"
|
||||
" -a --output-aifc : output as AIFF-C file\n\n"
|
||||
@@ -295,7 +295,7 @@
|
||||
" 1[ww:xx:yy.zz]-2[aa:bb:cc.dd] \n\n"
|
||||
|
||||
"Here, 1 and 2 are track numbers; the numbers in brackets provide a\n"
|
||||
-"finer grained offset within a particular track. [aa:bb:cc.dd] is in\n"
|
||||
+"finer-grained offset within a particular track. [aa:bb:cc.dd] is in\n"
|
||||
"hours/minutes/seconds/sectors format. Zero fields need not be\n"
|
||||
"specified: [::20], [:20], [20], [20.], etc, would be interpreted as\n"
|
||||
"twenty seconds, [10:] would be ten minutes, [.30] would be thirty\n"
|
||||
@@ -303,7 +303,7 @@
|
||||
|
||||
"When only a single offset is supplied, it is interpreted as a starting\n"
|
||||
"offset and ripping will continue to the end of he track. If a single\n"
|
||||
-"offset is preceeded or followed by a hyphen, the implicit missing\n"
|
||||
+"offset is preceded or followed by a hyphen, the implicit missing\n"
|
||||
"offset is taken to be the start or end of the disc, respectively. Thus:\n\n"
|
||||
|
||||
" 1:[20.35] Specifies ripping from track 1, second 20, sector 35 to \n"
|
||||
@@ -323,12 +323,15 @@
|
||||
"Don't forget to protect square brackets and preceeding hyphens from\n"
|
||||
"the shell...\n\n"
|
||||
"A few examples, protected from the shell:\n"
|
||||
+"Don't forget to protect square brackets from the shell...\n\n"
|
||||
+
|
||||
+"A few examples, protected from the shell where appropriate:\n"
|
||||
" A) query only with exhaustive search for a drive and full reporting\n"
|
||||
" of autosense:\n"
|
||||
" cdparanoia -vsQ\n\n"
|
||||
-" B) extract up to and including track 3, putting each track in a seperate\n"
|
||||
+" B) extract up to and including track 3, putting each track in a separate\n"
|
||||
" file:\n"
|
||||
-" cdparanoia -B -- \"-3\"\n\n"
|
||||
+" cdparanoia -B -- -3\n\n"
|
||||
" C) extract from track 1, time 0:30.12 to 1:10.00:\n"
|
||||
" cdparanoia \"1[:30.12]-1[1:10]\"\n\n"
|
||||
|
579
cdparanoia-III-05-gcc4.3.dpatch
Normal file
579
cdparanoia-III-05-gcc4.3.dpatch
Normal file
@ -0,0 +1,579 @@
|
||||
#!/bin/sh /usr/share/dpatch/dpatch-run
|
||||
## 04-gcc4.3.dpatch by Monty <paranoia@xiph.org>
|
||||
##
|
||||
## DP: Changeset 15338: Commit fix for 'private' becoming a reserved keyword as
|
||||
## DP: of GCC 4.3+ (Closes: #499676).
|
||||
|
||||
@DPATCH@
|
||||
|
||||
================================================================================
|
||||
--- cdparanoia-III-10.2/interface/cdda_interface.h
|
||||
+++ cdparanoia-III-10.2/interface/cdda_interface.h
|
||||
@@ -84,7 +84,7 @@
|
||||
int is_atapi;
|
||||
int is_mmc;
|
||||
|
||||
- cdda_private_data_t *private;
|
||||
+ cdda_private_data_t *private_data;
|
||||
void *reserved;
|
||||
unsigned char inqbytes[4];
|
||||
|
||||
--- cdparanoia-III-10.2/interface/cooked_interface.c
|
||||
+++ cdparanoia-III-10.2/interface/cooked_interface.c
|
||||
@@ -13,13 +13,13 @@
|
||||
static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
|
||||
struct timespec tv1;
|
||||
struct timespec tv2;
|
||||
- int ret1=clock_gettime(d->private->clock,&tv1);
|
||||
+ int ret1=clock_gettime(d->private_data->clock,&tv1);
|
||||
int ret2=ioctl(fd, command,arg);
|
||||
- int ret3=clock_gettime(d->private->clock,&tv2);
|
||||
+ int ret3=clock_gettime(d->private_data->clock,&tv2);
|
||||
if(ret1<0 || ret3<0){
|
||||
- d->private->last_milliseconds=-1;
|
||||
+ d->private_data->last_milliseconds=-1;
|
||||
}else{
|
||||
- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
|
||||
+ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
|
||||
}
|
||||
return ret2;
|
||||
}
|
||||
--- cdparanoia-III-10.2/interface/interface.c
|
||||
+++ cdparanoia-III-10.2/interface/interface.c
|
||||
@@ -39,9 +39,9 @@
|
||||
if(d->drive_model)free(d->drive_model);
|
||||
if(d->cdda_fd!=-1)close(d->cdda_fd);
|
||||
if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
|
||||
- if(d->private){
|
||||
- if(d->private->sg_hd)free(d->private->sg_hd);
|
||||
- free(d->private);
|
||||
+ if(d->private_data){
|
||||
+ if(d->private_data->sg_hd)free(d->private_data->sg_hd);
|
||||
+ free(d->private_data);
|
||||
}
|
||||
|
||||
free(d);
|
||||
@@ -127,7 +127,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
- if(ms)*ms=d->private->last_milliseconds;
|
||||
+ if(ms)*ms=d->private_data->last_milliseconds;
|
||||
return(sectors);
|
||||
}
|
||||
|
||||
--- cdparanoia-III-10.2/interface/scan_devices.c
|
||||
+++ cdparanoia-III-10.2/interface/scan_devices.c
|
||||
@@ -270,11 +270,11 @@
|
||||
d->interface=COOKED_IOCTL;
|
||||
d->bigendianp=-1; /* We don't know yet... */
|
||||
d->nsectors=-1;
|
||||
- d->private=calloc(1,sizeof(*d->private));
|
||||
+ d->private_data=calloc(1,sizeof(*d->private_data));
|
||||
{
|
||||
/* goddamnit */
|
||||
struct timespec tv;
|
||||
- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
|
||||
+ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
|
||||
}
|
||||
idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
|
||||
return(d);
|
||||
@@ -680,15 +680,15 @@
|
||||
d->bigendianp=-1; /* We don't know yet... */
|
||||
d->nsectors=-1;
|
||||
d->messagedest = messagedest;
|
||||
- d->private=calloc(1,sizeof(*d->private));
|
||||
+ d->private_data=calloc(1,sizeof(*d->private_data));
|
||||
{
|
||||
/* goddamnit */
|
||||
struct timespec tv;
|
||||
- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
|
||||
+ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
|
||||
}
|
||||
if(use_sgio){
|
||||
d->interface=SGIO_SCSI;
|
||||
- d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
|
||||
+ d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
|
||||
g_fd=d->cdda_fd=dup(d->ioctl_fd);
|
||||
}else{
|
||||
version=verify_SG_version(d,messagedest,messages);
|
||||
@@ -702,8 +702,8 @@
|
||||
}
|
||||
|
||||
/* malloc our big buffer for scsi commands */
|
||||
- d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
|
||||
- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
|
||||
+ d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
|
||||
+ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
|
||||
}
|
||||
|
||||
{
|
||||
@@ -778,9 +778,9 @@
|
||||
if(i_fd!=-1)close(i_fd);
|
||||
if(g_fd!=-1)close(g_fd);
|
||||
if(d){
|
||||
- if(d->private){
|
||||
- if(d->private->sg_hd)free(d->private->sg_hd);
|
||||
- free(d->private);
|
||||
+ if(d->private_data){
|
||||
+ if(d->private_data->sg_hd)free(d->private_data->sg_hd);
|
||||
+ free(d->private_data);
|
||||
}
|
||||
free(d);
|
||||
}
|
||||
@@ -827,7 +827,7 @@
|
||||
d->interface=TEST_INTERFACE;
|
||||
d->bigendianp=-1; /* We don't know yet... */
|
||||
d->nsectors=-1;
|
||||
- d->private=calloc(1,sizeof(*d->private));
|
||||
+ d->private_data=calloc(1,sizeof(*d->private_data));
|
||||
d->drive_model=copystring("File based test interface");
|
||||
idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model);
|
||||
|
||||
--- cdparanoia-III-10.2/interface/scsi_interface.c
|
||||
+++ cdparanoia-III-10.2/interface/scsi_interface.c
|
||||
@@ -15,13 +15,13 @@
|
||||
static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
|
||||
struct timespec tv1;
|
||||
struct timespec tv2;
|
||||
- int ret1=clock_gettime(d->private->clock,&tv1);
|
||||
+ int ret1=clock_gettime(d->private_data->clock,&tv1);
|
||||
int ret2=ioctl(fd, command,arg);
|
||||
- int ret3=clock_gettime(d->private->clock,&tv2);
|
||||
+ int ret3=clock_gettime(d->private_data->clock,&tv2);
|
||||
if(ret1<0 || ret3<0){
|
||||
- d->private->last_milliseconds=-1;
|
||||
+ d->private_data->last_milliseconds=-1;
|
||||
}else{
|
||||
- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
|
||||
+ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
|
||||
}
|
||||
return ret2;
|
||||
}
|
||||
@@ -96,7 +96,7 @@
|
||||
static void clear_garbage(cdrom_drive *d){
|
||||
fd_set fdset;
|
||||
struct timeval tv;
|
||||
- struct sg_header *sg_hd=d->private->sg_hd;
|
||||
+ struct sg_header *sg_hd=d->private_data->sg_hd;
|
||||
int flag=0;
|
||||
|
||||
/* clear out any possibly preexisting garbage */
|
||||
@@ -185,7 +185,7 @@
|
||||
struct timespec tv2;
|
||||
int tret1,tret2;
|
||||
int status = 0;
|
||||
- struct sg_header *sg_hd=d->private->sg_hd;
|
||||
+ struct sg_header *sg_hd=d->private_data->sg_hd;
|
||||
long writebytes=SG_OFF+cmd_len+in_size;
|
||||
|
||||
/* generic scsi device services */
|
||||
@@ -195,7 +195,7 @@
|
||||
|
||||
memset(sg_hd,0,sizeof(sg_hd));
|
||||
memset(sense_buffer,0,SG_MAX_SENSE);
|
||||
- memcpy(d->private->sg_buffer,cmd,cmd_len+in_size);
|
||||
+ memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size);
|
||||
sg_hd->twelve_byte = cmd_len == 12;
|
||||
sg_hd->result = 0;
|
||||
sg_hd->reply_len = SG_OFF + out_size;
|
||||
@@ -209,7 +209,7 @@
|
||||
tell if the command failed. Scared yet? */
|
||||
|
||||
if(bytecheck && out_size>in_size){
|
||||
- memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size);
|
||||
+ memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size);
|
||||
/* the size does not remove cmd_len due to the way the kernel
|
||||
driver copies buffers */
|
||||
writebytes+=(out_size-in_size);
|
||||
@@ -243,7 +243,7 @@
|
||||
}
|
||||
|
||||
sigprocmask (SIG_BLOCK, &(d->sigset), NULL );
|
||||
- tret1=clock_gettime(d->private->clock,&tv1);
|
||||
+ tret1=clock_gettime(d->private_data->clock,&tv1);
|
||||
errno=0;
|
||||
status = write(d->cdda_fd, sg_hd, writebytes );
|
||||
|
||||
@@ -289,7 +289,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
- tret2=clock_gettime(d->private->clock,&tv2);
|
||||
+ tret2=clock_gettime(d->private_data->clock,&tv2);
|
||||
errno=0;
|
||||
status = read(d->cdda_fd, sg_hd, SG_OFF + out_size);
|
||||
sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL );
|
||||
@@ -313,7 +313,7 @@
|
||||
if(bytecheck && in_size+cmd_len<out_size){
|
||||
long i,flag=0;
|
||||
for(i=in_size;i<out_size;i++)
|
||||
- if(d->private->sg_buffer[i]!=bytefill){
|
||||
+ if(d->private_data->sg_buffer[i]!=bytefill){
|
||||
flag=1;
|
||||
break;
|
||||
}
|
||||
@@ -326,9 +326,9 @@
|
||||
|
||||
errno=0;
|
||||
if(tret1<0 || tret2<0){
|
||||
- d->private->last_milliseconds=-1;
|
||||
+ d->private_data->last_milliseconds=-1;
|
||||
}else{
|
||||
- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
|
||||
+ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
|
||||
}
|
||||
return(0);
|
||||
}
|
||||
@@ -347,7 +347,7 @@
|
||||
|
||||
memset(&hdr,0,sizeof(hdr));
|
||||
memset(sense,0,sizeof(sense));
|
||||
- memcpy(d->private->sg_buffer,cmd+cmd_len,in_size);
|
||||
+ memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size);
|
||||
|
||||
hdr.cmdp = cmd;
|
||||
hdr.cmd_len = cmd_len;
|
||||
@@ -355,7 +355,7 @@
|
||||
hdr.mx_sb_len = SG_MAX_SENSE;
|
||||
hdr.timeout = 50000;
|
||||
hdr.interface_id = 'S';
|
||||
- hdr.dxferp = d->private->sg_buffer;
|
||||
+ hdr.dxferp = d->private_data->sg_buffer;
|
||||
hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */
|
||||
|
||||
/* scary buffer fill hack */
|
||||
@@ -400,7 +400,7 @@
|
||||
if(bytecheck && in_size<out_size){
|
||||
long i,flag=0;
|
||||
for(i=in_size;i<out_size;i++)
|
||||
- if(d->private->sg_buffer[i]!=bytefill){
|
||||
+ if(d->private_data->sg_buffer[i]!=bytefill){
|
||||
flag=1;
|
||||
break;
|
||||
}
|
||||
@@ -412,7 +412,7 @@
|
||||
}
|
||||
|
||||
/* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */
|
||||
- /* d->private->last_milliseconds = hdr.duration; */
|
||||
+ /* d->private_data->last_milliseconds = hdr.duration; */
|
||||
|
||||
errno = 0;
|
||||
return 0;
|
||||
@@ -445,9 +445,9 @@
|
||||
|
||||
handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense);
|
||||
|
||||
- key = d->private->sg_buffer[2] & 0xf;
|
||||
- ASC = d->private->sg_buffer[12];
|
||||
- ASCQ = d->private->sg_buffer[13];
|
||||
+ key = d->private_data->sg_buffer[2] & 0xf;
|
||||
+ ASC = d->private_data->sg_buffer[12];
|
||||
+ ASCQ = d->private_data->sg_buffer[13];
|
||||
|
||||
if(key == 2 && ASC == 4 && ASCQ == 1) return 0;
|
||||
return 1;
|
||||
@@ -492,7 +492,7 @@
|
||||
if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1);
|
||||
|
||||
{
|
||||
- unsigned char *b=d->private->sg_buffer;
|
||||
+ unsigned char *b=d->private_data->sg_buffer;
|
||||
if(b[0])return(1); /* Handles only up to 256 bytes */
|
||||
if(b[6])return(1); /* Handles only up to 256 bytes */
|
||||
|
||||
@@ -604,8 +604,8 @@
|
||||
static unsigned int get_orig_sectorsize(cdrom_drive *d){
|
||||
if(mode_sense(d,12,0x01))return(-1);
|
||||
|
||||
- d->orgdens = d->private->sg_buffer[4];
|
||||
- return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]);
|
||||
+ d->orgdens = d->private_data->sg_buffer[4];
|
||||
+ return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]);
|
||||
}
|
||||
|
||||
/* switch CDROM scsi drives to given sector size */
|
||||
@@ -664,8 +664,8 @@
|
||||
return(-4);
|
||||
}
|
||||
|
||||
- first=d->private->sg_buffer[2];
|
||||
- last=d->private->sg_buffer[3];
|
||||
+ first=d->private_data->sg_buffer[2];
|
||||
+ last=d->private_data->sg_buffer[3];
|
||||
tracks=last-first+1;
|
||||
|
||||
if (last > MAXTRK || first > MAXTRK || last<0 || first<0) {
|
||||
@@ -683,7 +683,7 @@
|
||||
return(-5);
|
||||
}
|
||||
{
|
||||
- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
|
||||
+ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
|
||||
|
||||
d->disc_toc[i-first].bFlags=toc->bFlags;
|
||||
d->disc_toc[i-first].bTrack=i;
|
||||
@@ -704,7 +704,7 @@
|
||||
return(-2);
|
||||
}
|
||||
{
|
||||
- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
|
||||
+ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
|
||||
|
||||
d->disc_toc[i-first].bFlags=toc->bFlags;
|
||||
d->disc_toc[i-first].bTrack=0xAA;
|
||||
@@ -738,7 +738,7 @@
|
||||
}
|
||||
|
||||
/* copy to our structure and convert start sector */
|
||||
- tracks = d->private->sg_buffer[1];
|
||||
+ tracks = d->private_data->sg_buffer[1];
|
||||
if (tracks > MAXTRK) {
|
||||
cderror(d,"003: CDROM reporting illegal number of tracks\n");
|
||||
return(-3);
|
||||
@@ -754,33 +754,33 @@
|
||||
return(-5);
|
||||
}
|
||||
|
||||
- d->disc_toc[i].bFlags = d->private->sg_buffer[10];
|
||||
+ d->disc_toc[i].bFlags = d->private_data->sg_buffer[10];
|
||||
d->disc_toc[i].bTrack = i + 1;
|
||||
|
||||
d->disc_toc[i].dwStartSector= d->adjust_ssize *
|
||||
- (((signed char)(d->private->sg_buffer[2])<<24) |
|
||||
- (d->private->sg_buffer[3]<<16)|
|
||||
- (d->private->sg_buffer[4]<<8)|
|
||||
- (d->private->sg_buffer[5]));
|
||||
+ (((signed char)(d->private_data->sg_buffer[2])<<24) |
|
||||
+ (d->private_data->sg_buffer[3]<<16)|
|
||||
+ (d->private_data->sg_buffer[4]<<8)|
|
||||
+ (d->private_data->sg_buffer[5]));
|
||||
}
|
||||
|
||||
d->disc_toc[i].bFlags = 0;
|
||||
d->disc_toc[i].bTrack = i + 1;
|
||||
- memcpy (&foo, d->private->sg_buffer+2, 4);
|
||||
- memcpy (&bar, d->private->sg_buffer+6, 4);
|
||||
+ memcpy (&foo, d->private_data->sg_buffer+2, 4);
|
||||
+ memcpy (&bar, d->private_data->sg_buffer+6, 4);
|
||||
d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) +
|
||||
be32_to_cpu(bar));
|
||||
|
||||
d->disc_toc[i].dwStartSector= d->adjust_ssize *
|
||||
- ((((signed char)(d->private->sg_buffer[2])<<24) |
|
||||
- (d->private->sg_buffer[3]<<16)|
|
||||
- (d->private->sg_buffer[4]<<8)|
|
||||
- (d->private->sg_buffer[5]))+
|
||||
+ ((((signed char)(d->private_data->sg_buffer[2])<<24) |
|
||||
+ (d->private_data->sg_buffer[3]<<16)|
|
||||
+ (d->private_data->sg_buffer[4]<<8)|
|
||||
+ (d->private_data->sg_buffer[5]))+
|
||||
|
||||
- ((((signed char)(d->private->sg_buffer[6])<<24) |
|
||||
- (d->private->sg_buffer[7]<<16)|
|
||||
- (d->private->sg_buffer[8]<<8)|
|
||||
- (d->private->sg_buffer[9]))));
|
||||
+ ((((signed char)(d->private_data->sg_buffer[6])<<24) |
|
||||
+ (d->private_data->sg_buffer[7]<<16)|
|
||||
+ (d->private_data->sg_buffer[8]<<8)|
|
||||
+ (d->private_data->sg_buffer[9]))));
|
||||
|
||||
|
||||
d->cd_extra = FixupTOC(d,tracks+1);
|
||||
@@ -817,7 +817,7 @@
|
||||
cmd[8] = sectors;
|
||||
if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
|
||||
return(ret);
|
||||
- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -836,7 +836,7 @@
|
||||
cmd[9] = sectors;
|
||||
if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
|
||||
return(ret);
|
||||
- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -854,7 +854,7 @@
|
||||
cmd[8] = sectors;
|
||||
if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
|
||||
return(ret);
|
||||
- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -872,7 +872,7 @@
|
||||
cmd[9] = sectors;
|
||||
if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
|
||||
return(ret);
|
||||
- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -890,7 +890,7 @@
|
||||
cmd[8] = sectors;
|
||||
if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
|
||||
return(ret);
|
||||
- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -908,7 +908,7 @@
|
||||
cmd[9] = sectors;
|
||||
if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
|
||||
return(ret);
|
||||
- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -922,7 +922,7 @@
|
||||
cmd[8] = sectors;
|
||||
if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
|
||||
return(ret);
|
||||
- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -936,7 +936,7 @@
|
||||
cmd[8] = sectors;
|
||||
if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
|
||||
return(ret);
|
||||
- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -950,7 +950,7 @@
|
||||
cmd[8] = sectors;
|
||||
if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
|
||||
return(ret);
|
||||
- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -964,7 +964,7 @@
|
||||
cmd[8] = sectors;
|
||||
if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
|
||||
return(ret);
|
||||
- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -978,7 +978,7 @@
|
||||
cmd[8] = sectors;
|
||||
if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
|
||||
return(ret);
|
||||
- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -992,7 +992,7 @@
|
||||
cmd[8] = sectors;
|
||||
if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
|
||||
return(ret);
|
||||
- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -1026,7 +1026,7 @@
|
||||
|
||||
if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
|
||||
return(ret);
|
||||
- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -1039,7 +1039,7 @@
|
||||
|
||||
if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
|
||||
return(ret);
|
||||
- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -1052,7 +1052,7 @@
|
||||
|
||||
if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
|
||||
return(ret);
|
||||
- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -1275,7 +1275,7 @@
|
||||
static int count_2352_bytes(cdrom_drive *d){
|
||||
long i;
|
||||
for(i=2351;i>=0;i--)
|
||||
- if(d->private->sg_buffer[i]!=(unsigned char)'\177')
|
||||
+ if(d->private_data->sg_buffer[i]!=(unsigned char)'\177')
|
||||
return(((i+3)>>2)<<2);
|
||||
|
||||
return(0);
|
||||
@@ -1284,7 +1284,7 @@
|
||||
static int verify_nonzero(cdrom_drive *d){
|
||||
long i,flag=0;
|
||||
for(i=0;i<2352;i++)
|
||||
- if(d->private->sg_buffer[i]!=0){
|
||||
+ if(d->private_data->sg_buffer[i]!=0){
|
||||
flag=1;
|
||||
break;
|
||||
}
|
||||
@@ -1625,7 +1625,7 @@
|
||||
d->is_mmc=0;
|
||||
if(mode_sense(d,22,0x2A)==0){
|
||||
|
||||
- b=d->private->sg_buffer;
|
||||
+ b=d->private_data->sg_buffer;
|
||||
b+=b[3]+4;
|
||||
|
||||
if((b[0]&0x3F)==0x2A){
|
||||
@@ -1673,7 +1673,7 @@
|
||||
cderror(d,"008: Unable to identify CDROM model\n");
|
||||
return(NULL);
|
||||
}
|
||||
- return (d->private->sg_buffer);
|
||||
+ return (d->private_data->sg_buffer);
|
||||
}
|
||||
|
||||
int scsi_init_drive(cdrom_drive *d){
|
||||
@@ -1742,8 +1742,8 @@
|
||||
check_cache(d);
|
||||
|
||||
d->error_retry=1;
|
||||
- d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
|
||||
- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
|
||||
+ d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
|
||||
+ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
|
||||
d->report_all=1;
|
||||
return(0);
|
||||
}
|
||||
--- cdparanoia-III-10.2/interface/test_interface.c
|
||||
+++ cdparanoia-III-10.2/interface/test_interface.c
|
||||
@@ -66,9 +66,9 @@
|
||||
if(!fd)fd=fdopen(d->cdda_fd,"r");
|
||||
|
||||
if(begin<lastread)
|
||||
- d->private->last_milliseconds=20;
|
||||
+ d->private_data->last_milliseconds=20;
|
||||
else
|
||||
- d->private->last_milliseconds=sectors;
|
||||
+ d->private_data->last_milliseconds=sectors;
|
||||
|
||||
#ifdef CDDA_TEST_UNDERRUN
|
||||
sectors-=1;
|
22
cdparanoia-III-06-endian.dpatch
Normal file
22
cdparanoia-III-06-endian.dpatch
Normal file
@ -0,0 +1,22 @@
|
||||
#!/bin/sh /usr/share/dpatch/dpatch-run
|
||||
## 06-endian.dpatch by Monty <paranoia@xiph.org>
|
||||
##
|
||||
## DP: Changeset 15356: Fix a really stupid oversight that should have been
|
||||
## DP: tested: forcing a drive/host endian mismatch within the interface lib.
|
||||
## DP: Doesn't check for null buff before trying a byteswap
|
||||
## DP: (Closes: #499716, #506337, #507795, #509762).
|
||||
|
||||
@DPATCH@
|
||||
|
||||
================================================================================
|
||||
--- cdparanoia-III-10.2/interface/interface.c
|
||||
+++ cdparanoia-III-10.2/interface/interface.c
|
||||
@@ -118,7 +118,7 @@
|
||||
if(d->bigendianp==-1) /* not determined yet */
|
||||
d->bigendianp=data_bigendianp(d);
|
||||
|
||||
- if(d->bigendianp!=bigendianp()){
|
||||
+ if(buffer && d->bigendianp!=bigendianp()){
|
||||
int i;
|
||||
u_int16_t *p=(u_int16_t *)buffer;
|
||||
long els=sectors*CD_FRAMESIZE_RAW/2;
|
3
cdparanoia-III-10.2.src.tar.bz2
Normal file
3
cdparanoia-III-10.2.src.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:53f4fa86a943a5d76c37bb9b8e23119953d19e222a4514d3ecdf4b53756d91e3
|
||||
size 153952
|
@ -1,27 +0,0 @@
|
||||
--- configure.in
|
||||
+++ configure.in
|
||||
@@ -12,24 +12,8 @@
|
||||
AC_CHECK_PROG(AR,ar,ar)
|
||||
AC_CHECK_PROG(INSTALL,install,install)
|
||||
|
||||
-if test -z "$GCC"; then
|
||||
- DEBUG="-g"
|
||||
- OPT="-O"
|
||||
-else
|
||||
- case $host in
|
||||
- i?86-*-linux*)
|
||||
- DEBUG="-g -Wall -fsigned-char"
|
||||
- OPT="-O20 -ffast-math -fsigned-char -finline-functions";;
|
||||
- *)
|
||||
- DEBUG="-g -Wall -fsigned-char"
|
||||
- OPT="-O20 -fsigned-char";;
|
||||
- esac
|
||||
-fi
|
||||
-
|
||||
AC_HEADER_STDC
|
||||
|
||||
-CFLAGS=""
|
||||
-
|
||||
TYPESIZES=""
|
||||
|
||||
AC_CHECK_SIZEOF(short)
|
@ -1,38 +0,0 @@
|
||||
--- interface/scsi_interface.c
|
||||
+++ interface/scsi_interface.c
|
||||
@@ -586,7 +586,7 @@
|
||||
unsigned char *mode;
|
||||
|
||||
((struct sg_info *)d->sg)->setup_scsi_cmd(d, SCSI_MODE_SELECT_10, 10, 16, 0);
|
||||
- memcpy(((struct sg_info *)d->sg)->dxferp,(char []) {
|
||||
+ memcpy(((struct sg_info *)d->sg)->dxferp,((char []) {
|
||||
/* mode parameter header */
|
||||
0, 0, 0, 0, 0, 0, 0,
|
||||
8, /* Block Descriptor Length */
|
||||
@@ -594,7 +594,7 @@
|
||||
0, /* Density Code */
|
||||
0, 0, 0, /* # of Blocks */
|
||||
0, /* reserved */
|
||||
- 0, 0, 0},/* Blocklen */
|
||||
+ 0, 0, 0}),/* Blocklen */
|
||||
16);
|
||||
|
||||
mode = ((struct sg_info *)d->sg)->dxferp;
|
||||
@@ -614,7 +614,7 @@
|
||||
unsigned char *mode;
|
||||
|
||||
((struct sg_info *)d->sg)->setup_scsi_cmd(d, SCSI_MODE_SELECT_6, 6, 12, 0);
|
||||
- memcpy(((struct sg_info *)d->sg)->dxferp,(char []) {
|
||||
+ memcpy(((struct sg_info *)d->sg)->dxferp,((char []) {
|
||||
/* mode section */
|
||||
0,
|
||||
0, 0,
|
||||
@@ -622,7 +622,7 @@
|
||||
0, /* Density Code */
|
||||
0, 0, 0, /* # of Blocks */
|
||||
0, /* reserved */
|
||||
- 0, 0, 0},/* Blocklen */
|
||||
+ 0, 0, 0}),/* Blocklen */
|
||||
12);
|
||||
|
||||
/* prepare to read cds in the previous mode */
|
@ -1,34 +0,0 @@
|
||||
--- cdparanoia-III-alpha9.8/interface/utils.h
|
||||
+++ cdparanoia-III-alpha9.8/interface/utils.h
|
||||
@@ -112,6 +112,7 @@
|
||||
break;
|
||||
case CDDA_MESSAGE_FORGETIT:
|
||||
default:
|
||||
+ break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -127,6 +128,7 @@
|
||||
break;
|
||||
case CDDA_MESSAGE_FORGETIT:
|
||||
default:
|
||||
+ break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -169,6 +171,7 @@
|
||||
break;
|
||||
case CDDA_MESSAGE_FORGETIT:
|
||||
default:
|
||||
+ break;
|
||||
}
|
||||
}
|
||||
if(malloced)free(buffer);
|
||||
@@ -205,6 +208,7 @@
|
||||
break;
|
||||
case CDDA_MESSAGE_FORGETIT:
|
||||
default:
|
||||
+ break;
|
||||
}
|
||||
}
|
||||
if(malloced)free(buffer);
|
File diff suppressed because it is too large
Load Diff
@ -1,11 +0,0 @@
|
||||
--- cdparanoia-III-alpha9.8/interface/scan_devices.c
|
||||
+++ cdparanoia-III-alpha9.8/interface/scan_devices.c
|
||||
@@ -617,7 +617,7 @@
|
||||
|
||||
/* It would seem some TOSHIBA CDROMs gets things wrong */
|
||||
|
||||
- if (!strncmp (p + 8, "TOSHIBA", 7) &&
|
||||
+ if (p && !strncmp (p + 8, "TOSHIBA", 7) &&
|
||||
!strncmp (p + 16, "CD-ROM", 6) &&
|
||||
p[0] == TYPE_DISK) {
|
||||
p[0] = TYPE_ROM;
|
@ -1,10 +0,0 @@
|
||||
--- Makefile.in
|
||||
+++ Makefile.in
|
||||
@@ -44,7 +44,6 @@
|
||||
cd interface && $(MAKE) all
|
||||
cd paranoia && $(MAKE) all
|
||||
$(MAKE) cdparanoia CFLAGS="$(OPT)"
|
||||
- strip cdparanoia
|
||||
|
||||
debug:
|
||||
cd interface && $(MAKE) debug
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1b79fae1aedc692f87d1344410f5c6b666961afccdc78bc5c4c257c450dfa008
|
||||
size 116591
|
23
cdparanoia-III-c++.patch
Normal file
23
cdparanoia-III-c++.patch
Normal file
@ -0,0 +1,23 @@
|
||||
--- utils.h
|
||||
+++ utils.h
|
||||
@@ -86,7 +86,7 @@
|
||||
|
||||
static inline char *copystring(const char *s){
|
||||
if(s){
|
||||
- char *ret=malloc((strlen(s)+1)*sizeof(char));
|
||||
+ char *ret=(char *)malloc((strlen(s)+1)*sizeof(char));
|
||||
strcpy(ret,s);
|
||||
return(ret);
|
||||
}
|
||||
@@ -96,9 +96,9 @@
|
||||
static inline char *catstring(char *buff,const char *s){
|
||||
if(s){
|
||||
if(buff)
|
||||
- buff=realloc(buff,strlen(buff)+strlen(s)+1);
|
||||
+ buff=(char *)realloc(buff,strlen(buff)+strlen(s)+1);
|
||||
else
|
||||
- buff=calloc(strlen(s)+1,1);
|
||||
+ buff=(char *)calloc(strlen(s)+1,1);
|
||||
strcat(buff,s);
|
||||
}
|
||||
return(buff);
|
@ -13,7 +13,7 @@
|
||||
$(RANLIB) libcdda_paranoia.a
|
||||
|
||||
libcdda_paranoia.so: $(OFILES)
|
||||
- $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES)
|
||||
- $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
|
||||
+ $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) $(LIBS)
|
||||
[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
|
||||
[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
|
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 26 16:27:00 CET 2009 - nadvornik@suse.cz
|
||||
|
||||
- updated to III-10.2
|
||||
* many patches merged upstream
|
||||
- adapted according to shared library policy
|
||||
* new subpackage libcdda_interface0
|
||||
* new subpackage libcdda_paranoia0
|
||||
* new subpackage cdparanoia-devel
|
||||
- added debian patches
|
||||
cdparanoia-III-01-typos-and-spelling.dpatch
|
||||
cdparanoia-III-05-gcc4.3.dpatch
|
||||
cdparanoia-III-06-endian.dpatch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 10 12:34:56 CET 2008 - olh@suse.de
|
||||
|
||||
|
139
cdparanoia.spec
139
cdparanoia.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package cdparanoia (Version IIIalpha9.8)
|
||||
# spec file for package cdparanoia (Version 3.10.2)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -29,23 +29,40 @@ AutoReqProv: on
|
||||
Obsoletes: cdparanoia-64bit
|
||||
%endif
|
||||
#
|
||||
Version: IIIalpha9.8
|
||||
Release: 691
|
||||
Version: 3.10.2
|
||||
Release: 1
|
||||
Summary: A Program for Extracting, Verifying, and Fixing Audio Tracks from CDs
|
||||
Url: http://www.xiph.org/paranoia/index.html
|
||||
%define filever III-alpha9.8
|
||||
Source: http://www.xiph.org/paranoia/download/cdparanoia-%{filever}.src.tgz
|
||||
Patch: cdparanoia-III-alpha9.7.dif
|
||||
Patch2: cdparanoia-III-alpha9.8-solve-crash.patch
|
||||
#Patch3:
|
||||
Patch4: cdparanoia-III-alpha9.8-gcc34.patch
|
||||
Patch5: cdparanoia-III-alpha9.8-ide_majors.patch
|
||||
Patch6: cdparanoia-III-alpha9.8-strip.patch
|
||||
Patch7: cdparanoia-III-alpha9.8-dt_needed.patch
|
||||
Patch8: cdparanoia-III-alpha9.8-sgio.patch
|
||||
Patch9: cdparanoia-III-alpha9.8-gcc34-2.patch
|
||||
%define filever III-10.2
|
||||
Source: cdparanoia-%{filever}.src.tar.bz2
|
||||
Patch1: cdparanoia-III-ide_majors.patch
|
||||
Patch2: cdparanoia-III-dt_needed.patch
|
||||
Patch3: cdparanoia-III-c++.patch
|
||||
Patch10: cdparanoia-III-01-typos-and-spelling.dpatch
|
||||
Patch11: cdparanoia-III-05-gcc4.3.dpatch
|
||||
Patch12: cdparanoia-III-06-endian.dpatch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%package -n libcdda_interface0
|
||||
License: GPL v2 or later
|
||||
Summary: Extracting, Verifying, and Fixing Audio Tracks from CDs - runtime library
|
||||
Group: System/Libraries
|
||||
Suggests: ImageMagick-extra = %{version}
|
||||
AutoReqProv: on
|
||||
|
||||
%package -n libcdda_paranoia0
|
||||
License: GPL v2 or later
|
||||
Summary: Extracting, Verifying, and Fixing Audio Tracks from CDs - runtime library
|
||||
Group: System/Libraries
|
||||
AutoReqProv: on
|
||||
|
||||
%package devel
|
||||
License: GPL v2 or later
|
||||
Requires: cdparanoia = %{version}
|
||||
Summary: Include Files and Libraries Mandatory for Development
|
||||
Group: Development/Libraries/C and C++
|
||||
AutoReqProv: on
|
||||
|
||||
%description
|
||||
This CDDA reader distribution ('cdparanoia') reads audio from the
|
||||
CD-ROM directly as data and writes the data to a file or pipe as .wav,
|
||||
@ -55,21 +72,57 @@ This is a beta release. See http://www.xiph.org/paranoia/.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Monty <xiphmont@mit.edu>
|
||||
|
||||
%description devel
|
||||
This CDDA reader distribution ('cdparanoia') reads audio from the
|
||||
CD-ROM directly as data and writes the data to a file or pipe as .wav,
|
||||
.aifc, or raw 16-bit linear PCM.
|
||||
|
||||
This is a beta release. See http://www.xiph.org/paranoia/.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Monty <xiphmont@mit.edu>
|
||||
|
||||
%description -n libcdda_interface0
|
||||
This CDDA reader distribution ('cdparanoia') reads audio from the
|
||||
CD-ROM directly as data and writes the data to a file or pipe as .wav,
|
||||
.aifc, or raw 16-bit linear PCM.
|
||||
|
||||
This is a beta release. See http://www.xiph.org/paranoia/.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Monty <xiphmont@mit.edu>
|
||||
|
||||
%description -n libcdda_paranoia0
|
||||
This CDDA reader distribution ('cdparanoia') reads audio from the
|
||||
CD-ROM directly as data and writes the data to a file or pipe as .wav,
|
||||
.aifc, or raw 16-bit linear PCM.
|
||||
|
||||
This is a beta release. See http://www.xiph.org/paranoia/.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Monty <xiphmont@mit.edu>
|
||||
|
||||
%prep
|
||||
%setup -q -n cdparanoia-%{filever}
|
||||
%patch
|
||||
%patch2 -p 1
|
||||
#%patch3 -p 1
|
||||
%patch4 -p 1
|
||||
%patch5
|
||||
%patch6
|
||||
%patch7
|
||||
%patch8 -p 1
|
||||
%patch9
|
||||
%patch1
|
||||
#%patch2
|
||||
%patch3
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
|
||||
%build
|
||||
cp configure.guess config.guess
|
||||
@ -100,22 +153,48 @@ rm $RPM_BUILD_ROOT/%_libdir/libcdda_paranoia.a
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
%run_ldconfig
|
||||
%post -n libcdda_interface0 -p /sbin/ldconfig
|
||||
|
||||
%postun
|
||||
%run_ldconfig
|
||||
%postun -n libcdda_interface0 -p /sbin/ldconfig
|
||||
|
||||
%post -n libcdda_paranoia0 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libcdda_paranoia0 -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README FAQ.txt
|
||||
%doc README COPYING*
|
||||
%{_mandir}/man1/*
|
||||
%{_mandir}/ja/man1/*
|
||||
/usr/bin/*
|
||||
|
||||
%files -n libcdda_interface0
|
||||
%defattr(-,root,root)
|
||||
%_libdir/libcdda_interface.so.0
|
||||
%_libdir/libcdda_interface.so.0.*
|
||||
|
||||
%files -n libcdda_paranoia0
|
||||
%defattr(-,root,root)
|
||||
%_libdir/libcdda_paranoia.so.0
|
||||
%_libdir/libcdda_paranoia.so.0.*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
/usr/include/*
|
||||
%_libdir/lib*.so*
|
||||
%_libdir/lib*.so
|
||||
|
||||
%changelog
|
||||
* Thu Feb 26 2009 nadvornik@suse.cz
|
||||
- updated to III-10.2
|
||||
* many patches merged upstream
|
||||
- adapted according to shared library policy
|
||||
* new subpackage libcdda_interface0
|
||||
* new subpackage libcdda_paranoia0
|
||||
* new subpackage cdparanoia-devel
|
||||
- added debian patches
|
||||
cdparanoia-III-01-typos-and-spelling.dpatch
|
||||
cdparanoia-III-05-gcc4.3.dpatch
|
||||
cdparanoia-III-06-endian.dpatch
|
||||
* Wed Dec 10 2008 olh@suse.de
|
||||
- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade
|
||||
(bnc#437293)
|
||||
|
Loading…
Reference in New Issue
Block a user