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

(Payload files of revisions 3169, 3170, 3171)

Browse Source
This commit is contained in:
Thomas Schmitt
2010-04-11 12:24:54 +00:00
parent 7b0c712719
commit f75d454b6a
6 changed files with 71 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xorriso/configure_ac.txt
View File

@ -55,6 +55,8 @@ then
dnl ts B00410 : To detect the need for -liconv and const argument of iconv()
LIBBURNIA_CHECK_ICONV
dnl ts B00411 : To abort configuration if iconv() still cannot be compiled
LIBBURNIA_ASSERT_ICONV
else

6
xorriso/xorriso.c
View File

@ -8093,13 +8093,15 @@ int Xorriso_compare_2_files(struct XorrisO *xorriso, char *disk_adr,
}
if(s1.st_uid != s2.st_uid) {
sprintf(respt, "%s st_uid : %d <> %d\n", a, s1.st_uid, s2.st_uid);
sprintf(respt, "%s st_uid : %d <> %d\n", a,
(int) s1.st_uid, (int) s2.st_uid);
if(!(flag&(1<<31)))
Xorriso_result(xorriso,0);
(*result)|= 16;
}
if(s1.st_gid != s2.st_gid) {
sprintf(respt, "%s st_gid : %d <> %d\n", a, s1.st_gid, s2.st_gid);
sprintf(respt, "%s st_gid : %d <> %d\n", a,
(int) s1.st_gid, (int) s2.st_gid);
if(!(flag&(1<<31)))
Xorriso_result(xorriso,0);
(*result)|= 32;

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2010.04.11.121418"
#define Xorriso_timestamP "2010.04.11.122253"

12
xorriso/xorrisoburn.c
View File

@ -1698,7 +1698,7 @@ int Xorriso_set_system_area(struct XorrisO *xorriso,
char buf[32768], *bufpt= NULL;
if(xorriso->system_area_disk_path[0] == 0)
goto do_set;
{ret= 0; goto do_set;}
ret= Xorriso_afile_fopen(xorriso, xorriso->system_area_disk_path,
"rb", &fp, 0);
@ -1718,10 +1718,12 @@ int Xorriso_set_system_area(struct XorrisO *xorriso,
bufpt= buf;
do_set:;
sprintf(xorriso->info_text, "Copying to System Area: %d bytes from file ",
ret);
Text_shellsafe(xorriso->system_area_disk_path, xorriso->info_text, 1);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
if(ret > 0) {
sprintf(xorriso->info_text, "Copying to System Area: %d bytes from file ",
ret);
Text_shellsafe(xorriso->system_area_disk_path, xorriso->info_text, 1);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
}
ret= isoburn_igopt_set_system_area(sopts, bufpt,
xorriso->system_area_options);
if(ret != ISO_SUCCESS) {