Attachment #360046 for bug #486782

View | Details | Raw Unified | Return to bug 486782
Collapse All | Expand All




BOOL	pifscan;
BOOL	plot;
BOOL	fulltoc;
BOOL	clonetoc;
BOOL	edc_corr;
BOOL	noerror;
BOOL	nocorr;

	error(_("\t-plot		Print data suitable for gnuplot\n"));
#ifdef	CLONE_WRITE
	error(_("\t-fulltoc	Retrieve the full TOC\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"));

}

/* 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,clonetoc,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#";

EXPORT int
main(ac, av)

			&scanbus, &dev, &sectors, &do_write,
			&c2scan, &cxscan, &pi8scan, &pifscan,
			&plot,
			&fulltoc, &clonetoc,
			&edc_corr,
			&noerror, &nocorr,
			&notrunc, &retries, &do_factor, &filename,


	if (filename || sectors || c2scan || cxscan || pi8scan || pifscan ||
	    meshpoints || fulltoc ||
	    clonetoc || edc_corr) {
		dorw(scgp, filename, sectors);
	} else {
		doit(scgp);

		if (params.name == NULL)
			params.name = "/dev/null";
		read_ftoc(scgp, &params, FALSE);
	} else if (clonetoc || edc_corr) {
		if (!is_mmc(scgp, NULL, NULL))
			comerrno(EX_BAD, _("Unsupported device for clonetoc mode.\n"));
		if (!edc_corr)
			noerror = TRUE;
		if (retries == MAX_RETRY)

		if (params.name == NULL)
			params.name = "/dev/null";

		if (clonetoc)
		if (read_ftoc(scgp, &params, TRUE) < 0)
			comerrno(EX_BAD, _("Read fulltoc problems.\n"));
		readcd_disk(scgp, &params);

Return to bug 486782

Lines 255-261 Link Here

(-)cdrtools-3.01.orig/readcd/readcd.c (-8 / +8 lines)
255	BOOL pifscan;	255	BOOL pifscan;
256	BOOL plot;	256	BOOL plot;
257	BOOL fulltoc;	257	BOOL fulltoc;
258	BOOL clone;	258	BOOL clonetoc;
259	BOOL edc_corr;	259	BOOL edc_corr;
260	BOOL noerror;	260	BOOL noerror;
261	BOOL nocorr;	261	BOOL nocorr;
Lines 291-297 Link Here
291	error(_("\t-plot Print data suitable for gnuplot\n"));	291	error(_("\t-plot Print data suitable for gnuplot\n"));
292	#ifdef CLONE_WRITE	292	#ifdef CLONE_WRITE
293	error(_("\t-fulltoc Retrieve the full TOC\n"));	293	error(_("\t-fulltoc Retrieve the full TOC\n"));
294	error(_("\t-clone Retrieve the full TOC and all data\n"));	294	error(_("\t-clonetoc Retrieve the full TOC and all data\n"));
295	error(_("\t-edc-corr Try to do user level Reed Solomon repair (experimental)\n"));	295	error(_("\t-edc-corr Try to do user level Reed Solomon repair (experimental)\n"));
296	#endif	296	#endif
297	error(_("\ttimeout=# set the default SCSI command timeout to #.\n"));	297	error(_("\ttimeout=# set the default SCSI command timeout to #.\n"));
Lines 317-323 Link Here
317	}	317	}
318		318
319	/* CSTYLED */	319	/* CSTYLED */
320	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#";	320	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#";
321		321
322	EXPORT int	322	EXPORT int
323	main(ac, av)	323	main(ac, av)
Lines 393-399 Link Here
393	&scanbus, &dev, &sectors, &do_write,	393	&scanbus, &dev, &sectors, &do_write,
394	&c2scan, &cxscan, &pi8scan, &pifscan,	394	&c2scan, &cxscan, &pi8scan, &pifscan,
395	&plot,	395	&plot,
396	&fulltoc, &clone,	396	&fulltoc, &clonetoc,
397	&edc_corr,	397	&edc_corr,
398	&noerror, &nocorr,	398	&noerror, &nocorr,
399	&notrunc, &retries, &do_factor, &filename,	399	&notrunc, &retries, &do_factor, &filename,
Lines 664-670 Link Here
664		664
665	if (filename \|\| sectors \|\| c2scan \|\| cxscan \|\| pi8scan \|\| pifscan \|\|	665	if (filename \|\| sectors \|\| c2scan \|\| cxscan \|\| pi8scan \|\| pifscan \|\|
666	meshpoints \|\| fulltoc \|\|	666	meshpoints \|\| fulltoc \|\|
667	clone \|\| edc_corr) {	667	clonetoc \|\| edc_corr) {
668	dorw(scgp, filename, sectors);	668	dorw(scgp, filename, sectors);
669	} else {	669	} else {
670	doit(scgp);	670	doit(scgp);
Lines 879-887 Link Here
879	if (params.name == NULL)	879	if (params.name == NULL)
880	params.name = "/dev/null";	880	params.name = "/dev/null";
881	read_ftoc(scgp, &params, FALSE);	881	read_ftoc(scgp, &params, FALSE);
882	} else if (clone \|\| edc_corr) {	882	} else if (clonetoc \|\| edc_corr) {
883	if (!is_mmc(scgp, NULL, NULL))	883	if (!is_mmc(scgp, NULL, NULL))
884	comerrno(EX_BAD, _("Unsupported device for clone mode.\n"));	884	comerrno(EX_BAD, _("Unsupported device for clonetoc mode.\n"));
885	if (!edc_corr)	885	if (!edc_corr)
886	noerror = TRUE;	886	noerror = TRUE;
887	if (retries == MAX_RETRY)	887	if (retries == MAX_RETRY)
Lines 889-895 Link Here
889	if (params.name == NULL)	889	if (params.name == NULL)
890	params.name = "/dev/null";	890	params.name = "/dev/null";
891		891
892	if (clone)	892	if (clonetoc)
893	if (read_ftoc(scgp, &params, TRUE) < 0)	893	if (read_ftoc(scgp, &params, TRUE) < 0)
894	comerrno(EX_BAD, _("Read fulltoc problems.\n"));	894	comerrno(EX_BAD, _("Read fulltoc problems.\n"));
895	readcd_disk(scgp, &params);	895	readcd_disk(scgp, &params);