From 1b50d139bd209d1e4260074f3d8617edccb9391b Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Sat, 14 Jun 2008 14:04:30 +0000
Subject: [PATCH] Correction about -extract / /

---
 libisoburn/trunk/xorriso/xorriso.1           |  5 +++--
 libisoburn/trunk/xorriso/xorriso.c           |  4 ++--
 libisoburn/trunk/xorriso/xorriso.h           | 14 +++++++++++---
 libisoburn/trunk/xorriso/xorriso_timestamp.h |  2 +-
 libisoburn/trunk/xorriso/xorrisoburn.c       |  4 ++--
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1
index f43b5ee5..8566091d 100644
--- a/libisoburn/trunk/xorriso/xorriso.1
+++ b/libisoburn/trunk/xorriso/xorriso.1
@@ -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
diff --git a/libisoburn/trunk/xorriso/xorriso.c b/libisoburn/trunk/xorriso/xorriso.c
index efedcfa8..c498bd26 100644
--- a/libisoburn/trunk/xorriso/xorriso.c
+++ b/libisoburn/trunk/xorriso/xorriso.c
@@ -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,
diff --git a/libisoburn/trunk/xorriso/xorriso.h b/libisoburn/trunk/xorriso/xorriso.h
index 695ecf9b..258bd5f3 100644
--- a/libisoburn/trunk/xorriso/xorriso.h
+++ b/libisoburn/trunk/xorriso/xorriso.h
@@ -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);
 
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 57c8658c..d7928108 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.06.14.104745"
+#define Xorriso_timestamP "2008.06.14.140459"
diff --git a/libisoburn/trunk/xorriso/xorrisoburn.c b/libisoburn/trunk/xorriso/xorrisoburn.c
index bee7e19c..f9229468 100644
--- a/libisoburn/trunk/xorriso/xorrisoburn.c
+++ b/libisoburn/trunk/xorriso/xorrisoburn.c
@@ -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)) {