From 57da7013d36951c3a02a636c8f84cc2d87b32eb3 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Tue, 22 Sep 2009 14:34:33 +0000
Subject: [PATCH] Bug fix: -cut_out deleted previously cut-out pieces of the
 same file

---
 xorriso/xorriso.c           | 17 ++++++++++++++++-
 xorriso/xorriso_private.h   |  2 ++
 xorriso/xorriso_timestamp.h |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/xorriso/xorriso.c b/xorriso/xorriso.c
index f1c9e8af..85230063 100644
--- a/xorriso/xorriso.c
+++ b/xorriso/xorriso.c
@@ -3743,6 +3743,21 @@ int Splitpart__parse(char *name, int *partno, int *total_parts,
 }
 
 
+int Splitpart__is_part_path(char *path, int flag)
+{
+ int partno, total_parts, ret;
+ off_t offset, bytes, total_bytes;
+ char *name;
+
+ name= strrchr(path, '/');
+ if(name == NULL)
+   name= path;
+ ret= Splitpart__parse(name, &partno, &total_parts, &offset, &bytes,
+                       &total_bytes, 0);
+ return(ret > 0);
+}
+
+
 int Splitpart__compose(char *adr, int partno, int total_parts,
                        off_t offset, off_t bytes, off_t total_bytes, int flag)
 {
@@ -12768,7 +12783,7 @@ int Xorriso_may_burn(struct XorrisO *xorriso, int flag)
    return(1);
  sprintf(xorriso->info_text, "The output drive was not aquired exclusively.");
  Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
- sprintf(xorriso->info_text, "A possible remedy is: -ossirox 'o_excl_on'");
+ sprintf(xorriso->info_text, "A possible remedy is: -osirrox 'o_excl_on'");
  if(xorriso->outdev[0]) {
    strcat(xorriso->info_text," -outdev ");
    Text_shellsafe(xorriso->outdev, xorriso->info_text, 1);
diff --git a/xorriso/xorriso_private.h b/xorriso/xorriso_private.h
index 1cd3aefe..0f535322 100644
--- a/xorriso/xorriso_private.h
+++ b/xorriso/xorriso_private.h
@@ -1171,6 +1171,8 @@ int Splitparts_get(struct SplitparT *o, int idx, char **name, int *partno,
 int Splitpart__parse(char *name, int *partno, int *total_parts,
                     off_t *offset, off_t *bytes, off_t *total_bytes, int flag);
 
+int Splitpart__is_part_path(char *path, int flag);
+
 int Splitpart__compose(char *adr, int partno, int total_parts,
                        off_t offset, off_t bytes, off_t total_bytes, int flag);
 
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index b032f79f..5314a57d 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2009.09.20.110715"
+#define Xorriso_timestamP "2009.09.22.143534"