libburnia/libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reporting name of base file with error message for filtered streams

Browse Source
This commit is contained in:
Thomas Schmitt 2012-02-11 19:09:40 +01:00
parent 09c49f777a
commit ebea7c29ef
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
bzr branch lp:libisofs/for-libisoburn (to become libisofs-1.2.2.tar.gz)
===============================================================================
- no novelties yet -
libisofs-1.2.0.tar.gz Sat Jan 28 2012 libisofs-1.2.0.tar.gz Sat Jan 28 2012
=============================================================================== ===============================================================================
* Extended influence of iso_write_opts_set_dir_rec_mtime() to Joliet and * Extended influence of iso_write_opts_set_dir_rec_mtime() to Joliet and

12
libisofs/filesrc.c
View File

@ -26,6 +26,8 @@
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>
/* <<< */
#include <stdio.h>
#ifdef Xorriso_standalonE #ifdef Xorriso_standalonE
@ -345,6 +347,7 @@ int filesrc_writer_write_data(IsoImageWriter *writer)
void *ctx= NULL; void *ctx= NULL;
char md5[16], pre_md5[16]; char md5[16], pre_md5[16];
int pre_md5_valid = 0; int pre_md5_valid = 0;
IsoStream *stream, *inp;
#ifdef Libisofs_with_libjtE #ifdef Libisofs_with_libjtE
int jte_begun = 0; int jte_begun = 0;
#endif #endif
@ -381,7 +384,14 @@ int filesrc_writer_write_data(IsoImageWriter *writer)
pre_md5_valid = filesrc_make_md5(t, file, pre_md5, 0); pre_md5_valid = filesrc_make_md5(t, file, pre_md5, 0);
} }
res = filesrc_open(file); res = filesrc_open(file);
iso_stream_get_file_name(file->stream, name);
/* Get file name from end of filter chain */
for (stream = file->stream; ; stream = inp) {
inp = iso_stream_get_input_stream(stream, 0);
if (inp == NULL)
break;
}
iso_stream_get_file_name(stream, name);
if (res < 0) { if (res < 0) {
/* /*
* UPS, very ugly error, the best we can do is just to write * UPS, very ugly error, the best we can do is just to write