From 548c0c4efd8bb636bbf603f984444c16fc2e6c1e Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sat, 26 Mar 2011 10:05:05 +0000 Subject: [PATCH] Reporting target name if adding of new node fails with ISO_WRONG_ARG_VALUE --- xorriso/iso_manip.c | 8 ++++++-- xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xorriso/iso_manip.c b/xorriso/iso_manip.c index 00f1a8bb..9c66454d 100644 --- a/xorriso/iso_manip.c +++ b/xorriso/iso_manip.c @@ -166,7 +166,7 @@ int Xorriso_tree_graft_node(struct XorrisO *xorriso, IsoImage *volume, { int ret, stbuf_valid= 0; struct stat stbuf; - char sfe[5*SfileadrL]; + char sfe[5*SfileadrL], *namept; off_t size= 0; if(lstat(disk_path, &stbuf) != -1) { @@ -227,7 +227,11 @@ int Xorriso_tree_graft_node(struct XorrisO *xorriso, IsoImage *volume, ex:; if(ret<0) { Xorriso_process_msg_queues(xorriso,0); - Xorriso_report_iso_error(xorriso, nominal_source, ret, + if(ret == ISO_WRONG_ARG_VALUE) + namept= nominal_target; + else + namept= nominal_source; + Xorriso_report_iso_error(xorriso, namept, ret, "Cannot add node to tree", 0, "FAILURE", 1|2); return(ret); } diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index c436eb63..bfe70207 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2011.03.25.191936" +#define Xorriso_timestamP "2011.03.26.100519"