1.1 --- a/.hgtags.orig Sat Dec 29 15:28:22 2007 +0100
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,3 +0,0 @@
1.4 -d85c12073deaa1b5048d3a8c761d9dd55d8169a1 0.6.2
1.5 -6bcb44b9edb16f763d32184678a6f6627675c0ab 0.6.3
1.6 -79da91042fccaa22239cd847e7f83301a54e4b10 0.6.4beta
2.1 --- a/cdbackup.c Sat Dec 29 15:28:22 2007 +0100
2.2 +++ b/cdbackup.c Sat Dec 29 15:31:08 2007 +0100
2.3 @@ -1,5 +1,5 @@
2.4 /* cdbackup.c
2.5 -Copyright (c) 2000-2004 Craig Condit, Stefan Hülswitt.
2.6 +Copyright (c) 2000-2006 Craig Condit, Stefan Hülswitt.
2.7
2.8 Redistribution and use in source and binary forms, with or without
2.9 modification, are permitted provided that the following conditions are met:
2.10 @@ -84,7 +84,10 @@
2.11 char *ptr;
2.12 va_list ap;
2.13 va_start(ap,format);
2.14 - if(vasprintf(&ptr,format,ap)<0) serror("No memory for cdrecord args\n");
2.15 + if(vasprintf(&ptr,format,ap)<0) {
2.16 + serror("No memory for cdrecord args\n");
2.17 + ptr=0;
2.18 + }
2.19 va_end(ap);
2.20 return ptr;
2.21 }
2.22 @@ -94,7 +97,7 @@
2.23 char **args, **p, *exname;
2.24 int l;
2.25
2.26 - if(!(p=args=calloc(cdrec_opt_count+10,sizeof(char *))))
2.27 + if(!(p=args=calloc(cdrec_opt_count+32,sizeof(char *))))
2.28 serror("No memory for cdrecord args\n");
2.29
2.30 if(dvd) exname="dvdrecord"; else exname="cdrecord";
2.31 @@ -106,6 +109,7 @@
2.32 }
2.33 else {
2.34 *p++="-multi";
2.35 + *p++="-tao";
2.36 *p++=make_arg("padsize=%ds",padsize);
2.37 }
2.38
2.39 @@ -323,7 +327,7 @@
2.40 if(cont) fprintf(stderr,"Multi-disk not enabled, ignoring continuation image(s)!\n");
2.41 cont=0;
2.42 }
2.43 - else {
2.44 + else if(cont) {
2.45 disknum++;
2.46 diskchange(multicmd,cd_dev);
2.47 }