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

Option -f-off as counterpart of option -f

This commit is contained in:
Thomas Schmitt 2007-12-05 09:06:00 +00:00
parent 61b5c9c508
commit ff963d4e31
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/xorriso.1
View File

@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps .\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1) .\" other parameters are allowed: see man(7), man(1)
.TH XORRISO 1 "December 4, 2007" .TH XORRISO 1 "December 5, 2007"
.\" Please adjust this date whenever revising the manpage. .\" Please adjust this date whenever revising the manpage.
.\" .\"
.\" Some roff macros, for reference: .\" Some roff macros, for reference:
@ -573,7 +573,10 @@ SORRY event occured.
.B Settings for data insertion: .B Settings for data insertion:
.TP .TP
> \fB\-f\fR > \fB\-f\fR
Follow symbolic links. Follow symbolic links under disk_paths.
.TP
> \fB\-f-off\fR
Do not follow symbolic links under disk_paths.
.TP .TP
\fB\-graft-points\fR \fB\-graft-points\fR
For xorriso action -add this enables pathspecs of the form For xorriso action -add this enables pathspecs of the form

12
test/xorriso.c
View File

@ -3461,6 +3461,9 @@ int Xorriso_status(struct XorrisO *xorriso, char *filter, FILE *fp, int flag)
if(xorriso->do_follow_links) { if(xorriso->do_follow_links) {
sprintf(line,"-f\n"); sprintf(line,"-f\n");
Xorriso_status_result(xorriso,filter,fp,flag&2); Xorriso_status_result(xorriso,filter,fp,flag&2);
} else if(!no_defaults) {
sprintf(line,"-f-off\n");
Xorriso_status_result(xorriso,filter,fp,flag&2);
} }
is_default= (xorriso->do_overwrite==2); is_default= (xorriso->do_overwrite==2);
@ -5516,10 +5519,11 @@ int Xorriso_option_iso_rr_pattern(struct XorrisO *xorriso, char *mode,int flag)
} }
/* Option -f */ /* Options -f and -f-off */
/* @param flag bit0= -f-off */
int Xorriso_option_f(struct XorrisO *xorriso, int flag) int Xorriso_option_f(struct XorrisO *xorriso, int flag)
{ {
xorriso->do_follow_links= 1; xorriso->do_follow_links= !(flag&1);
return(1); return(1);
} }
@ -5693,6 +5697,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" -- Mark end of particular action argument list.", " -- Mark end of particular action argument list.",
"", "",
"> -f Follow symbolic links within disk_path.", "> -f Follow symbolic links within disk_path.",
"> -f-off Do not follow symbolic links within disk_path.",
"", "",
" -overwrite \"on\"|\"nondir\"|\"off\"", " -overwrite \"on\"|\"nondir\"|\"off\"",
" Allow or disallow to overwrite existing files in ISO image.", " Allow or disallow to overwrite existing files in ISO image.",
@ -6963,6 +6968,9 @@ next_command:;
} else if(strcmp(cmd,"-f")==0) { } else if(strcmp(cmd,"-f")==0) {
ret= Xorriso_option_f(xorriso, 0); ret= Xorriso_option_f(xorriso, 0);
} else if(strcmp(cmd,"-f-off")==0 || strcmp(cmd,"-f_off")==0) {
ret= Xorriso_option_f(xorriso, 1);
} else if(strcmp(cmd,"-find")==0 || strcmp(cmd,"-findi")==0) { } else if(strcmp(cmd,"-find")==0 || strcmp(cmd,"-findi")==0) {
(*idx)++; (*idx)++;
ret= Xorriso_option_findi(xorriso, arg1, 0); ret= Xorriso_option_findi(xorriso, arg1, 0);

3
test/xorriso.h
View File

@ -201,7 +201,8 @@ int Xorriso_option_end(struct XorrisO *xorriso, int flag);
int Xorriso_option_iso_rr_pattern(struct XorrisO *xorriso, char *mode, int Xorriso_option_iso_rr_pattern(struct XorrisO *xorriso, char *mode,
int flag); int flag);
/* Option -f */ /* Options -f and -f-off */
/* @param flag bit0= -f-off */
int Xorriso_option_f(struct XorrisO *xorriso, int flag); int Xorriso_option_f(struct XorrisO *xorriso, int flag);
/* Option -find alias -findi */ /* Option -find alias -findi */

2
test/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2007.12.04.205919" #define Xorriso_timestamP "2007.12.05.090438"