1 diff -urN cdrtools-1.10.org/cdrecord/cdrecord.1 cdrtools-1.10/cdrecord/cdrecord.1
2 --- cdrtools-1.10.org/cdrecord/cdrecord.1 Sat Apr 21 12:30:35 2001
3 +++ cdrtools-1.10/cdrecord/cdrecord.1 Sat Apr 21 12:45:37 2001
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 cdrtools-1.10.org/cdrecord/cdrecord.dfl cdrtools-1.10/cdrecord/cdrecord.dfl
52 --- cdrtools-1.10.org/cdrecord/cdrecord.dfl Sat Apr 21 12:30:35 2001
53 +++ cdrtools-1.10/cdrecord/cdrecord.dfl Sat Apr 21 12:45:37 2001
55 #ident @(#)cdrecord.dfl 1.2 00/04/16 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.
62 diff -urN cdrtools-1.10.org/cdrecord/defaults.c cdrtools-1.10/cdrecord/defaults.c
63 --- cdrtools-1.10.org/cdrecord/defaults.c Sat Apr 21 12:30:35 2001
64 +++ cdrtools-1.10/cdrecord/defaults.c Sat Apr 21 12:45:37 2001
69 +#define DEFAULT_CONFIG "/etc/cdrecord.conf"
71 EXPORT void cdr_defaults __PR((char **devp, int *speedp, long *fsp));
72 LOCAL void cdr_xdefaults __PR((char **devp, int *speedp, long *fsp));
73 LOCAL char * strsv __PR((char* s));
76 *devp = getenv("CDR_DEVICE");
78 - if (!*devp && defltopen("/etc/default/cdrecord") == 0) {
79 + if (!*devp && defltopen(DEFAULT_CONFIG) == 0) {
80 dev = defltread("CDR_DEVICE=");
84 char *p = getenv("CDR_SPEED");
87 - if (defltopen("/etc/default/cdrecord") == 0) {
88 + if (defltopen(DEFAULT_CONFIG) == 0) {
89 p = defltread("CDR_SPEED=");
93 char *p = getenv("CDR_FIFOSIZE");
96 - if (defltopen("/etc/default/cdrecord") == 0) {
97 + if (defltopen(DEFAULT_CONFIG) == 0) {
98 p = defltread("CDR_FIFOSIZE=");
104 js_snprintf(dname, sizeof(dname), "%s=", p);
105 - if (defltopen("/etc/default/cdrecord") != 0)
106 + if (defltopen(DEFAULT_CONFIG) != 0)
109 p = defltread(dname);
110 diff -urN cdrtools-1.10.org/doc/cdrecord.man cdrtools-1.10/doc/cdrecord.man
111 --- cdrtools-1.10.org/doc/cdrecord.man Sat Apr 21 12:30:34 2001
112 +++ cdrtools-1.10/doc/cdrecord.man Sat Apr 21 12:46:19 2001
117 - If a file /etc/default/cdrecord exists, the parameter to the
118 + If a file /etc/cdrecord.conf exists, the parameter to the
119 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
123 If the argument to the d
\bd
\bd
\bde
\be
\be
\bev
\bv
\bv
\bv=
\b=
\b=
\b= option does not contain the
124 characters ',', '/', '@' or ':', it is interpreted as
125 an label name that may be found in the file
126 - /etc/default/cdrecord (see FILES section).
127 + /etc/cdrecord.conf (see FILES section).
134 suitable to the open call of the SCSI transport library
135 - or a label in the file /etc/default/cdrecord.
136 + or a label in the file /etc/cdrecord.conf
139 Sets the default speed value for writing (see also -
\b-
\b-
\b-
140 @@ -942,16 +942,16 @@
143 F
\bF
\bF
\bFI
\bI
\bI
\bIL
\bL
\bL
\bLE
\bE
\bE
\bES
\bS
\bS
\bS
144 - /etc/default/cdrecord
146 Default values can be set for the following options in
147 - /etc/default/cdrecord. For example: CDR_FIFOSIZE=8m
148 + /etc/cdrecord.conf. For example: CDR_FIFOSIZE=8m
152 This may either hold a device identifier that is
153 suitable to the open call of the SCSI transport
154 library or a label in the file
155 - /etc/default/cdrecord that allows to identify a
156 + /etc/cdrecord.conf that allows to identify a
157 specific drive on the system.
160 diff -urN cdrtools-1.10.org/include/deflts.h cdrtools-1.10/include/deflts.h
161 --- cdrtools-1.10.org/include/deflts.h Sat Apr 21 12:30:35 2001
162 +++ cdrtools-1.10/include/deflts.h Sat Apr 21 12:45:37 2001
167 -#define DEFLT "/etc/default"
168 +#define DEFLT "/etc"
171 * cmd's to defltcntl()