1 diff -urN cdrecord-1.8/cdrecord/cdrecord.1 cdrecord-1.8.new/cdrecord/cdrecord.1
2 --- cdrecord-1.8/cdrecord/cdrecord.1 Wed Dec 29 00:34:41 1999
3 +++ cdrecord-1.8.new/cdrecord/cdrecord.1 Sat Feb 19 13:16:43 2000
8 -If a file /etc/default/cdrecord exists, the parameter to the
9 +If a file /etc/cdrecord.conf exists, the parameter to the
11 option may also be a drive name label in said file (see FILES section).
15 option does not contain the characters ',', '/', '@' or ':',
16 it is interpreted as an label name that may be found in the file
17 -/etc/default/cdrecord (see FILES section).
18 +/etc/cdrecord.conf (see FILES section).
21 Set the default SCSI command timeout value to
25 This may either hold a device identifier that is suitable to the open
26 -call of the SCSI transport library or a label in the file /etc/default/cdrecord.
27 +call of the SCSI transport library or a label in the file /etc/cdrecord.conf.
30 Sets the default speed value for writing (see also
35 -/etc/default/cdrecord
36 -Default values can be set for the following options in /etc/default/cdrecord.
38 +Default values can be set for the following options in /etc/cdrecord.conf
45 This may either hold a device identifier that is suitable to the open
46 -call of the SCSI transport library or a label in the file /etc/default/cdrecord
47 +call of the SCSI transport library or a label in the file /etc/cdrecord.conf
48 that allows to identify a specific drive on the system.
51 diff -urN cdrecord-1.8/cdrecord/cdrecord.dfl cdrecord-1.8.new/cdrecord/cdrecord.dfl
52 --- cdrecord-1.8/cdrecord/cdrecord.dfl Sun Dec 6 12:24:01 1998
53 +++ cdrecord-1.8.new/cdrecord/cdrecord.dfl Sat Feb 19 13:16:43 2000
55 #ident @(#)cdrecord.dfl 1.1 98/12/06 Copyr 1998 J. Schilling
57 -# This file is /etc/default/cdrecord
58 +# This file is /etc/cdrecord.conf
59 # It contains defaults that are used if no command line option
60 # or environment is present.
64 # drive name device speed fifosize
67 -panasonic= 1,4,0 -1 -1
71 +#panasonic= 1,4,0 -1 -1
74 diff -urN cdrecord-1.8/cdrecord/defaults.c cdrecord-1.8.new/cdrecord/defaults.c
75 --- cdrecord-1.8/cdrecord/defaults.c Thu Jan 13 01:11:46 2000
76 +++ cdrecord-1.8.new/cdrecord/defaults.c Sat Feb 19 13:19:21 2000
81 +#define DEFAULT_CONFIG "/etc/cdrecord.conf"
83 EXPORT void cdr_defaults __PR((char **devp, int *speedp, long *fsp));
84 LOCAL void cdr_xdefaults __PR((char **devp, int *speedp, long *fsp));
85 LOCAL char * strsv __PR((char* s));
88 *devp = getenv("CDR_DEVICE");
90 - if (!*devp && defltopen("/etc/default/cdrecord") == 0) {
91 + if (!*devp && defltopen(DEFAULT_CONFIG) == 0) {
92 dev = defltread("CDR_DEVICE=");
96 char *p = getenv("CDR_SPEED");
99 - if (defltopen("/etc/default/cdrecord") == 0) {
100 + if (defltopen(DEFAULT_CONFIG) == 0) {
101 p = defltread("CDR_SPEED=");
105 char *p = getenv("CDR_FIFOSIZE");
108 - if (defltopen("/etc/default/cdrecord") == 0) {
109 + if (defltopen(DEFAULT_CONFIG) == 0) {
110 p = defltread("CDR_FIFOSIZE=");
116 sprintf(dname, "%s=", p);
117 - if (defltopen("/etc/default/cdrecord") != 0)
118 + if (defltopen(DEFAULT_CONFIG) != 0)
121 p = defltread(dname);
122 diff -urN cdrecord-1.8/doc/cdrecord.man cdrecord-1.8.new/doc/cdrecord.man
123 --- cdrecord-1.8/doc/cdrecord.man Wed Dec 29 14:50:11 1999
124 +++ cdrecord-1.8.new/doc/cdrecord.man Sat Feb 19 13:18:30 2000
126 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.
129 - If a file /etc/default/cdrecord exists, the parameter to the
130 + If a file /etc/cdrecord.conf exists, the parameter to the
131 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
135 If the argument to the d
\bd
\bd
\bde
\be
\be
\bev
\bv
\bv
\bv=
\b=
\b=
\b= option does not contain the
136 characters ',', '/', '@' or ':', it is interpreted as
137 an label name that may be found in the file
138 - /etc/default/cdrecord (see FILES section).
139 + /etc/cdrecord.conf (see FILES section).
141 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=#
142 Set the default SCSI command timeout value to #. The
145 This may either hold a device identifier that is suit-
146 able to the open call of the SCSI transport library or
147 - a label in the file /etc/default/cdrecord.
148 + a label in the file /etc/cdrecord.conf.
152 @@ -873,16 +873,16 @@
155 F
\bF
\bF
\bFI
\bI
\bI
\bIL
\bL
\bL
\bLE
\bE
\bE
\bES
\bS
\bS
\bS
156 - /etc/default/cdrecord
158 Default values can be set for the following options in
159 - /etc/default/cdrecord. For example: CDR_FIFOSIZE=8m
160 + /etc/cdrecord.conf. For example: CDR_FIFOSIZE=8m
164 This may either hold a device identifier that is
165 suitable to the open call of the SCSI transport
166 library or a label in the file
167 - /etc/default/cdrecord that allows to identify a
168 + /etc/cdrecord.conf that allows to identify a
169 specific drive on the system.
172 diff -urN cdrecord-1.8/include/deflts.h cdrecord-1.8.new/include/deflts.h
173 --- cdrecord-1.8/include/deflts.h Sat Dec 5 14:04:18 1998
174 +++ cdrecord-1.8.new/include/deflts.h Sat Feb 19 13:16:43 2000
179 -#define DEFLT "/etc/default"
180 +#define DEFLT "/etc"
183 * cmd's to defltcntl()