From 164dfb371ad39bb20a58194383a2e58b5d556444 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Mon, 11 Feb 2008 16:24:51 +0000
Subject: [PATCH] Changed failure to find a file for removal from FAILURE to
 SORRY

---
 libisoburn/trunk/xorriso/xorriso.c           | 18 +++++++++++++-----
 libisoburn/trunk/xorriso/xorriso_timestamp.h |  2 +-
 libisoburn/trunk/xorriso/xorrisoburn.c       |  3 +--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/libisoburn/trunk/xorriso/xorriso.c b/libisoburn/trunk/xorriso/xorriso.c
index 1447cde9..29e4e54c 100644
--- a/libisoburn/trunk/xorriso/xorriso.c
+++ b/libisoburn/trunk/xorriso/xorriso.c
@@ -8133,7 +8133,7 @@ int Xorriso_option_rmi(struct XorrisO *xorriso, int argc, char **argv,
                        int *idx, int flag)
 {
  int i, ret, end_idx, was_failure= 0, fret;
- char path[SfileadrL], eff_path[SfileadrL];
+ char path[SfileadrL], eff_path[SfileadrL], sfe[5*SfileadrL];
  int optc= 0;
  char **optv= NULL;
 
@@ -8149,9 +8149,16 @@ int Xorriso_option_rmi(struct XorrisO *xorriso, int argc, char **argv,
      if(ret<=0)
        goto problem_handler;
    }
-   ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, path, eff_path, 2);
-   if(ret<=0)
+   ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, path, eff_path, 1);
+   if(ret<0)
      goto problem_handler;
+   if(ret==0) {
+     sprintf(xorriso->info_text,
+             "Cannot find path %s in loaded ISO image for removal",
+             Text_shellsafe(path, sfe, 0));
+     Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0);
+     goto problem_handler;
+   }
    strcpy(path, eff_path);
 
    ret= Xorriso_rmi(xorriso, NULL, path, flag&(1|2));
@@ -8432,12 +8439,13 @@ int Xorriso_option_volid(struct XorrisO *xorriso, char *volid, int flag)
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
  }
  if(xorriso->do_joliet && strlen(volid)>16) {
-   sprintf(xorriso->info_text, "-volid text is too long for Joliet");
+   sprintf(xorriso->info_text,
+           "-volid text is too long for Joliet (%d > 16)",(int) strlen(volid));
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
  }
  if(warn_ecma) {
    sprintf(xorriso->info_text,
-           "-volid text does not comply to ISO 9660 / ECMA 119 rules");
+          "-volid text does not comply to ISO 9660 / ECMA 119 rules");
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
  }
  strcpy(xorriso->volid, volid);
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 075774ac..7edb3d7f 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.02.11.150700"
+#define Xorriso_timestamP "2008.02.11.162406"
diff --git a/libisoburn/trunk/xorriso/xorrisoburn.c b/libisoburn/trunk/xorriso/xorrisoburn.c
index 105b223b..cfb00b73 100644
--- a/libisoburn/trunk/xorriso/xorrisoburn.c
+++ b/libisoburn/trunk/xorriso/xorrisoburn.c
@@ -1138,8 +1138,7 @@ bonked_root:;
 much_too_long:;
      sprintf(xorriso->info_text, "Effective path gets much too long (%d)",
              (int) (strlen(eff_path)+strlen(apt)+1));
-     if(!(flag&1))
-       Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
+     Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
      return(-1);
    }
    if(!(flag&2)) {