From 1e4945f483399ca344beb3df582b29e1b88ef6ae Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Fri, 6 May 2011 13:20:36 +0000
Subject: [PATCH] Made use of Text_shellsafe bit1 for messages with two file
 names

---
 libisoburn/trunk/xorriso/disk_ops.c          | 4 ++--
 libisoburn/trunk/xorriso/iso_manip.c         | 4 ++--
 libisoburn/trunk/xorriso/iso_tree.c          | 4 ++--
 libisoburn/trunk/xorriso/opts_i_o.c          | 2 +-
 libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libisoburn/trunk/xorriso/disk_ops.c b/libisoburn/trunk/xorriso/disk_ops.c
index 83c89513..c38ba741 100644
--- a/libisoburn/trunk/xorriso/disk_ops.c
+++ b/libisoburn/trunk/xorriso/disk_ops.c
@@ -889,7 +889,7 @@ int Xorriso_lsx_filev(struct XorrisO *xorriso, char *wd,
    if(link_target[0]) {
      Text_shellsafe(filev[i], xorriso->result_line, 1);
      strcat(xorriso->result_line, " -> ");
-     Text_shellsafe(link_target, xorriso->result_line, 1);
+     Text_shellsafe(link_target, xorriso->result_line, 1 | 2);
    } else {
      Text_shellsafe(filev[i], xorriso->result_line, 1);
    }
@@ -1710,7 +1710,7 @@ int Xorriso_restore_make_hl(struct XorrisO *xorriso,
  sprintf(xorriso->info_text, "Hardlinking failed: ");
  Text_shellsafe(new_path, xorriso->info_text, 1);
  strcat(xorriso->info_text, " -> ");
- Text_shellsafe(old_path, xorriso->info_text, 1);
+ Text_shellsafe(old_path, xorriso->info_text, 1 | 2);
  Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "WARNING", 0);
  return(0);
 }
diff --git a/libisoburn/trunk/xorriso/iso_manip.c b/libisoburn/trunk/xorriso/iso_manip.c
index cdb4abe7..9e925e95 100644
--- a/libisoburn/trunk/xorriso/iso_manip.c
+++ b/libisoburn/trunk/xorriso/iso_manip.c
@@ -1617,7 +1617,7 @@ int Xorriso_rename(struct XorrisO *xorriso, void *boss_iter,
    sprintf(xorriso->info_text, "May not rename ");
    Text_shellsafe(eff_origin, xorriso->info_text, 1);
    strcat(xorriso->info_text, " to its own sub address ");
-   Text_shellsafe(eff_dest, xorriso->info_text, 1);
+   Text_shellsafe(eff_dest, xorriso->info_text, 1 | 2);
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
    {ret= 0; goto ex;}
  }
@@ -1809,7 +1809,7 @@ int Xorriso_clone_tree(struct XorrisO *xorriso, void *boss_iter,
    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);
+   Text_shellsafe(eff_dest, xorriso->info_text, 1 | 2);
    strcat(xorriso->info_text, "\n");
    Xorriso_info(xorriso, 0);
  }
diff --git a/libisoburn/trunk/xorriso/iso_tree.c b/libisoburn/trunk/xorriso/iso_tree.c
index 94b15fc7..8fbc8988 100644
--- a/libisoburn/trunk/xorriso/iso_tree.c
+++ b/libisoburn/trunk/xorriso/iso_tree.c
@@ -1465,7 +1465,7 @@ int Xorriso_ls_filev(struct XorrisO *xorriso, char *wd,
    if(link_target[0] && (flag&5)==1) {
      Text_shellsafe(filev[i], xorriso->result_line, 1),
      strcat(xorriso->result_line, " -> ");
-     Text_shellsafe(link_target, xorriso->result_line, 1);
+     Text_shellsafe(link_target, xorriso->result_line, 1 | 2);
    } else {
      Text_shellsafe(filev[i], xorriso->result_line, 1);
    }
@@ -1575,7 +1575,7 @@ cannot_create_iter:;
    if(link_target[0] && (flag&1)) {
      Text_shellsafe(npt, xorriso->result_line, 1); 
      strcat(xorriso->result_line, " -> ");
-     Text_shellsafe(link_target, xorriso->result_line, 1);
+     Text_shellsafe(link_target, xorriso->result_line, 1 | 2);
    } else {
      Text_shellsafe(npt, xorriso->result_line, 1);
    }
diff --git a/libisoburn/trunk/xorriso/opts_i_o.c b/libisoburn/trunk/xorriso/opts_i_o.c
index 46fd53c2..efb5c1a1 100644
--- a/libisoburn/trunk/xorriso/opts_i_o.c
+++ b/libisoburn/trunk/xorriso/opts_i_o.c
@@ -823,7 +823,7 @@ int Xorriso_option_mvi(struct XorrisO *xorriso, int argc, char **argv,
    sprintf(xorriso->info_text, "Renamed in ISO image: ");
    Text_shellsafe(eff_origin, xorriso->info_text, 1);
    strcat(xorriso->info_text, " to ");
-   Text_shellsafe(eff_dest, xorriso->info_text, 1);
+   Text_shellsafe(eff_dest, xorriso->info_text, 1 | 2);
    strcat(xorriso->info_text, "\n");
    Xorriso_info(xorriso, 0);
 
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index ca789513..e98b0491 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2011.05.06.121218"
+#define Xorriso_timestamP "2011.05.06.132058"