-diff -urN cdrtools-1.10.org/cdrecord/cdrecord.1 cdrtools-1.10/cdrecord/cdrecord.1
---- cdrtools-1.10.org/cdrecord/cdrecord.1 Sat Apr 21 12:30:35 2001
-+++ cdrtools-1.10/cdrecord/cdrecord.1 Sat Apr 21 12:45:37 2001
+diff -urN cdrtools-1.11.orig/README.ATAPI cdrtools-1.11/README.ATAPI
+--- cdrtools-1.11.orig/README.ATAPI Sun Nov 25 12:37:30 2001
++++ cdrtools-1.11/README.ATAPI Wed Apr 24 19:56:35 2002
+@@ -406,14 +406,14 @@
+ ln -s scd1 cdrw # NOTE: see above, maybe cdrom
+ Check the new SCSI settings:
+ cdrecord -scanbus
+- Setup cdrecord's environment - edit /etc/default/cdrecord:
++ Setup cdrecord's environment - edit /etc/cdrecord.conf:
+ CDR_DEVICE=cdrw
+ cdrw=1,0,0 4 8m
+ cdrom=1,2,0 0 0m
+ Input the right values, the fields are described in the manpage
+ of cdrecord. Alternatively, you may use this values as
+ cdrecord-parameter or take a frontend with an own configuration
+- scheme, then you don't need to modify /etc/default/cdrecord.
++ scheme, then you don't need to modify /etc/cdrecord.conf
+ 9. It's done! Insert a CD and try "cdrecord -v -toc"
+ /*--------------------------------------------------------------------------*/
+ He had constant buffer underrun problems:
+diff -urN cdrtools-1.11.orig/README.linux cdrtools-1.11/README.linux
+--- cdrtools-1.11.orig/README.linux Sun Apr 1 12:08:41 2001
++++ cdrtools-1.11/README.linux Wed Apr 24 19:56:06 2002
+@@ -169,7 +169,7 @@
+ If dev=0,0,0 does not work but -dev=0,0,0 works you found this
+ incompatibility. This problem is caused by an incompatibility
+ in ctype.h and it seems that there are other compatibility problems
+- e.g. with reading /etc/default/cdrecord.
++ e.g. with reading /etc/cdrecord.conf
+
+ You cannot copy binaries between different Linux versions,
+ always compile the sources by yourself.
+diff -urN cdrtools-1.11.orig/README.openserver cdrtools-1.11/README.openserver
+--- cdrtools-1.11.orig/README.openserver Tue Jan 25 17:37:48 2000
++++ cdrtools-1.11/README.openserver Wed Apr 24 19:56:49 2002
+@@ -55,7 +55,7 @@
+ ===================================================================
+ THE OLD ADDRESSING IS NO LONGER AVAILABLE!
+
+- PLEASE ADJUST YOUR /etc/default/cdrecord FILES!
++ PLEASE ADJUST YOUR /etc/cdrecord.conf FILES!
+ ===================================================================
+
+ Running cdrecord with the old address method will result in an error!
+diff -urN cdrtools-1.11.orig/README.unixware cdrtools-1.11/README.unixware
+--- cdrtools-1.11.orig/README.unixware Sun Mar 4 00:41:43 2001
++++ cdrtools-1.11/README.unixware Wed Apr 24 19:57:01 2002
+@@ -64,7 +64,7 @@
+ ===================================================================
+ THE OLD ADDRESSING IS NO LONGER AVAILABLE!
+
+- PLEASE ADJUST YOUR /etc/default/cdrecord FILES!
++ PLEASE ADJUST YOUR /etc/cdrecord.conf FILES!
+ ===================================================================
+
+ Running cdrecord with the old address method will result in an error!
+diff -urN cdrtools-1.11.orig/cdrecord/cdrecord.1 cdrtools-1.11/cdrecord/cdrecord.1
+--- cdrtools-1.11.orig/cdrecord/cdrecord.1 Sat Feb 23 21:21:12 2002
++++ cdrtools-1.11/cdrecord/cdrecord.1 Wed Apr 24 19:59:30 2002
@@ -134,7 +134,7 @@
described below.
.B dev=
option may also be a drive name label in said file (see FILES section).
-@@ -474,7 +474,7 @@
+@@ -522,7 +522,7 @@
.B dev=
option does not contain the characters ',', '/', '@' or ':',
it is interpreted as an label name that may be found in the file
.TP
.BI timeout= #
Set the default SCSI command timeout value to
-@@ -997,7 +997,7 @@
+@@ -1145,7 +1145,7 @@
.TP
CDR_DEVICE
This may either hold a device identifier that is suitable to the open
-call of the SCSI transport library or a label in the file /etc/default/cdrecord.
-+call of the SCSI transport library or a label in the file /etc/cdrecord.conf.
++call of the SCSI transport library or a label in the file /etc/cdrecord.conf
.TP
CDR_SPEED
Sets the default speed value for writing (see also
-@@ -1011,8 +1011,8 @@
+@@ -1159,8 +1159,8 @@
.SH FILES
.TP
For example:
.SM CDR_FIFOSIZE=8m
or
-@@ -1021,7 +1021,7 @@
+@@ -1169,7 +1169,7 @@
.TP
CDR_DEVICE
This may either hold a device identifier that is suitable to the open
that allows to identify a specific drive on the system.
.TP
CDR_SPEED
-diff -urN cdrtools-1.10.org/cdrecord/cdrecord.dfl cdrtools-1.10/cdrecord/cdrecord.dfl
---- cdrtools-1.10.org/cdrecord/cdrecord.dfl Sat Apr 21 12:30:35 2001
-+++ cdrtools-1.10/cdrecord/cdrecord.dfl Sat Apr 21 12:45:37 2001
+diff -urN cdrtools-1.11.orig/cdrecord/cdrecord.dfl cdrtools-1.11/cdrecord/cdrecord.dfl
+--- cdrtools-1.11.orig/cdrecord/cdrecord.dfl Fri Jun 1 06:55:12 2001
++++ cdrtools-1.11/cdrecord/cdrecord.dfl Wed Apr 24 20:00:44 2002
@@ -1,6 +1,6 @@
- #ident @(#)cdrecord.dfl 1.2 00/04/16 Copyr 1998 J. Schilling
+ #ident @(#)cdrecord.dfl 1.3 01/06/01 Copyr 1998 J. Schilling
#
-# This file is /etc/default/cdrecord
+# This file is /etc/cdrecord.conf
# It contains defaults that are used if no command line option
# or environment is present.
#
-diff -urN cdrtools-1.10.org/cdrecord/defaults.c cdrtools-1.10/cdrecord/defaults.c
---- cdrtools-1.10.org/cdrecord/defaults.c Sat Apr 21 12:30:35 2001
-+++ cdrtools-1.10/cdrecord/defaults.c Sat Apr 21 12:45:37 2001
-@@ -33,6 +33,8 @@
- #include <schily.h>
- #include "cdrecord.h"
-
-+#define DEFAULT_CONFIG "/etc/cdrecord.conf"
-+
- EXPORT void cdr_defaults __PR((char **devp, int *speedp, long *fsp));
- LOCAL void cdr_xdefaults __PR((char **devp, int *speedp, long *fsp));
- LOCAL char * strsv __PR((char* s));
-@@ -50,7 +52,7 @@
- if (!dev) {
- *devp = getenv("CDR_DEVICE");
-
-- if (!*devp && defltopen("/etc/default/cdrecord") == 0) {
-+ if (!*devp && defltopen(DEFAULT_CONFIG) == 0) {
- dev = defltread("CDR_DEVICE=");
- if (dev != NULL)
- *devp = strsv(dev);
-@@ -63,7 +65,7 @@
- char *p = getenv("CDR_SPEED");
-
- if (!p) {
-- if (defltopen("/etc/default/cdrecord") == 0) {
-+ if (defltopen(DEFAULT_CONFIG) == 0) {
- p = defltread("CDR_SPEED=");
- }
- }
-@@ -80,7 +82,7 @@
- char *p = getenv("CDR_FIFOSIZE");
-
- if (!p) {
-- if (defltopen("/etc/default/cdrecord") == 0) {
-+ if (defltopen(DEFAULT_CONFIG) == 0) {
- p = defltread("CDR_FIFOSIZE=");
- }
- }
-@@ -111,7 +113,7 @@
- x++;
- }
- js_snprintf(dname, sizeof(dname), "%s=", p);
-- if (defltopen("/etc/default/cdrecord") != 0)
-+ if (defltopen(DEFAULT_CONFIG) != 0)
- return;
-
- p = defltread(dname);
-diff -urN cdrtools-1.10.org/doc/cdrecord.man cdrtools-1.10/doc/cdrecord.man
---- cdrtools-1.10.org/doc/cdrecord.man Sat Apr 21 12:30:34 2001
-+++ cdrtools-1.10/doc/cdrecord.man Sat Apr 21 12:46:19 2001
+diff -urN cdrtools-1.11.orig/cdrecord/defaults.c cdrtools-1.11/cdrecord/defaults.c
+--- cdrtools-1.11.orig/cdrecord/defaults.c Tue Mar 5 23:34:47 2002
++++ cdrtools-1.11/cdrecord/defaults.c Wed Apr 24 19:57:27 2002
+@@ -53,7 +53,7 @@
+ * don't contribute work and don't give support, they are causing extra
+ * work for me and this way slow down the cdrecord development.
+ */
+- return (defltopen("/etc/default/cdrecord"));
++ return (defltopen("/etc/cdrecord.conf"));
+ }
+
+ EXPORT void
+diff -urN cdrtools-1.11.orig/doc/cdrecord.man cdrtools-1.11/doc/cdrecord.man
+--- cdrtools-1.11.orig/doc/cdrecord.man Tue Apr 17 00:02:12 2001
++++ cdrtools-1.11/doc/cdrecord.man Wed Apr 24 20:03:32 2002
@@ -71,7 +71,7 @@
+ /etc/cdrecord.conf
Default values can be set for the following options in
- /etc/default/cdrecord. For example: CDR_FIFOSIZE=8m
-+ /etc/cdrecord.conf. For example: CDR_FIFOSIZE=8m
++ /etc/cdrecord.conf For example: CDR_FIFOSIZE=8m
or CDR_SPEED=2
CDR_DEVICE
specific drive on the system.
CDR_SPEED
-diff -urN cdrtools-1.10.org/include/deflts.h cdrtools-1.10/include/deflts.h
---- cdrtools-1.10.org/include/deflts.h Sat Apr 21 12:30:35 2001
-+++ cdrtools-1.10/include/deflts.h Sat Apr 21 12:45:37 2001
-@@ -31,7 +31,7 @@
- extern "C" {
- #endif
-
--#define DEFLT "/etc/default"
-+#define DEFLT "/etc"
-
- /*
- * cmd's to defltcntl()
+diff -urN cdrtools-1.11.orig/doc/cdrecord.ps cdrtools-1.11/doc/cdrecord.ps
+--- cdrtools-1.11.orig/doc/cdrecord.ps Tue Apr 17 00:01:51 2001
++++ cdrtools-1.11/doc/cdrecord.ps Wed Apr 24 20:04:39 2002
+@@ -509,7 +509,7 @@
+ (cdrecord)1485 4848 w
+ 10 R f
+ (described below.)1 684 1 1900 4848 t
+-(If a \256le /etc/default/cdrecord exists, the parameter to the)8 2324 1 1080 5136 t
++(If a \256le /etc/cdrecord.conf exists, the parameter to the)8 2324 1 1080 5136 t
+ 10 B f
+ (dev=)3440 5136 w
+ 10 R f
+@@ -1135,7 +1135,7 @@
+ (@)4556 4728 w
+ 10 R f
+ ( it is inter-)3 447(' or ':',)2 305 2 4648 4728 t
+-(preted as an label name that may be found in the \256le /etc/default/cdrecord \(see FILES section\).)15 3901 1 1440 4848 t
++(preted as an label name that may be found in the \256le /etc/cdrecord.conf \(see FILES section\).)15 3901 1 1440 4848 t
+ 10 B f
+ (timeout=)1080 5016 w
+ 10 S1 f
+@@ -2205,7 +2205,7 @@
+ 10 R f
+ (DEVICE)1336 3840 w
+ ( call of the SCSI transport)5 1126(This may either hold a device identi\256er that is suitable to the open)12 2834 2 1440 3960 t
+-(library or a label in the \256le /etc/default/cdrecord.)7 1996 1 1440 4080 t
++(library or a label in the \256le /etc/cdrecord.conf)7 1996 1 1440 4080 t
+ (CDR)1080 4248 w
+ 10 S f
+ (_)1286 4248 w
+@@ -2233,8 +2233,8 @@
+ 9 B f
+ (FILES)720 4944 w
+ 10 R f
+-(/etc/default/cdrecord)1080 5064 w
+-( example:)1 423( For)1 229( /etc/default/cdrecord.)1 907(Default values can be set for the following options in)9 2401 4 1440 5184 t
++(/etc/cdrecord.conf)1080 5064 w
++( example:)1 423( For)1 229( /etc/cdrecord.conf)1 907(Default values can be set for the following options in)9 2401 4 1440 5184 t
+ 9 R f
+ (CDR)1440 5304 w
+ 9 S f
+@@ -2256,7 +2256,7 @@
+ 10 R f
+ (DEVICE)1696 5472 w
+ ( is suitable to the open call of the SCSI)9 1729(This may either hold a device identi\256er that)7 1871 2 1800 5592 t
+-( identify a)2 455(transport library or a label in the \256le /etc/default/cdrecord that allows to)11 3145 2 1800 5712 t
++( identify a)2 455(transport library or a label in the \256le /etc/cdrecord.conf that allows to)11 3145 2 1800 5712 t
+ (speci\256c drive on the system.)4 1167 1 1800 5832 t
+ (CDR)1440 6000 w
+ 10 S f
+diff -urN cdrtools-1.11.orig/doc/readcd.man cdrtools-1.11/doc/readcd.man
+--- cdrtools-1.11.orig/doc/readcd.man Tue Apr 17 00:02:45 2001
++++ cdrtools-1.11/doc/readcd.man Wed Apr 24 20:04:47 2002
+@@ -102,7 +102,7 @@
+ If the argument to the d\bd\bd\bde\be\be\bev\bv\bv\bv=\b=\b=\b= option does not contain the
+ characters ',', '/', '@' or ':', it is interpreted as
+ an label name that may be found in the file
+- /etc/default/cdrecord (see FILES section).
++ /etc/cdrecord.conf (see FILES section).
+
+ t\bt\bt\bti\bi\bi\bim\bm\bm\bme\be\be\beo\bo\bo\bou\bu\bu\but\bt\bt\bt=\b=\b=\b=#
+ Set the default SCSI command timeout value to #
+diff -urN cdrtools-1.11.orig/doc/readcd.ps cdrtools-1.11/doc/readcd.ps
+--- cdrtools-1.11.orig/doc/readcd.ps Tue Apr 17 00:03:09 2001
++++ cdrtools-1.11/doc/readcd.ps Wed Apr 24 20:04:58 2002
+@@ -596,7 +596,7 @@
+ (@)4556 960 w
+ 10 R f
+ ( it is inter-)3 447(' or ':',)2 305 2 4648 960 t
+-(preted as an label name that may be found in the \256le /etc/default/cdrecord \(see FILES section\).)15 3901 1 1440 1080 t
++(preted as an label name that may be found in the \256le /etc/cdrecord.conf \(see FILES section\).)15 3901 1 1440 1080 t
+ 10 B f
+ (timeout=)1080 1248 w
+ 10 S1 f
+diff -urN cdrtools-1.11.orig/doc/scgcheck.man cdrtools-1.11/doc/scgcheck.man
+--- cdrtools-1.11.orig/doc/scgcheck.man Fri Apr 13 20:16:03 2001
++++ cdrtools-1.11/doc/scgcheck.man Wed Apr 24 20:05:06 2002
+@@ -102,7 +102,7 @@
+ If the argument to the d\bd\bd\bde\be\be\bev\bv\bv\bv=\b=\b=\b= option does not contain the
+ characters ',', '/', '@' or ':', it is interpreted as
+ an label name that may be found in the file
+- /etc/default/cdrecord (see FILES section).
++ /etc/cdrecord.conf (see FILES section).
+
+ t\bt\bt\bti\bi\bi\bim\bm\bm\bme\be\be\beo\bo\bo\bou\bu\bu\but\bt\bt\bt=\b=\b=\b=#
+ Set the default SCSI command timeout value to #
+diff -urN cdrtools-1.11.orig/doc/scgcheck.ps cdrtools-1.11/doc/scgcheck.ps
+--- cdrtools-1.11.orig/doc/scgcheck.ps Fri Apr 13 20:17:07 2001
++++ cdrtools-1.11/doc/scgcheck.ps Wed Apr 24 20:05:17 2002
+@@ -585,7 +585,7 @@
+ (@)4556 1320 w
+ 10 R f
+ ( it is inter-)3 447(' or ':',)2 305 2 4648 1320 t
+-(preted as an label name that may be found in the \256le /etc/default/cdrecord \(see FILES section\).)15 3901 1 1440 1440 t
++(preted as an label name that may be found in the \256le /etc/cdrecord.conf \(see FILES section\).)15 3901 1 1440 1440 t
+ 10 B f
+ (timeout=)1080 1608 w
+ 10 S1 f
+diff -urN cdrtools-1.11.orig/readcd/readcd.1 cdrtools-1.11/readcd/readcd.1
+--- cdrtools-1.11.orig/readcd/readcd.1 Fri Jan 18 12:38:58 2002
++++ cdrtools-1.11/readcd/readcd.1 Wed Apr 24 19:57:16 2002
+@@ -175,7 +175,7 @@
+ .B dev=
+ option does not contain the characters ',', '/', '@' or ':',
+ it is interpreted as an label name that may be found in the file
+-/etc/default/cdrecord (see FILES section).
++/etc/cdrecord.conf (see FILES section).
+ .TP
+ .BI timeout= #
+ Set the default SCSI command timeout value to
+diff -urN cdrtools-1.11.orig/scgcheck/scgcheck.1 cdrtools-1.11/scgcheck/scgcheck.1
+--- cdrtools-1.11.orig/scgcheck/scgcheck.1 Mon Apr 16 23:58:25 2001
++++ cdrtools-1.11/scgcheck/scgcheck.1 Wed Apr 24 19:58:28 2002
+@@ -170,7 +170,7 @@
+ .B dev=
+ option does not contain the characters ',', '/', '@' or ':',
+ it is interpreted as an label name that may be found in the file
+-/etc/default/cdrecord (see FILES section).
++/etc/cdrecord.conf (see FILES section).
+ .TP
+ .BI timeout= #
+ Set the default SCSI command timeout value to
projects / packages / cdrtools.git / commitdiff