"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "xorriso/text_io.c" between
xorriso-1.5.2.tar.gz and xorriso-1.5.4.tar.gz

About: GNU xorriso creates, loads, manipulates and writes ISO 9660 filesystem images with Rock Ridge extensions. It is suitable for incremental data backup and for production of bootable ISO 9660 images. GNU xorriso is a statical compilation of the libraries libburn, libisofs, libisoburn, and libjte.

text_io.c  (xorriso-1.5.2):text_io.c  (xorriso-1.5.4)
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2019 Thomas Schmitt, <scdbackup@gmx.net> Copyright 2007-2020 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later. Provided under GPL version 2 or later.
This file contains the implementation of text i/o functions. This file contains the implementation of text i/o functions.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../config.h" #include "../config.h"
#endif #endif
skipping to change at line 2932 skipping to change at line 2932
mode_pt= "blocked"; mode_pt= "blocked";
else if(xorriso->allow_restore == -1) else if(xorriso->allow_restore == -1)
mode_pt= "banned"; mode_pt= "banned";
else if(xorriso->allow_restore == 1) else if(xorriso->allow_restore == 1)
mode_pt= "on"; mode_pt= "on";
else if(xorriso->allow_restore == 2) else if(xorriso->allow_restore == 2)
mode_pt= "device_files"; mode_pt= "device_files";
if(xorriso->allow_restore == -1) if(xorriso->allow_restore == -1)
sprintf(line,"-osirrox %s\n", mode_pt); sprintf(line,"-osirrox %s\n", mode_pt);
else else
sprintf(line,"-osirrox %s:%s:%s:%s:%s:%s\n", mode_pt, sprintf(line,"-osirrox %s:%s:%s:%s:%s\n", mode_pt,
xorriso->do_concat_split ? "concat_split_on" : "concat_split_off", xorriso->do_concat_split ? "concat_split_on" : "concat_split_off",
xorriso->do_auto_chmod ? "auto_chmod_on" : "auto_chmod_off", xorriso->do_auto_chmod ? "auto_chmod_on" : "auto_chmod_off",
xorriso->do_restore_sort_lba ? "sort_lba_on" : "sort_lba_off", xorriso->do_restore_sort_lba ? "sort_lba_on" : "sort_lba_off",
xorriso->drives_exclusive ? "o_excl_on" : "o_excl_off", xorriso->drives_exclusive ? "o_excl_on" : "o_excl_off");
(xorriso->do_strict_acl & 1) ? "strict_acl_on" : "strict_acl_off"
);
if(!(is_default && no_defaults)) if(!(is_default && no_defaults))
Xorriso_status_result(xorriso,filter,fp,flag&2); Xorriso_status_result(xorriso,filter,fp,flag&2);
is_default = ((xorriso->do_strict_acl & 1) == 0 &&
(xorriso->do_md5 & (64 | 128)) == 0 &&
xorriso->sparse_min_gap == 0);
sprintf(line,"-osirrox %s:%s:sparse=",
(xorriso->do_strict_acl & 1) ? "strict_acl_on" : "strict_acl_off",
(xorriso->do_md5 & 64) ?
(xorriso->do_md5 & 128) ? "check_md5_force" : "check_md5_on"
: "check_md5_off");
if(xorriso->sparse_min_gap <= 0)
strcat(line, "off");
else
Sfile_off_t_text(line + strlen(line), xorriso->sparse_min_gap, 0);
strcat(line, "\n");
if(!(is_default && no_defaults))
Xorriso_status_result(xorriso, filter, fp, flag & 2);
is_default= (xorriso->mount_opts_flag == 0); is_default= (xorriso->mount_opts_flag == 0);
sprintf(line,"-mount_opts %s\n", sprintf(line,"-mount_opts %s\n",
xorriso->mount_opts_flag & 1 ? "shared" : "exclusive"); xorriso->mount_opts_flag & 1 ? "shared" : "exclusive");
if(!(is_default && no_defaults)) if(!(is_default && no_defaults))
Xorriso_status_result(xorriso,filter,fp,flag&2); Xorriso_status_result(xorriso,filter,fp,flag&2);
Xorriso_boot_image_status(xorriso, filter, fp, flag & 3); Xorriso_boot_image_status(xorriso, filter, fp, flag & 3);
Xorriso_boot_status_sysarea(xorriso, filter, fp, flag & 3); Xorriso_boot_status_sysarea(xorriso, filter, fp, flag & 3);
skipping to change at line 3375 skipping to change at line 3389
is_default= !xorriso->do_reassure; is_default= !xorriso->do_reassure;
sprintf(line,"-reassure %s\n",(xorriso->do_reassure == 1 ? "on" : sprintf(line,"-reassure %s\n",(xorriso->do_reassure == 1 ? "on" :
(xorriso->do_reassure == 2 ? "tree" : "off"))); (xorriso->do_reassure == 2 ? "tree" : "off")));
if(!(is_default && no_defaults)) if(!(is_default && no_defaults))
Xorriso_status_result(xorriso,filter,fp,flag&2); Xorriso_status_result(xorriso,filter,fp,flag&2);
is_default= (xorriso->read_speed == -2); is_default= (xorriso->read_speed == -2);
sprintf(line,"-read_speed %s\n", Xorriso__speedname(xorriso->read_speed)); sprintf(line,"-read_speed %s\n", Xorriso__speedname(xorriso->read_speed));
if(!(is_default && no_defaults)) if(!(is_default && no_defaults))
Xorriso_status_result(xorriso,filter,fp,flag&2); Xorriso_status_result(xorriso,filter,fp,flag&2);
is_default= (xorriso->read_speed_force <= 0);
sprintf(line,"-read_speed soft_force:%s\n",
xorriso->read_speed_force <= 0 ?
"0" : Xorriso__speedname(xorriso->read_speed_force));
if(!(is_default && no_defaults))
Xorriso_status_result(xorriso,filter,fp,flag&2);
is_default= (xorriso->read_speed_corr == 250000);
sprintf(line,"-read_speed soft_corr:%d\n", xorriso->read_speed_corr);
if(!(is_default && no_defaults))
Xorriso_status_result(xorriso,filter,fp,flag&2);
is_default= !(xorriso->auto_close || xorriso->do_close); is_default= !(xorriso->auto_close || xorriso->do_close);
sprintf(line,"-close %s\n",xorriso->auto_close ? "as_needed" : sprintf(line,"-close %s\n",xorriso->auto_close ? "as_needed" :
xorriso->do_close ? "on" : "off"); xorriso->do_close ? "on" : "off");
if(!(is_default && no_defaults)) if(!(is_default && no_defaults))
Xorriso_status_result(xorriso,filter,fp,flag&2); Xorriso_status_result(xorriso,filter,fp,flag&2);
is_default= (xorriso->do_tao == 0); is_default= (xorriso->do_tao == 0);
sprintf(line,"-write_type %s\n", sprintf(line,"-write_type %s\n",
xorriso->do_tao == 0 ? "auto" : xorriso->do_tao > 0 ? "tao" : "sao/dao"); xorriso->do_tao == 0 ? "auto" : xorriso->do_tao > 0 ? "tao" : "sao/dao");
skipping to change at line 3699 skipping to change at line 3723
strcat(line, "unmapped\n"); strcat(line, "unmapped\n");
else if(xorriso->ecma119_map == 2) else if(xorriso->ecma119_map == 2)
strcat(line, "uppercase\n"); strcat(line, "uppercase\n");
else if(xorriso->ecma119_map == 3) else if(xorriso->ecma119_map == 3)
strcat(line, "lowercase\n"); strcat(line, "lowercase\n");
else else
strcat(line, "stripped\n"); strcat(line, "stripped\n");
if(!(is_default && no_defaults)) if(!(is_default && no_defaults))
Xorriso_status_result(xorriso,filter,fp,flag&2); Xorriso_status_result(xorriso,filter,fp,flag&2);
is_default= (xorriso->joliet_map == 1);
sprintf(line, "-joliet_map ");
if(xorriso->joliet_map == 0)
strcat(line, "unmapped\n");
else
strcat(line, "stripped\n");
if(!(is_default && no_defaults))
Xorriso_status_result(xorriso,filter,fp,flag&2);
is_default= (xorriso->scdbackup_tag_name[0] == 0 && is_default= (xorriso->scdbackup_tag_name[0] == 0 &&
xorriso->scdbackup_tag_listname[0] == 0); xorriso->scdbackup_tag_listname[0] == 0);
sprintf(line, "-scdbackup_tag "); sprintf(line, "-scdbackup_tag ");
Text_shellsafe(xorriso->scdbackup_tag_listname, line, 1); Text_shellsafe(xorriso->scdbackup_tag_listname, line, 1);
strcat(line, " "); strcat(line, " ");
Text_shellsafe(xorriso->scdbackup_tag_name, line, 1); Text_shellsafe(xorriso->scdbackup_tag_name, line, 1);
strcat(line, "\n"); strcat(line, "\n");
if(!(is_default && no_defaults)) if(!(is_default && no_defaults))
Xorriso_status_result(xorriso,filter,fp,flag&2); Xorriso_status_result(xorriso,filter,fp,flag&2);
skipping to change at line 3856 skipping to change at line 3889
xorriso->pacifier_count= 0; xorriso->pacifier_count= 0;
xorriso->pacifier_prev_count= 0; xorriso->pacifier_prev_count= 0;
xorriso->pacifier_total= 0; xorriso->pacifier_total= 0;
xorriso->pacifier_byte_count= 0; xorriso->pacifier_byte_count= 0;
return(1); return(1);
} }
/* This call is to be issued by long running workers in short intervals. /* This call is to be issued by long running workers in short intervals.
It will check whether enough time has elapsed since the last pacifier It will check whether enough time has elapsed since the last pacifier
message and eventually issue an update message. message and eventually issue an update message.
@param what_done A sparse description of the action, preferrably in past @param what_done A sparse description of the action, preferably in past
tense. E.g. "done" , "files added". tense. E.g. "done" , "files added".
@param count The number of objects processed so far. @param count The number of objects processed so far.
Is ignored if <=0. Is ignored if <=0.
@param todo The number of objects to be done in total. @param todo The number of objects to be done in total.
Is ignored if <=0. Is ignored if <=0.
@param current_object A string telling the object currently processed. @param current_object A string telling the object currently processed.
Ignored if "". Ignored if "".
@param flag bit0= report unconditionally, no time check @param flag bit0= report unconditionally, no time check
bit1= report count <=0 (no thank you for being patient then) bit1= report count <=0 (no thank you for being patient then)
bit2= report xorriso->pacifier_byte_count bit2= report xorriso->pacifier_byte_count
 End of changes. 7 change blocks. 
6 lines changed or deleted 39 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)