-diff -urN cdrecord-1.8/cdrecord/cdrecord.1 cdrecord-1.8.new/cdrecord/cdrecord.1
---- cdrecord-1.8/cdrecord/cdrecord.1 Wed Dec 29 00:34:41 1999
-+++ cdrecord-1.8.new/cdrecord/cdrecord.1 Sat Feb 19 13:16:43 2000
+diff -Naur cdrecord-1.9/cdrecord/cdrecord.1 cdrecord-1.9-p/cdrecord/cdrecord.1
+--- cdrecord-1.9/cdrecord/cdrecord.1 Thu Jul 20 19:14:40 2000
++++ cdrecord-1.9-p/cdrecord/cdrecord.1 Mon Jul 24 16:58:47 2000
@@ -118,7 +118,7 @@
described below.
.B dev=
option may also be a drive name label in said file (see FILES section).
-@@ -432,7 +432,7 @@
+@@ -446,7 +446,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
-@@ -923,7 +923,7 @@
+@@ -969,7 +969,7 @@
.TP
CDR_DEVICE
This may either hold a device identifier that is suitable to the open
.TP
CDR_SPEED
Sets the default speed value for writing (see also
-@@ -937,8 +937,8 @@
+@@ -983,8 +983,8 @@
.SH FILES
.TP
For example:
.SM CDR_FIFOSIZE=8m
or
-@@ -947,7 +947,7 @@
+@@ -993,7 +993,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 cdrecord-1.8/cdrecord/cdrecord.dfl cdrecord-1.8.new/cdrecord/cdrecord.dfl
---- cdrecord-1.8/cdrecord/cdrecord.dfl Sun Dec 6 12:24:01 1998
-+++ cdrecord-1.8.new/cdrecord/cdrecord.dfl Sat Feb 19 13:16:43 2000
+diff -Naur cdrecord-1.9/cdrecord/cdrecord.dfl cdrecord-1.9-p/cdrecord/cdrecord.dfl
+--- cdrecord-1.9/cdrecord/cdrecord.dfl Sun Apr 16 02:08:15 2000
++++ cdrecord-1.9-p/cdrecord/cdrecord.dfl Mon Jul 24 16:58:47 2000
@@ -1,6 +1,6 @@
- #ident @(#)cdrecord.dfl 1.1 98/12/06 Copyr 1998 J. Schilling
+ #ident @(#)cdrecord.dfl 1.2 00/04/16 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.
#
-@@ -25,7 +25,7 @@
- #
- # drive name device speed fifosize
- #
--teac= 1,3,0 -1 -1
--panasonic= 1,4,0 -1 -1
--yamaha= 1,5,0 -1 -1
--cdrom= 0,6,0 2 1m
-+#teac= 1,3,0 -1 -1
-+#panasonic= 1,4,0 -1 -1
-+#yamaha= 1,5,0 -1 -1
-+#cdrom= 0,6,0 2 1m
-diff -urN cdrecord-1.8/cdrecord/defaults.c cdrecord-1.8.new/cdrecord/defaults.c
---- cdrecord-1.8/cdrecord/defaults.c Thu Jan 13 01:11:46 2000
-+++ cdrecord-1.8.new/cdrecord/defaults.c Sat Feb 19 13:19:21 2000
+diff -Naur cdrecord-1.9/cdrecord/defaults.c cdrecord-1.9-p/cdrecord/defaults.c
+--- cdrecord-1.9/cdrecord/defaults.c Fri Jun 2 20:44:44 2000
++++ cdrecord-1.9-p/cdrecord/defaults.c Mon Jul 24 17:00:10 2000
@@ -32,6 +32,8 @@
- #include <utypes.h>
+ #include <schily.h>
#include "cdrecord.h"
+#define DEFAULT_CONFIG "/etc/cdrecord.conf"
@@ -110,7 +112,7 @@
x++;
}
- sprintf(dname, "%s=", p);
+ js_snprintf(dname, sizeof(dname), "%s=", p);
- if (defltopen("/etc/default/cdrecord") != 0)
+ if (defltopen(DEFAULT_CONFIG) != 0)
return;
p = defltread(dname);
-diff -urN cdrecord-1.8/doc/cdrecord.man cdrecord-1.8.new/doc/cdrecord.man
---- cdrecord-1.8/doc/cdrecord.man Wed Dec 29 14:50:11 1999
-+++ cdrecord-1.8.new/doc/cdrecord.man Sat Feb 19 13:18:30 2000
+diff -Naur cdrecord-1.9/doc/cdrecord.man cdrecord-1.9-p/doc/cdrecord.man
+--- cdrecord-1.9/doc/cdrecord.man Thu Apr 27 14:07:33 2000
++++ cdrecord-1.9-p/doc/cdrecord.man Mon Jul 24 16:58:47 2000
@@ -50,7 +50,7 @@
the -\b-\b-\b-s\bs\bs\bsc\bc\bc\bca\ba\ba\ban\bn\bn\bnb\bb\bb\bbu\bu\bu\bus\bs\bs\bs option of c\bc\bc\bcd\bd\bd\bdr\br\br\bre\be\be\bec\bc\bc\bco\bo\bo\bor\br\br\brd\bd\bd\bd described below.
d\bd\bd\bde\be\be\bev\bv\bv\bv=\b=\b=\b= option may also be a drive name label in said file (see
FILES section).
-@@ -358,7 +358,7 @@
+@@ -367,7 +367,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
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 #. The
-@@ -848,7 +848,7 @@
+@@ -888,7 +888,7 @@
CDR_DEVICE
This may either hold a device identifier that is suit-
able to the open call of the SCSI transport library or
- a label in the file /etc/default/cdrecord.
+ a label in the file /etc/cdrecord.conf.
-
-
-@@ -873,16 +873,16 @@
+ CDR_SPEED
+ Sets the default speed value for writing (see also -\b-\b-\b-
+@@ -900,16 +900,16 @@
F\bF\bF\bFI\bI\bI\bIL\bL\bL\bLE\bE\bE\bES\bS\bS\bS
specific drive on the system.
CDR_SPEED
-diff -urN cdrecord-1.8/include/deflts.h cdrecord-1.8.new/include/deflts.h
---- cdrecord-1.8/include/deflts.h Sat Dec 5 14:04:18 1998
-+++ cdrecord-1.8.new/include/deflts.h Sat Feb 19 13:16:43 2000
+diff -Naur cdrecord-1.9/include/deflts.h cdrecord-1.9-p/include/deflts.h
+--- cdrecord-1.9/include/deflts.h Sat Dec 5 14:04:18 1998
++++ cdrecord-1.9-p/include/deflts.h Mon Jul 24 16:58:47 2000
@@ -27,7 +27,7 @@
#include <mconfig.h>
#endif