]>
Commit | Line | Data |
---|---|---|
f4b7a9f1 SZ |
1 | diff -Naur cdrecord-1.9/cdrecord/cdrecord.1 cdrecord-1.9-p/cdrecord/cdrecord.1 |
2 | --- cdrecord-1.9/cdrecord/cdrecord.1 Thu Jul 20 19:14:40 2000 | |
3 | +++ cdrecord-1.9-p/cdrecord/cdrecord.1 Mon Jul 24 16:58:47 2000 | |
b230ab6a | 4 | @@ -118,7 +118,7 @@ |
5 | described below. | |
6 | ||
7 | .PP | |
8 | -If a file /etc/default/cdrecord exists, the parameter to the | |
9 | +If a file /etc/cdrecord.conf exists, the parameter to the | |
10 | .B dev= | |
11 | option may also be a drive name label in said file (see FILES section). | |
12 | ||
f4b7a9f1 | 13 | @@ -446,7 +446,7 @@ |
b230ab6a | 14 | .B dev= |
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). | |
19 | .TP | |
20 | .BI timeout= # | |
21 | Set the default SCSI command timeout value to | |
f4b7a9f1 | 22 | @@ -969,7 +969,7 @@ |
b230ab6a | 23 | .TP |
24 | CDR_DEVICE | |
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. | |
28 | .TP | |
29 | CDR_SPEED | |
30 | Sets the default speed value for writing (see also | |
f4b7a9f1 | 31 | @@ -983,8 +983,8 @@ |
b230ab6a | 32 | |
33 | .SH FILES | |
34 | .TP | |
35 | -/etc/default/cdrecord | |
36 | -Default values can be set for the following options in /etc/default/cdrecord. | |
37 | +/etc/cdrecord.conf | |
38 | +Default values can be set for the following options in /etc/cdrecord.conf | |
39 | For example: | |
40 | .SM CDR_FIFOSIZE=8m | |
41 | or | |
f4b7a9f1 | 42 | @@ -993,7 +993,7 @@ |
b230ab6a | 43 | .TP |
44 | CDR_DEVICE | |
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. | |
49 | .TP | |
50 | CDR_SPEED | |
f4b7a9f1 SZ |
51 | diff -Naur cdrecord-1.9/cdrecord/cdrecord.dfl cdrecord-1.9-p/cdrecord/cdrecord.dfl |
52 | --- cdrecord-1.9/cdrecord/cdrecord.dfl Sun Apr 16 02:08:15 2000 | |
53 | +++ cdrecord-1.9-p/cdrecord/cdrecord.dfl Mon Jul 24 16:58:47 2000 | |
2c47266c | 54 | @@ -1,6 +1,6 @@ |
bf02f5b8 | 55 | #ident @(#)cdrecord.dfl 1.2 00/04/16 Copyr 1998 J. Schilling |
2c47266c JR |
56 | # |
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. | |
61 | # | |
f4b7a9f1 SZ |
62 | diff -Naur cdrecord-1.9/cdrecord/defaults.c cdrecord-1.9-p/cdrecord/defaults.c |
63 | --- cdrecord-1.9/cdrecord/defaults.c Fri Jun 2 20:44:44 2000 | |
64 | +++ cdrecord-1.9-p/cdrecord/defaults.c Mon Jul 24 17:00:10 2000 | |
b230ab6a | 65 | @@ -32,6 +32,8 @@ |
f4b7a9f1 | 66 | #include <schily.h> |
b230ab6a | 67 | #include "cdrecord.h" |
68 | ||
69 | +#define DEFAULT_CONFIG "/etc/cdrecord.conf" | |
70 | + | |
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)); | |
74 | @@ -49,7 +51,7 @@ | |
b230ab6a | 75 | if (!dev) { |
2c47266c JR |
76 | *devp = getenv("CDR_DEVICE"); |
77 | ||
78 | - if (!*devp && defltopen("/etc/default/cdrecord") == 0) { | |
79 | + if (!*devp && defltopen(DEFAULT_CONFIG) == 0) { | |
b230ab6a | 80 | dev = defltread("CDR_DEVICE="); |
81 | if (dev != NULL) | |
82 | *devp = strsv(dev); | |
83 | @@ -62,7 +64,7 @@ | |
84 | char *p = getenv("CDR_SPEED"); | |
85 | ||
86 | if (!p) { | |
87 | - if (defltopen("/etc/default/cdrecord") == 0) { | |
88 | + if (defltopen(DEFAULT_CONFIG) == 0) { | |
89 | p = defltread("CDR_SPEED="); | |
90 | } | |
91 | } | |
92 | @@ -79,7 +81,7 @@ | |
93 | char *p = getenv("CDR_FIFOSIZE"); | |
94 | ||
95 | if (!p) { | |
96 | - if (defltopen("/etc/default/cdrecord") == 0) { | |
97 | + if (defltopen(DEFAULT_CONFIG) == 0) { | |
98 | p = defltread("CDR_FIFOSIZE="); | |
99 | } | |
100 | } | |
101 | @@ -110,7 +112,7 @@ | |
102 | x++; | |
103 | } | |
f4b7a9f1 | 104 | js_snprintf(dname, sizeof(dname), "%s=", p); |
b230ab6a | 105 | - if (defltopen("/etc/default/cdrecord") != 0) |
106 | + if (defltopen(DEFAULT_CONFIG) != 0) | |
107 | return; | |
108 | ||
109 | p = defltread(dname); | |
f4b7a9f1 SZ |
110 | diff -Naur cdrecord-1.9/doc/cdrecord.man cdrecord-1.9-p/doc/cdrecord.man |
111 | --- cdrecord-1.9/doc/cdrecord.man Thu Apr 27 14:07:33 2000 | |
112 | +++ cdrecord-1.9-p/doc/cdrecord.man Mon Jul 24 16:58:47 2000 | |
2c47266c JR |
113 | @@ -50,7 +50,7 @@ |
114 | 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. | |
115 | ||
116 | ||
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 | |
120 | FILES section). | |
121 | ||
bf02f5b8 | 122 | @@ -367,7 +367,7 @@ |
2c47266c JR |
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). | |
128 | ||
129 | 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=# | |
130 | Set the default SCSI command timeout value to #. The | |
bf02f5b8 | 131 | @@ -888,7 +888,7 @@ |
2c47266c JR |
132 | CDR_DEVICE |
133 | This may either hold a device identifier that is suit- | |
134 | able to the open call of the SCSI transport library or | |
135 | - a label in the file /etc/default/cdrecord. | |
136 | + a label in the file /etc/cdrecord.conf. | |
137 | ||
bf02f5b8 SZ |
138 | CDR_SPEED |
139 | Sets the default speed value for writing (see also -\b-\b-\b- | |
140 | @@ -900,16 +900,16 @@ | |
2c47266c JR |
141 | |
142 | ||
143 | F\bF\bF\bFI\bI\bI\bIL\bL\bL\bLE\bE\bE\bES\bS\bS\bS | |
144 | - /etc/default/cdrecord | |
145 | + /etc/cdrecord.conf | |
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 | |
149 | or CDR_SPEED=2 | |
150 | ||
151 | CDR_DEVICE | |
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. | |
158 | ||
159 | CDR_SPEED | |
f4b7a9f1 SZ |
160 | diff -Naur cdrecord-1.9/include/deflts.h cdrecord-1.9-p/include/deflts.h |
161 | --- cdrecord-1.9/include/deflts.h Sat Dec 5 14:04:18 1998 | |
162 | +++ cdrecord-1.9-p/include/deflts.h Mon Jul 24 16:58:47 2000 | |
2c47266c JR |
163 | @@ -27,7 +27,7 @@ |
164 | #include <mconfig.h> | |
165 | #endif | |
166 | ||
167 | -#define DEFLT "/etc/default" | |
168 | +#define DEFLT "/etc" | |
169 | ||
170 | /* | |
171 | * cmd's to defltcntl() |