From 4efccd15b393c63466b4999825cc3f8c49275ef5 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Sat, 11 Nov 2006 13:46:22 +0000
Subject: [PATCH] Implemented handling of unsuitable disk states with -msinfo

---
 cdrskin/cdrskin.c           | 12 +++++++++---
 cdrskin/cdrskin_timestamp.h |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cdrskin/cdrskin.c b/cdrskin/cdrskin.c
index de5af7c..3b05ff7 100644
--- a/cdrskin/cdrskin.c
+++ b/cdrskin/cdrskin.c
@@ -3455,9 +3455,15 @@ int Cdrskin_msinfo(struct CdrskiN *skin, int flag)
    usleep(100002);
  while ((s= burn_disc_get_status(drive)) == BURN_DISC_UNREADY)
    usleep(100002);
+ if(s!=BURN_DISC_APPENDABLE) {
+   Cdrskin_report_disc_status(skin,s,0);
+   fprintf(stderr,
+ "cdrskin: FATAL : -msinfo can only operate on appendable (i.e. -multi) CD\n");
+   {ret= 0; goto ex;}
+ }
  disc= burn_drive_get_disc(drive);
  if(disc==NULL) {
-   fprintf(stderr,"cdrskin: SORRY : Cannot obtain info about CD content\n");
+   fprintf(stderr,"cdrskin: FATAL : Cannot obtain info about CD content\n");
    {ret= 0; goto ex;}
  }
  sessions= burn_disc_get_sessions(disc,&num_sessions);
@@ -3469,7 +3475,7 @@ int Cdrskin_msinfo(struct CdrskiN *skin, int flag)
    lba= burn_msf_to_lba(toc_entry.pmin,toc_entry.psec,toc_entry.pframe);
  }
  if(lba==-123456789) {
-   fprintf(stderr,"cdrskin: SORRY : Cannot find any track on CD\n");
+   fprintf(stderr,"cdrskin: FATAL : Cannot find any track on CD\n");
    {ret= 0; goto ex;}
  }
 
@@ -3510,7 +3516,7 @@ ex:;
  if(skin->verbosity>=Cdrskin_verbose_debuG)
    ClN(fprintf(stderr,"cdrskin_debug: doing extra release-grab cycle\n"));
  Cdrskin_release_drive(skin,0);
- ret= Cdrskin_grab_drive(skin,0);
+ Cdrskin_grab_drive(skin,0);
 
  if(o!=NULL)
    burn_write_opts_free(o);
diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h
index 45cfd03..6d85d13 100644
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2006.11.11.124020"
+#define Cdrskin_timestamP "2006.11.11.134752"