- updated to 1.8

[packages/cdrtools.git] / cdrecord-config.patch

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
@@ -118,7 +118,7 @@
 described below.
 
 .PP
-If a file /etc/default/cdrecord exists, the parameter to the
+If a file /etc/cdrecord.conf exists, the parameter to the
 .B dev=
 option may also be a drive name label in said file (see FILES section).
 
@@ -432,7 +432,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 
@@ -923,7 +923,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.
 .TP
 CDR_SPEED
 Sets the default speed value for writing (see also 
@@ -937,8 +937,8 @@
 
 .SH FILES
 .TP
-/etc/default/cdrecord
-Default values can be set for the following options in /etc/default/cdrecord.
+/etc/cdrecord.conf
+Default values can be set for the following options in /etc/cdrecord.conf
 For example:
 .SM CDR_FIFOSIZE=8m
 or
@@ -947,7 +947,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
 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
@@ -1,6 +1,6 @@
 #ident @(#)cdrecord.dfl	1.1 98/12/06 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
@@ -32,6 +32,8 @@
 #include <utypes.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));
@@ -49,7 +51,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);
@@ -62,7 +64,7 @@
 		char	*p = getenv("CDR_SPEED");
 
 		if (!p) {
-			if (defltopen("/etc/default/cdrecord") == 0) {
+			if (defltopen(DEFAULT_CONFIG) == 0) {
 				p = defltread("CDR_SPEED=");
 			}
 		}
@@ -79,7 +81,7 @@
 		char	*p = getenv("CDR_FIFOSIZE");
 
 		if (!p) {
-			if (defltopen("/etc/default/cdrecord") == 0) {
+			if (defltopen(DEFAULT_CONFIG) == 0) {
 				p = defltread("CDR_FIFOSIZE=");
 			}
 		}
@@ -110,7 +112,7 @@
 		x++;
 	}
 	sprintf(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
@@ -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.
 
 
-     If a file /etc/default/cdrecord exists, the parameter to the
+     If a file /etc/cdrecord.conf exists, the parameter to the
      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 @@
           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  #.   The
@@ -848,7 +848,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 @@
 
 
 F\bF\bF\bFI\bI\bI\bIL\bL\bL\bLE\bE\bE\bES\bS\bS\bS
-     /etc/default/cdrecord
+     /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
           or CDR_SPEED=2
 
           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  that  allows  to identify a
+               /etc/cdrecord.conf  that  allows  to identify a
                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
@@ -27,7 +27,7 @@
 #include <mconfig.h>
 #endif
 
-#define	DEFLT	"/etc/default"
+#define	DEFLT	"/etc"
 
 /*
  * cmd's to defltcntl()