# HG changeset patch
# User nathan
# Date 1198938668 -3600
# Node ID 79f97a86b31a7dea9e8eb94529d6c521405ca0bf
# Parent  d6649fe2a4e0bb70479b6b18158b5a8a535c9981
several fixes

diff -r d6649fe2a4e0 -r 79f97a86b31a .hgtags.orig
--- a/.hgtags.orig	Sat Dec 29 15:28:22 2007 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-d85c12073deaa1b5048d3a8c761d9dd55d8169a1 0.6.2
-6bcb44b9edb16f763d32184678a6f6627675c0ab 0.6.3
-79da91042fccaa22239cd847e7f83301a54e4b10 0.6.4beta
diff -r d6649fe2a4e0 -r 79f97a86b31a cdbackup.c
--- a/cdbackup.c	Sat Dec 29 15:28:22 2007 +0100
+++ b/cdbackup.c	Sat Dec 29 15:31:08 2007 +0100
@@ -1,5 +1,5 @@
 /* cdbackup.c
-Copyright (c) 2000-2004 Craig Condit, Stefan Hülswitt.
+Copyright (c) 2000-2006 Craig Condit, Stefan Hülswitt.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met: 
@@ -84,7 +84,10 @@
   char *ptr;
   va_list ap;
   va_start(ap,format);
-  if(vasprintf(&ptr,format,ap)<0) serror("No memory for cdrecord args\n");
+  if(vasprintf(&ptr,format,ap)<0) {
+    serror("No memory for cdrecord args\n");
+    ptr=0;
+    }
   va_end(ap);
   return ptr;
 }
@@ -94,7 +97,7 @@
   char **args, **p, *exname;
   int l;
   
-  if(!(p=args=calloc(cdrec_opt_count+10,sizeof(char *))))
+  if(!(p=args=calloc(cdrec_opt_count+32,sizeof(char *))))
     serror("No memory for cdrecord args\n");
 
   if(dvd) exname="dvdrecord"; else exname="cdrecord";
@@ -106,6 +109,7 @@
     }
   else {
     *p++="-multi";
+    *p++="-tao";
     *p++=make_arg("padsize=%ds",padsize);
     }
 
@@ -323,7 +327,7 @@
       if(cont) fprintf(stderr,"Multi-disk not enabled, ignoring continuation image(s)!\n");
       cont=0;
       }
-    else {
+    else if(cont) {
       disknum++;
       diskchange(multicmd,cd_dev);
       }