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

Correction about -extract / /

Browse Source
This commit is contained in:
Thomas Schmitt 2008-06-14 14:04:30 +00:00
parent 96d4e1fe92
commit a15e636952
5 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xorriso/xorriso.1
View File

@ -1685,8 +1685,9 @@ argument although the operation copies data from ISO image to disk.
.TP
\fB\-extract\fR disk_path iso_rr_path
Restore the file objects underneath iso_rr_path to their corresponding
addresses underneath disk_path. This is the inverse mapping of options -map
or -update_r with the same arguments.
addresses underneath disk_path. Attributes get restored as with cp_rax.
This is the inverse mapping of options -map or -update_r with the same
arguments.
.TP
\fB\-extract_single\fR disk_path iso_rr_path
Like -extract, but if iso_rr_path is a directory then its sub tree gets not

4
xorriso/xorriso.c
View File

@ -9217,7 +9217,7 @@ int Xorriso_option_error_behavior(struct XorrisO *xorriso,
}
/* Option -extract , -extract_single */
/* Options -extract , -extract_single */
/* @param flag bit0=do not report the restored item
bit1=do not reset pacifier, no final pacifier message
bit5= -extract_single: eventually do not insert directory tree
@ -9243,7 +9243,7 @@ int Xorriso_option_extract(struct XorrisO *xorriso, char *disk_path,
2|4);
if(ret<=0)
return(ret);
ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, ipth, eff_origin, 2);
ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, ipth, eff_origin, 2|8);
if(ret<=0)
return(ret);
ret= Xorriso_restore(xorriso, eff_origin, eff_dest,

14
xorriso/xorriso.h
View File

@ -285,9 +285,13 @@ int Xorriso_option_errfile_log(struct XorrisO *xorriso,
int Xorriso_option_error_behavior(struct XorrisO *xorriso,
char *occasion, char *behavior, int flag);
/* Option -iso_rr_pattern "on"|"ls"|"off" */
int Xorriso_option_iso_rr_pattern(struct XorrisO *xorriso, char *mode,
int flag);
/* Options -extract , -extract_single */
/* @param flag bit0=do not report the restored item
bit1=do not reset pacifier, no final pacifier message
bit5= -extract_single: eventually do not insert directory tree
*/
int Xorriso_option_extract(struct XorrisO *xorriso, char *disk_path,
char *iso_path, int flag);
/* Option -follow */
int Xorriso_option_follow(struct XorrisO *xorriso, char *mode, int flag);
@ -312,6 +316,10 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag);
/* Option -history */
int Xorriso_option_history(struct XorrisO *xorriso, char *line, int flag);
/* Option -iso_rr_pattern "on"|"ls"|"off" */
int Xorriso_option_iso_rr_pattern(struct XorrisO *xorriso, char *mode,
int flag);
/* Option -joliet "on"|"off" */
int Xorriso_option_joliet(struct XorrisO *xorriso, char *mode, int flag);

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.06.14.104745"
#define Xorriso_timestamP "2008.06.14.140459"

4
xorriso/xorrisoburn.c
View File

@ -3113,7 +3113,7 @@ ex:
>>> bit0= mkdir: graft in as empty directory, not as copy from iso
bit1= do not report copied files
bit2= -follow, -not_*: this is not a command parameter
>>> bit3= use offset and cut_size for -paste_in
bit3= use offset and cut_size for -paste_in
bit4= return 3 on rejection by exclusion or user
bit5= if directory then do not add sub tree
bit6= this is a copy action: do not fake times and ownership
@ -3308,7 +3308,7 @@ int Xorriso_paste_in(struct XorrisO *xorriso, char *disk_path,
eff_source, 2);
if(ret<=0)
return(ret);
ret= Xorriso_fake_stbuf(xorriso, eff_source, &stbuf, &node, 0);
ret= Xorriso_fake_stbuf(xorriso, eff_source, &stbuf, &node, 4);
if(ret<=0)
return(0);
if(!S_ISREG(stbuf.st_mode)) {