From 4aa7c45c420150153735fa77cdf7c5bcfcf4e08c Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Tue, 22 Feb 2011 07:34:56 +0000
Subject: [PATCH] Issueing messages with -clone and -cp_clone

---
 xorriso/iso_manip.c         | 9 +++++++++
 xorriso/opts_a_c.c          | 6 ------
 xorriso/xorriso_timestamp.h | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/xorriso/iso_manip.c b/xorriso/iso_manip.c
index d6a3c571..00f1a8bb 100644
--- a/xorriso/iso_manip.c
+++ b/xorriso/iso_manip.c
@@ -1408,6 +1408,7 @@ int Xorriso_cannot_clone(struct XorrisO *xorriso, char *eff_origin,
 }
 
 /* @param flag bit0= for iso_tree_clone() : merge directories
+               bit1= do not issue NOTE message
 */
 int Xorriso_clone_tree(struct XorrisO *xorriso, void *boss_iter,
                        char *origin, char *dest, int flag)
@@ -1488,6 +1489,14 @@ int Xorriso_clone_tree(struct XorrisO *xorriso, void *boss_iter,
    return(0);
  }
  Xorriso_set_change_pending(xorriso, 0);
+ if(!(flag & 2)) {
+   strcpy(xorriso->info_text, "Cloned in ISO image: ");
+   Text_shellsafe(eff_origin, xorriso->info_text, 1);
+   strcat(xorriso->info_text, " to ");
+   Text_shellsafe(eff_dest, xorriso->info_text, 1);
+   strcat(xorriso->info_text, "\n");
+   Xorriso_info(xorriso, 0);
+ }
  return(1);
 }
 
diff --git a/xorriso/opts_a_c.c b/xorriso/opts_a_c.c
index bda59ca1..2778fd79 100644
--- a/xorriso/opts_a_c.c
+++ b/xorriso/opts_a_c.c
@@ -1969,12 +1969,6 @@ nondir_exists:;
        ret= Xorriso_clone_tree(xorriso, NULL, eff_origin, eff_dest, 1);
        if(ret <= 0)
          goto problem_handler;
-       sprintf(xorriso->info_text, "Cloned in ISO image: ");
-       Text_shellsafe(eff_origin, xorriso->info_text, 1);
-       strcat(xorriso->info_text, " to ");
-       Text_shellsafe(eff_dest, xorriso->info_text, 1);
-       strcat(xorriso->info_text, "\n");
-       Xorriso_info(xorriso, 0);
      }
 
    continue; /* regular bottom of loop */
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 2d14ee0a..0a9fc84b 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2011.02.19.112541"
+#define Xorriso_timestamP "2011.02.22.073504"