1.1 --- a/cdbackup.c	Sat Dec 29 15:22:44 2007 +0100
     1.2 +++ b/cdbackup.c	Sat Dec 29 15:23:49 2007 +0100
     1.3 @@ -41,6 +41,7 @@
     1.4  #include "cdbackup.h"
     1.5  #include "cdrom.h"
     1.6  #include "misc.h"
     1.7 +#include "debug.h"
     1.8  #include "version.h"
     1.9  
    1.10  /* #define DEBUGOUT */
    1.11 @@ -57,6 +58,7 @@
    1.12  char * multicmd =0;
    1.13  int    verbose  =0;
    1.14  int    xamode2  =0;
    1.15 +int    debug    =0;
    1.16  
    1.17  char **cdrec_opt=0;
    1.18  int    cdrec_opt_count=0;
    1.19 @@ -81,6 +83,7 @@
    1.20      "  -m             enable multi-disk mode\n"
    1.21      "  -c COMMAND     call COMMAND on disk change in multi-disk mode\n"
    1.22      "  -v             be verbose\n"
    1.23 +    "  -D             enable DEBUG output\n"
    1.24      "  -V             prints version & exits\n"
    1.25      "  --             pass rest of commandline to cdrecord\n"
    1.26      "\n", prg_name);
    1.27 @@ -92,7 +95,7 @@
    1.28  {
    1.29    int i;
    1.30  
    1.31 -  while ((i=getopt(argc,argv,"d:r:l:s:p:a:c:mvVX"))>0) {
    1.32 +  while ((i=getopt(argc,argv,"d:r:l:s:p:a:c:mvVXD"))>0) {
    1.33      switch (i) {
    1.34         case 'V': fprintf(stderr,"cdbackup "VERSION" (compiled "__DATE__")\n"
    1.35  	                        "Copyright (C) 2000-2002\n"
    1.36 @@ -107,6 +110,9 @@
    1.37         case 'd': cd_dev=optarg; break;
    1.38         case 'r': cdr_dev=optarg; break;
    1.39         case 'a': cd_label=optarg; break;
    1.40 +       case 'D': verbose=1; debug=1; 
    1.41 +                 DEBUG("cdbackup: DEBUG output enabled ("VERSION")\n");
    1.42 +                 break;
    1.43         case 'l': errno=0; cd_len=strtol(optarg,NULL,10);
    1.44                   if(errno==ERANGE || cd_len<1) serror("Option -l: length out of range (must be >=1)\n");
    1.45  	         cd_len = (long long)cd_len * (1024*1024) / CD_FRAMESIZE; /* convert to blocks */
    1.46 @@ -156,7 +162,7 @@
    1.47    *p++="-";
    1.48    *p++=0;
    1.49  
    1.50 -  if(verbose) {
    1.51 +  if(debug) {
    1.52      fprintf(stderr,"%s: cdrecord command:",prg_name);
    1.53      for(p=args ; *p ; p++) fprintf(stderr," %s",*p);
    1.54      fprintf(stderr,"\n");