[patch] Renamed clone to clonetoc

cdrtools-3.01-rename-clone.patch (text/plain), 2.49 KB, created by Anthony Basile on 2013-10-03 11:51:58 UTC

diff -Naur cdrtools-3.01.orig/readcd/readcd.c cdrtools-3.01/readcd/readcd.c
--- cdrtools-3.01.orig/readcd/readcd.c	2013-05-30 16:56:24.000000000 -0400
+++ cdrtools-3.01/readcd/readcd.c	2013-10-02 14:54:49.697222392 -0400
@@ -255,7 +255,7 @@
 BOOL	pifscan;
 BOOL	plot;
 BOOL	fulltoc;
-BOOL	clone;
+BOOL	clonetoc;
 BOOL	edc_corr;
 BOOL	noerror;
 BOOL	nocorr;
@@ -291,7 +291,7 @@
 	error(_("\t-plot		Print data suitable for gnuplot\n"));
 #ifdef	CLONE_WRITE
 	error(_("\t-fulltoc	Retrieve the full TOC\n"));
-	error(_("\t-clone		Retrieve the full TOC and all data\n"));
+	error(_("\t-clonetoc		Retrieve the full TOC and all data\n"));
 	error(_("\t-edc-corr	Try to do user level Reed Solomon repair (experimental)\n"));
 #endif
 	error(_("\ttimeout=#	set the default SCSI command timeout to #.\n"));
@@ -317,7 +317,7 @@
 }
 
 /* CSTYLED */
-char	opts[]   = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clone,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#";
+char	opts[]   = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clonetoc,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#";
 
 EXPORT int
 main(ac, av)
@@ -393,7 +393,7 @@
 			&scanbus, &dev, &sectors, &do_write,
 			&c2scan, &cxscan, &pi8scan, &pifscan,
 			&plot,
-			&fulltoc, &clone,
+			&fulltoc, &clonetoc,
 			&edc_corr,
 			&noerror, &nocorr,
 			&notrunc, &retries, &do_factor, &filename,
@@ -664,7 +664,7 @@
 
 	if (filename || sectors || c2scan || cxscan || pi8scan || pifscan ||
 	    meshpoints || fulltoc ||
-	    clone || edc_corr) {
+	    clonetoc || edc_corr) {
 		dorw(scgp, filename, sectors);
 	} else {
 		doit(scgp);
@@ -879,9 +879,9 @@
 		if (params.name == NULL)
 			params.name = "/dev/null";
 		read_ftoc(scgp, &params, FALSE);
-	} else if (clone || edc_corr) {
+	} else if (clonetoc || edc_corr) {
 		if (!is_mmc(scgp, NULL, NULL))
-			comerrno(EX_BAD, _("Unsupported device for clone mode.\n"));
+			comerrno(EX_BAD, _("Unsupported device for clonetoc mode.\n"));
 		if (!edc_corr)
 			noerror = TRUE;
 		if (retries == MAX_RETRY)
@@ -889,7 +889,7 @@
 		if (params.name == NULL)
 			params.name = "/dev/null";
 
-		if (clone)
+		if (clonetoc)
 		if (read_ftoc(scgp, &params, TRUE) < 0)
 			comerrno(EX_BAD, _("Read fulltoc problems.\n"));
 		readcd_disk(scgp, &params);